Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(395)

Unified Diff: cc/trees/layer_tree.cc

Issue 2259083002: cc: Correct elastic overscroll synchronization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/proto/layer_tree_host.proto ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree.cc
diff --git a/cc/trees/layer_tree.cc b/cc/trees/layer_tree.cc
index 587ef0ec2d616e0ff2097a24bdc18bdfa36b1ee8..cf0c3bc4760acdc50ee11f53511f2f8162d980bf 100644
--- a/cc/trees/layer_tree.cc
+++ b/cc/trees/layer_tree.cc
@@ -469,6 +469,7 @@ void LayerTree::ToProtobuf(proto::LayerTree* proto) {
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 @@ void LayerTree::FromProtobuf(const proto::LayerTree& proto) {
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();
« no previous file with comments | « cc/proto/layer_tree_host.proto ('k') | cc/trees/layer_tree_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698