Pinch/Zoom Infrastructure & Plumbing CL

cc/layers/layer_position_constraint_unittest.cc

 // Copyright 2013 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/layers/layer_position_constraint.h"
 
 #include <vector>
 
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 56 matching lines @@
       : host_impl_(&proxy_) {
     root_ = CreateTreeForTest();
     fixed_to_top_left_.set_is_fixed_position(true);
     fixed_to_bottom_right_.set_is_fixed_position(true);
     fixed_to_bottom_right_.set_is_fixed_to_right_edge(true);
     fixed_to_bottom_right_.set_is_fixed_to_bottom_edge(true);
   }
 
   scoped_ptr<LayerImpl> CreateTreeForTest() {
     scoped_ptr<LayerImpl> root =
+        LayerImpl::Create(host_impl_.active_tree(), 5);
+    scoped_ptr<LayerImpl> scroll_layer =
         LayerImpl::Create(host_impl_.active_tree(), 1);
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl_.active_tree(), 2);
     scoped_ptr<LayerImpl> grand_child =
         LayerImpl::Create(host_impl_.active_tree(), 3);
     scoped_ptr<LayerImpl> great_grand_child =
         LayerImpl::Create(host_impl_.active_tree(), 4);
 
     gfx::Transform IdentityMatrix;
     gfx::PointF anchor;
     gfx::PointF position;
     gfx::Size bounds(100, 100);
-    SetLayerPropertiesForTesting(root.get(),
+    gfx::Size clip_bounds(200, 200);
+    SetLayerPropertiesForTesting(scroll_layer.get(),
                                  IdentityMatrix,
                                  IdentityMatrix,
                                  anchor,
                                  position,
                                  bounds,
                                  false);
     SetLayerPropertiesForTesting(child.get(),
                                  IdentityMatrix,
                                  IdentityMatrix,
                                  anchor,
                                  position,
                                  bounds,
                                  false);
     SetLayerPropertiesForTesting(grand_child.get(),
                                  IdentityMatrix,
                                  IdentityMatrix,
                                  anchor,
                                  position,
                                  bounds,
                                  false);
     SetLayerPropertiesForTesting(great_grand_child.get(),
                                  IdentityMatrix,
                                  IdentityMatrix,
                                  anchor,
                                  position,
                                  bounds,
                                  false);
 
-    root->SetMaxScrollOffset(gfx::Vector2d(100, 100));
-    root->SetScrollable(true);
-    child->SetMaxScrollOffset(gfx::Vector2d(100, 100));
-    child->SetScrollable(true);
-    grand_child->SetMaxScrollOffset(gfx::Vector2d(100, 100));
-    grand_child->SetScrollable(true);
+    // TODO(wjmaclean) Do we need a separate clip layer for each scroll layer?
+    root->SetBounds(clip_bounds);
+    scroll_layer->SetScrollable(root->id());
+    child->SetScrollable(root->id());
+    grand_child->SetScrollable(root->id());
 
     grand_child->AddChild(great_grand_child.Pass());
     child->AddChild(grand_child.Pass());
     root->AddChild(child.Pass());
 
     return root.Pass();
   }
 
  protected:
   FakeImplProxy proxy_;
@@ skipping 1070 matching lines @@
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_container2_transform,
                                   container2->draw_transform());
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_to_container2_transform,
                                   fixed_to_container2->draw_transform());
 }
 
 }  // namespace
 }  // namespace cc