cc: Correct elastic overscroll synchronization.

cc/trees/layer_tree_host.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 724 matching lines @@
   gpu_rasterization_histogram_recorded_ = true;
 }
 
 void LayerTreeHost::BuildPropertyTreesForTesting() {
   PropertyTreeBuilder::PreCalculateMetaInformation(layer_tree_->root_layer());
   gfx::Transform identity_transform;
   PropertyTreeBuilder::BuildPropertyTrees(
       layer_tree_->root_layer(), layer_tree_->page_scale_layer(),
       layer_tree_->inner_viewport_scroll_layer(),
       layer_tree_->outer_viewport_scroll_layer(),
-      layer_tree_->overscroll_elasticity_layer(), elastic_overscroll_,
-      layer_tree_->page_scale_factor(), layer_tree_->device_scale_factor(),
+      layer_tree_->overscroll_elasticity_layer(),
+      layer_tree_->elastic_overscroll(), layer_tree_->page_scale_factor(),
+      layer_tree_->device_scale_factor(),
       gfx::Rect(layer_tree_->device_viewport_size()), identity_transform,
       layer_tree_->property_trees());
 }
 
 bool LayerTreeHost::UsingSharedMemoryResources() {
   return GetRendererCapabilities().using_shared_memory_resources;
 }
 
 bool LayerTreeHost::DoUpdateLayers(Layer* root_layer) {
   TRACE_EVENT1("cc", "LayerTreeHost::DoUpdateLayers", "source_frame_number",
@@ skipping 24 matching lines @@
     PropertyTreeBuilder::PreCalculateMetaInformation(root_layer);
     bool can_render_to_separate_surface = true;
     PropertyTrees* property_trees = layer_tree_->property_trees();
     if (!settings_.use_layer_lists) {
       // If use_layer_lists is set, then the property trees should have been
       // built by the client already.
       PropertyTreeBuilder::BuildPropertyTrees(
           root_layer, page_scale_layer,
           layer_tree_->inner_viewport_scroll_layer(),
           layer_tree_->outer_viewport_scroll_layer(),
-          layer_tree_->overscroll_elasticity_layer(), elastic_overscroll_,
-          layer_tree_->page_scale_factor(), layer_tree_->device_scale_factor(),
+          layer_tree_->overscroll_elasticity_layer(),
+          layer_tree_->elastic_overscroll(), layer_tree_->page_scale_factor(),
+          layer_tree_->device_scale_factor(),
           gfx::Rect(layer_tree_->device_viewport_size()), identity_transform,
           property_trees);
       TRACE_EVENT_INSTANT1("cc",
                            "LayerTreeHost::UpdateLayers_BuiltPropertyTrees",
                            TRACE_EVENT_SCOPE_THREAD, "property_trees",
                            property_trees->AsTracedValue());
     } else {
       TRACE_EVENT_INSTANT1("cc",
                            "LayerTreeHost::UpdateLayers_ReceivedPropertyTrees",
                            TRACE_EVENT_SCOPE_THREAD, "property_trees",
@@ skipping 39 matching lines @@
   // it to the client.  If the client comes back and sets it to the same
   // value, then the layer can early out without needing a full commit.
   if (layer_tree_->inner_viewport_scroll_layer()) {
     layer_tree_->inner_viewport_scroll_layer()->SetScrollOffsetFromImplSide(
         gfx::ScrollOffsetWithDelta(
             layer_tree_->inner_viewport_scroll_layer()->scroll_offset(),
             inner_viewport_scroll_delta));
   }
 
   ApplyPageScaleDeltaFromImplSide(info->page_scale_delta);
-  elastic_overscroll_ += info->elastic_overscroll_delta;
+  layer_tree_->SetElasticOverscrollFromImplSide(
+      layer_tree_->elastic_overscroll() + info->elastic_overscroll_delta);
   // TODO(ccameron): pass the elastic overscroll here so that input events
   // may be translated appropriately.
   client_->ApplyViewportDeltas(inner_viewport_scroll_delta, gfx::Vector2dF(),
                                info->elastic_overscroll_delta,
                                info->page_scale_delta,
                                info->top_controls_delta);
   SetNeedsUpdateLayers();
 }
 
 void LayerTreeHost::ApplyScrollAndScale(ScrollAndScaleSet* info) {
@@ skipping 220 matching lines @@
 
   LayerProtoConverter::SerializeLayerProperties(this,
                                                 proto->mutable_layer_updates());
 
   std::vector<PictureData> pictures =
       engine_picture_cache_->CalculateCacheUpdateAndFlush();
   proto::PictureDataVectorToSkPicturesProto(pictures,
                                             proto->mutable_pictures());
 
   debug_state_.ToProtobuf(proto->mutable_debug_state());
-  Vector2dFToProto(elastic_overscroll_, proto->mutable_elastic_overscroll());
   proto->set_has_gpu_rasterization_trigger(has_gpu_rasterization_trigger_);
   proto->set_content_is_suitable_for_gpu_rasterization(
       content_is_suitable_for_gpu_rasterization_);
   proto->set_id(id_);
   proto->set_next_commit_forces_redraw(next_commit_forces_redraw_);
 
   proto->set_surface_client_id(surface_client_id_);
   proto->set_next_surface_sequence(next_surface_sequence_);
 
   TRACE_EVENT_OBJECT_SNAPSHOT_WITH_ID(
@@ skipping 14 matching lines @@
       SkPicturesProtoToPictureDataVector(proto_pictures);
   client_picture_cache_->ApplyCacheUpdate(pictures);
 
   LayerProtoConverter::DeserializeLayerProperties(layer_tree_->root_layer(),
                                                   proto.layer_updates());
 
   // The deserialization is finished, so now clear the cache.
   client_picture_cache_->Flush();
 
   debug_state_.FromProtobuf(proto.debug_state());
-  elastic_overscroll_ = ProtoToVector2dF(proto.elastic_overscroll());
   has_gpu_rasterization_trigger_ = proto.has_gpu_rasterization_trigger();
   content_is_suitable_for_gpu_rasterization_ =
       proto.content_is_suitable_for_gpu_rasterization();
   id_ = proto.id();
   next_commit_forces_redraw_ = proto.next_commit_forces_redraw();
 
   surface_client_id_ = proto.surface_client_id();
   next_surface_sequence_ = proto.next_surface_sequence();
 }
 
 AnimationHost* LayerTreeHost::animation_host() const {
   return layer_tree_->animation_host();
 }
 
 }  // namespace cc