cc: Consider scroll offset in CalcDrawProperties

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 1020 matching lines @@
   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::Size bounds = layer->bounds();
   gfx::PointF anchor_point = layer->anchor_point();
-  gfx::PointF position = layer->position() - layer->ScrollDelta();
+  gfx::PointF position = layer->position() - layer->TotalScrollOffset();
 
   gfx::Transform combined_transform = parent_matrix;
   if (!layer->transform().IsIdentity()) {
     // LT = Tr[origin] * Tr[origin2anchor]
     combined_transform.Translate3d(
         position.x() + anchor_point.x() * bounds.width(),
         position.y() + anchor_point.y() * bounds.height(),
         layer->anchor_point_z());
     // LT = Tr[origin] * Tr[origin2anchor] * M[layer]
     combined_transform.PreconcatTransform(layer->transform());
@@ skipping 837 matching lines @@
   // At this point, we think the point does hit the touch event handler region
   // on the layer, but we need to walk up the parents to ensure that the layer
   // was not clipped in such a way that the hit point actually should not hit
   // the layer.
   if (PointIsClippedBySurfaceOrClipRect(screen_space_point, layer_impl))
     return false;
 
   return true;
 }
 }  // namespace cc