Convert scroll offsets to use SyncedProperty.

cc/trees/layer_tree_host_common.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_common.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 28 matching lines @@
 static void SortLayers(LayerImplList::iterator first,
                        LayerImplList::iterator end,
                        LayerSorter* layer_sorter) {
   DCHECK(layer_sorter);
   TRACE_EVENT0("cc", "LayerTreeHostCommon::SortLayers");
   layer_sorter->Sort(first, end);
 }
 
 template <typename LayerType>
 static gfx::Vector2dF GetEffectiveScrollDelta(LayerType* layer) {
-  gfx::Vector2dF scroll_delta = layer->ScrollDelta();
+  gfx::ScrollOffset scroll_delta = layer->ScrollDelta();
   // The scroll parent's scroll delta is the amount we've scrolled on the
   // compositor thread since the commit for this layer tree's source frame.
   // we last reported to the main thread. I.e., it's the discrepancy between
   // a scroll parent's scroll delta and offset, so we must add it here.
   if (layer->scroll_parent())
     scroll_delta += layer->scroll_parent()->ScrollDelta();
-  return scroll_delta;
+  return gfx::Vector2dF(scroll_delta.x(), scroll_delta.y());
 }
 
 template <typename LayerType>
-static gfx::ScrollOffset GetEffectiveTotalScrollOffset(LayerType* layer) {
-  gfx::ScrollOffset offset = layer->TotalScrollOffset();
+static gfx::ScrollOffset GetEffectiveCurrentScrollOffset(LayerType* layer) {
+  gfx::ScrollOffset offset = layer->CurrentScrollOffset();
   // The scroll parent's total scroll offset (scroll offset + scroll delta)
   // can't be used because its scroll offset has already been applied to the
   // scroll children's positions by the main thread layer positioning code.
   if (layer->scroll_parent())
     offset += gfx::ScrollOffset(layer->scroll_parent()->ScrollDelta());
   return offset;
 }
 
 inline gfx::Rect CalculateVisibleRectWithCachedLayerRect(
     const gfx::Rect& target_surface_rect,
@@ skipping 1587 matching lines @@
 
   bool animating_transform_to_target = layer->TransformIsAnimating();
   bool animating_transform_to_screen = animating_transform_to_target;
   if (layer->parent()) {
     animating_transform_to_target |=
         layer->parent()->draw_transform_is_animating();
     animating_transform_to_screen |=
         layer->parent()->screen_space_transform_is_animating();
   }
   gfx::Point3F transform_origin = layer->transform_origin();
-  gfx::ScrollOffset scroll_offset = GetEffectiveTotalScrollOffset(layer);
+  gfx::ScrollOffset scroll_offset = GetEffectiveCurrentScrollOffset(layer);
   gfx::PointF position =
       layer->position() - ScrollOffsetToVector2dF(scroll_offset);
   gfx::Transform combined_transform = data_from_ancestor.parent_matrix;
   if (!layer->transform().IsIdentity()) {
     // LT = Tr[origin] * Tr[origin2transformOrigin]
     combined_transform.Translate3d(position.x() + transform_origin.x(),
                                    position.y() + transform_origin.y(),
                                    transform_origin.z());
     // LT = Tr[origin] * Tr[origin2origin] * M[layer]
     combined_transform.PreconcatTransform(layer->transform());
@@ skipping 890 matching lines @@
       inputs->current_render_surface_layer_list_id);
 
   // The dummy layer list should not have been used.
   DCHECK_EQ(0u, dummy_layer_list.size());
   // A root layer render_surface should always exist after
   // CalculateDrawProperties.
   DCHECK(inputs->root_layer->render_surface());
 }
 
 }  // namespace cc