cc: Correct elastic overscroll synchronization.
The |elastic_overscroll_| was moved to LayerTree in this change
(https://codereview.chromium.org/2183403002), and is being used for
synchronization during commit, but it wasn't deleted from LayerTreeHost
and was incorrectly used when building PropertyTrees and applying the
delta during BeginMainFrame.
BUG=639046
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel
Review-Url: https://codereview.chromium.org/2259083002
Cr-Commit-Position: refs/heads/master@{#413272}
diff --git a/cc/trees/layer_tree.cc b/cc/trees/layer_tree.cc
index 587ef0ec..cf0c3bc4 100644
--- a/cc/trees/layer_tree.cc
+++ b/cc/trees/layer_tree.cc
@@ -469,6 +469,7 @@
LayerSelectionToProtobuf(inputs_.selection, proto->mutable_selection());
property_trees_.ToProtobuf(proto->mutable_property_trees());
+ Vector2dFToProto(elastic_overscroll_, proto->mutable_elastic_overscroll());
}
void LayerTree::FromProtobuf(const proto::LayerTree& proto) {
@@ -530,6 +531,7 @@
UpdateAndGetLayer(hud_layer_.get(), proto.hud_layer_id(), this));
LayerSelectionFromProtobuf(&inputs_.selection, proto.selection());
+ elastic_overscroll_ = ProtoToVector2dF(proto.elastic_overscroll());
// It is required to create new PropertyTrees before deserializing it.
property_trees_ = PropertyTrees();