cc: Consider scroll offset in CalcDrawProperties

cc/trees/layer_tree_host_common_unittest.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 "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/content_layer.h"
 #include "cc/layers/content_layer_client.h"
@@ skipping 408 matching lines @@
                                gfx::Size(500, 500),
                                false);
 
   scoped_ptr<LayerImpl> scroll_layerScopedPtr(
       LayerImpl::Create(host_impl.active_tree(), 2));
   LayerImpl* scroll_layer = scroll_layerScopedPtr.get();
   SetLayerPropertiesForTesting(scroll_layer,
                                identity_matrix,
                                identity_matrix,
                                gfx::PointF(),
-                               kScrollLayerPosition,
+                               gfx::PointF(),
                                gfx::Size(10, 20),
                                false);
   scroll_layer->SetScrollable(true);
   scroll_layer->SetScrollOffset(kScrollOffset);
   scroll_layer->SetScrollDelta(kScrollDelta);
   gfx::Transform impl_transform;
   scroll_layer->AddChild(sublayer_scoped_ptr.Pass());
 
   scoped_ptr<LayerImpl> root(LayerImpl::Create(host_impl.active_tree(), 3));
   SetLayerPropertiesForTesting(root.get(),
@@ skipping 18 matching lines @@
                                   sublayer->screen_space_transform());
 
   gfx::Transform arbitrary_translate;
   const float kTranslateX = 10.6f;
   const float kTranslateY = 20.6f;
   arbitrary_translate.Translate(kTranslateX, kTranslateY);
   SetLayerPropertiesForTesting(scroll_layer,
                                arbitrary_translate,
                                identity_matrix,
                                gfx::PointF(),
-                               kScrollLayerPosition,
+                               gfx::PointF(),
                                gfx::Size(10, 20),
                                false);
   ExecuteCalculateDrawProperties(
       root.get(), kDeviceScale, kPageScale, scroll_layer);
   expected_transform.MakeIdentity();
   expected_transform.Translate(
       MathUtil::Round(kTranslateX * kPageScale * kDeviceScale +
                       sub_layer_screen_position.x()),
       MathUtil::Round(kTranslateY * kPageScale * kDeviceScale +
                       sub_layer_screen_position.y()));
@@ skipping 7852 matching lines @@
   EXPECT_EQ(root->id(), render_surface_layer_list[0]->id());
 
   // The root render surface should only have 1 contributing layer, since the
   // other layers are empty/clipped away.
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
   EXPECT_EQ(root->id(), root->render_surface()->layer_list()[0]->id());
 }
 
 }  // namespace
 }  // namespace cc