Moving RenderSurface creation outside of CalcDrawProps

cc/trees/layer_tree_impl_unittest.cc

 // Copyright 2014 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_impl.h"
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 39 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
 
@@ skipping 31 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   // Create hud and add it as a child of root.
   gfx::Size hud_bounds(200, 200);
   SetLayerPropertiesForTesting(hud.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                hud_bounds,
                                true,
+                               false,
                                false);
   hud->SetDrawsContent(true);
 
   host_impl().active_tree()->set_hud_layer(hud.get());
   root->AddChild(hud.PassAs<LayerImpl>());
 
   host_impl().SetViewportSize(hud_bounds);
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
@@ skipping 41 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                uninvertible_transform,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
   ASSERT_FALSE(root_layer()->screen_space_transform().IsInvertible());
 
@@ skipping 45 matching lines @@
   // this layer is positioned, and hit testing should correctly know where the
   // layer is located.
   gfx::PointF position(50.f, 50.f);
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
 
@@ skipping 35 matching lines @@
   rotation45_degrees_about_center.Translate(-50.0, -50.0);
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                rotation45_degrees_about_center,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
 
@@ skipping 48 matching lines @@
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(
       root.get(),
       perspective_projection_about_center * translation_by_z,
       transform_origin,
       position,
       bounds,
       true,
-      false);
+      false,
+      true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
 
@@ skipping 40 matching lines @@
 
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
 
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     gfx::PointF position(25.f, 25.f);
     gfx::Size bounds(50, 50);
     scoped_ptr<LayerImpl> test_layer =
         LayerImpl::Create(host_impl().active_tree(), 12345);
     SetLayerPropertiesForTesting(test_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
 
     // override content bounds and contents scale
     test_layer->SetContentBounds(gfx::Size(100, 100));
     test_layer->SetContentsScale(2, 2);
 
     test_layer->SetDrawsContent(true);
     root->AddChild(test_layer.Pass());
   }
 
@@ skipping 48 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
 
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl().active_tree(), 1);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     scoped_ptr<LayerImpl> clipping_layer =
         LayerImpl::Create(host_impl().active_tree(), 123);
     // this layer is positioned, and hit testing should correctly know where the
     // layer is located.
     gfx::PointF position(25.f, 25.f);
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(clipping_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     clipping_layer->SetMasksToBounds(true);
 
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 456);
     position = gfx::PointF(-50.f, -50.f);
     bounds = gfx::Size(300, 300);
     SetLayerPropertiesForTesting(child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child->SetDrawsContent(true);
     clipping_layer->AddChild(child.Pass());
     root->AddChild(clipping_layer.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
@@ skipping 48 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetMasksToBounds(true);
   {
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 456);
     scoped_ptr<LayerImpl> grand_child =
         LayerImpl::Create(host_impl().active_tree(), 789);
     scoped_ptr<LayerImpl> rotated_leaf =
         LayerImpl::Create(host_impl().active_tree(), 2468);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(80, 80);
     SetLayerPropertiesForTesting(child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child->SetMasksToBounds(true);
 
     gfx::Transform rotation45_degrees_about_corner;
     rotation45_degrees_about_corner.RotateAboutZAxis(45.0);
 
     // remember, positioned with respect to its parent which is already at 10,
     // 10
     position = gfx::PointF();
     bounds =
         gfx::Size(200, 200);  // to ensure it covers at least sqrt(2) * 100.
     SetLayerPropertiesForTesting(grand_child.get(),
                                  rotation45_degrees_about_corner,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);

[danakj, 2014/09/03 19:30:35]

isn't this one supposed to have a surface based on the sanity check removed
below? why is this passing without?

[awoloszyn, 2014/09/09 15:31:37]

We could create a surface, but the sanity check is just checking whether or not
a surface was created. I removed it because in the new world we would just
basically be checking did a RS get created when I said CreateRenderSurface. I
have a follow-up CL with a new set of unit tests specifically for RS creation.

     grand_child->SetMasksToBounds(true);
 
     // Rotates about the center of the layer
     gfx::Transform rotated_leaf_transform;
     rotated_leaf_transform.Translate(
         -10.0, -10.0);  // cancel out the grand_parent's position
     rotated_leaf_transform.RotateAboutZAxis(
         -45.0);  // cancel out the corner 45-degree rotation of the parent.
     rotated_leaf_transform.Translate(50.0, 50.0);
     rotated_leaf_transform.RotateAboutZAxis(45.0);
     rotated_leaf_transform.Translate(-50.0, -50.0);
     position = gfx::PointF();
     bounds = gfx::Size(100, 100);
     SetLayerPropertiesForTesting(rotated_leaf.get(),
                                  rotated_leaf_transform,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     rotated_leaf->SetDrawsContent(true);
 
     grand_child->AddChild(rotated_leaf.Pass());
     child->AddChild(grand_child.Pass());
     root->AddChild(child.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
-  // Sanity check the scenario we just created.
-  // The grand_child is expected to create a render surface because it
-  // MasksToBounds and is not axis aligned.
-  ASSERT_EQ(2u, RenderSurfaceLayerList().size());
-  ASSERT_EQ(
-      1u,
-      RenderSurfaceLayerList().at(0)->render_surface()->layer_list().size());
-  ASSERT_EQ(789,
-            RenderSurfaceLayerList()
-                .at(0)
-                ->render_surface()
-                ->layer_list()
-                .at(0)
-                ->id());  // grand_child's surface.
-  ASSERT_EQ(
-      1u,
-      RenderSurfaceLayerList().at(1)->render_surface()->layer_list().size());
-  ASSERT_EQ(
-      2468,
-      RenderSurfaceLayerList()[1]->render_surface()->layer_list().at(0)->id());
-
   // (11, 89) is close to the the bottom left corner within the clip, but it is
   // not inside the layer.
   gfx::Point test_point(11, 89);
   LayerImpl* result_layer =
       host_impl().active_tree()->FindLayerThatIsHitByPoint(test_point);
   EXPECT_FALSE(result_layer);
 
   // Closer inwards from the bottom left will overlap the layer.
   test_point = gfx::Point(25, 75);
   result_layer =
@@ skipping 40 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
 
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl().active_tree(), 1);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     scoped_ptr<LayerImpl> intermediate_layer =
         LayerImpl::Create(host_impl().active_tree(), 123);
     // this layer is positioned, and hit testing should correctly know where the
     // layer is located.
     gfx::PointF position(10.f, 10.f);
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(intermediate_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     // Sanity check the intermediate layer should not clip.
     ASSERT_FALSE(intermediate_layer->masks_to_bounds());
     ASSERT_FALSE(intermediate_layer->mask_layer());
 
     // The child of the intermediate_layer is translated so that it does not
     // overlap intermediate_layer at all.  If child is incorrectly clipped, we
     // would not be able to hit it successfully.
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 456);
     position = gfx::PointF(60.f, 60.f);  // 70, 70 in screen space
     bounds = gfx::Size(20, 20);
     SetLayerPropertiesForTesting(child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child->SetDrawsContent(true);
     intermediate_layer->AddChild(child.Pass());
     root->AddChild(intermediate_layer.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
@@ skipping 33 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   {
     // child 1 and child2 are initialized to overlap between x=50 and x=60.
     // grand_child is set to overlap both child1 and child2 between y=50 and
     // y=60.  The expected stacking order is: (front) child2, (second)
     // grand_child, (third) child1, and (back) the root layer behind all other
     // layers.
 
     scoped_ptr<LayerImpl> child1 =
         LayerImpl::Create(host_impl().active_tree(), 2);
     scoped_ptr<LayerImpl> child2 =
         LayerImpl::Create(host_impl().active_tree(), 3);
     scoped_ptr<LayerImpl> grand_child1 =
         LayerImpl::Create(host_impl().active_tree(), 4);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(50, 50);
     SetLayerPropertiesForTesting(child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child1->SetDrawsContent(true);
 
     position = gfx::PointF(50.f, 10.f);
     bounds = gfx::Size(50, 50);
     SetLayerPropertiesForTesting(child2.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child2->SetDrawsContent(true);
 
     // Remember that grand_child is positioned with respect to its parent (i.e.
     // child1).  In screen space, the intended position is (10, 50), with size
     // 100 x 50.
     position = gfx::PointF(0.f, 40.f);
     bounds = gfx::Size(100, 50);
     SetLayerPropertiesForTesting(grand_child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     grand_child1->SetDrawsContent(true);
 
     child1->AddChild(grand_child1.Pass());
     root->AddChild(child1.Pass());
     root->AddChild(child2.Pass());
   }
 
   LayerImpl* child1 = root->children()[0];
   LayerImpl* child2 = root->children()[1];
@@ skipping 70 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   root->SetShouldFlattenTransform(false);
   root->Set3dSortingContextId(1);
   {
     // child 1 and child2 are initialized to overlap between x=50 and x=60.
     // grand_child is set to overlap both child1 and child2 between y=50 and
     // y=60.  The expected stacking order is: (front) child2, (second)
     // grand_child, (third) child1, and (back) the root layer behind all other
     // layers.
 
     scoped_ptr<LayerImpl> child1 =
         LayerImpl::Create(host_impl().active_tree(), 2);
     scoped_ptr<LayerImpl> child2 =
         LayerImpl::Create(host_impl().active_tree(), 3);
     scoped_ptr<LayerImpl> grand_child1 =
         LayerImpl::Create(host_impl().active_tree(), 4);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(50, 50);
     SetLayerPropertiesForTesting(child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child1->SetDrawsContent(true);
     child1->SetShouldFlattenTransform(false);
     child1->Set3dSortingContextId(1);
 
     position = gfx::PointF(50.f, 10.f);
     bounds = gfx::Size(50, 50);
     gfx::Transform translate_z;
     translate_z.Translate3d(0, 0, -10.f);
     SetLayerPropertiesForTesting(child2.get(),
                                  translate_z,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child2->SetDrawsContent(true);
     child2->SetShouldFlattenTransform(false);
     child2->Set3dSortingContextId(1);
 
     // Remember that grand_child is positioned with respect to its parent (i.e.
     // child1).  In screen space, the intended position is (10, 50), with size
     // 100 x 50.
     position = gfx::PointF(0.f, 40.f);
     bounds = gfx::Size(100, 50);
     SetLayerPropertiesForTesting(grand_child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     grand_child1->SetDrawsContent(true);
     grand_child1->SetShouldFlattenTransform(false);
 
     child1->AddChild(grand_child1.Pass());
     root->AddChild(child1.Pass());
     root->AddChild(child2.Pass());
   }
 
   LayerImpl* child1 = root->children()[0];
@@ skipping 72 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   {
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 2);
     scoped_ptr<LayerImpl> grand_child =
         LayerImpl::Create(host_impl().active_tree(), 4);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(1, 1);
     SetLayerPropertiesForTesting(child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child->SetDrawsContent(true);
     child->SetMasksToBounds(true);
 
     position = gfx::PointF(0.f, 40.f);
     bounds = gfx::Size(100, 50);
     SetLayerPropertiesForTesting(grand_child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     grand_child->SetDrawsContent(true);
-    grand_child->SetForceRenderSurface(true);
+    grand_child->SetHasRenderSurface(true);
 
     // This should let |grand_child| "escape" |child|'s clip.
     grand_child->SetClipParent(root.get());
 
     child->AddChild(grand_child.Pass());
     root->AddChild(child.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
@@ skipping 11 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   {
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 2);
     scoped_ptr<LayerImpl> scroll_child =
         LayerImpl::Create(host_impl().active_tree(), 3);
     scoped_ptr<LayerImpl> grand_child =
         LayerImpl::Create(host_impl().active_tree(), 4);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(1, 1);
     SetLayerPropertiesForTesting(child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child->SetDrawsContent(true);
     child->SetMasksToBounds(true);
 
     position = gfx::PointF();
     bounds = gfx::Size(200, 200);
     SetLayerPropertiesForTesting(scroll_child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     scroll_child->SetDrawsContent(true);
 
     // This should cause scroll child and its descendants to be affected by
     // |child|'s clip.
     scroll_child->SetScrollParent(child.get());
 
     SetLayerPropertiesForTesting(grand_child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     grand_child->SetDrawsContent(true);
-    grand_child->SetForceRenderSurface(true);
+    grand_child->SetHasRenderSurface(true);
 
     scroll_child->AddChild(grand_child.Pass());
     root->AddChild(scroll_child.Pass());
     root->AddChild(child.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
@@ skipping 15 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   {
     // child 1 and child2 are initialized to overlap between x=50 and x=60.
     // grand_child is set to overlap both child1 and child2 between y=50 and
     // y=60.  The expected stacking order is: (front) child2, (second)
     // grand_child, (third) child1, and (back) the root layer behind all other
     // layers.
 
     scoped_ptr<LayerImpl> child1 =
         LayerImpl::Create(host_impl().active_tree(), 2);
     scoped_ptr<LayerImpl> child2 =
         LayerImpl::Create(host_impl().active_tree(), 3);
     scoped_ptr<LayerImpl> grand_child1 =
         LayerImpl::Create(host_impl().active_tree(), 4);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(50, 50);
     SetLayerPropertiesForTesting(child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child1->SetDrawsContent(true);
-    child1->SetForceRenderSurface(true);
+    child1->SetHasRenderSurface(true);
 
     position = gfx::PointF(50.f, 10.f);
     bounds = gfx::Size(50, 50);
     SetLayerPropertiesForTesting(child2.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child2->SetDrawsContent(true);
-    child2->SetForceRenderSurface(true);
+    child2->SetHasRenderSurface(true);
 
     // Remember that grand_child is positioned with respect to its parent (i.e.
     // child1).  In screen space, the intended position is (10, 50), with size
     // 100 x 50.
     position = gfx::PointF(0.f, 40.f);
     bounds = gfx::Size(100, 50);
     SetLayerPropertiesForTesting(grand_child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     grand_child1->SetDrawsContent(true);
-    grand_child1->SetForceRenderSurface(true);
+    grand_child1->SetHasRenderSurface(true);
 
     child1->AddChild(grand_child1.Pass());
     root->AddChild(child1.Pass());
     root->AddChild(child2.Pass());
   }
 
   LayerImpl* child1 = root->children()[0];
   LayerImpl* child2 = root->children()[1];
   LayerImpl* grand_child1 = child1->children()[0];
 
@@ skipping 77 matching lines @@
   Region touch_handler_region(gfx::Rect(10, 10, 50, 50));
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
 
@@ skipping 67 matching lines @@
   Region touch_handler_region(gfx::Rect(10, 10, 50, 50));
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                uninvertible_transform,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   root->SetTouchEventHandlerRegion(touch_handler_region);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
@@ skipping 57 matching lines @@
   // this layer is positioned, and hit testing should correctly know where the
   // layer is located.
   gfx::PointF position(50.f, 50.f);
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
   root->SetTouchEventHandlerRegion(touch_handler_region);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
@@ skipping 55 matching lines @@
 
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
 
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     Region touch_handler_region(gfx::Rect(10, 10, 30, 30));
     gfx::PointF position(25.f, 25.f);
     gfx::Size bounds(50, 50);
     scoped_ptr<LayerImpl> test_layer =
         LayerImpl::Create(host_impl().active_tree(), 12345);
     SetLayerPropertiesForTesting(test_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
 
     // override content bounds and contents scale
     test_layer->SetContentBounds(gfx::Size(100, 100));
     test_layer->SetContentsScale(2, 2);
 
     test_layer->SetDrawsContent(true);
     test_layer->SetTouchEventHandlerRegion(touch_handler_region);
     root->AddChild(test_layer.Pass());
   }
@@ skipping 71 matching lines @@
 
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   // Set the bounds of the root layer big enough to fit the child when scaled.
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     Region touch_handler_region(gfx::Rect(10, 10, 30, 30));
     gfx::PointF position(25.f, 25.f);
     gfx::Size bounds(50, 50);
     scoped_ptr<LayerImpl> test_layer =
         LayerImpl::Create(host_impl().active_tree(), 12345);
     SetLayerPropertiesForTesting(test_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
 
     test_layer->SetDrawsContent(true);
     test_layer->SetTouchEventHandlerRegion(touch_handler_region);
     root->AddChild(test_layer.Pass());
   }
 
   float device_scale_factor = 3.f;
   float page_scale_factor = 5.f;
   gfx::Size scaled_bounds_for_root = gfx::ToCeiledSize(
@@ skipping 91 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
 
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl().active_tree(), 1);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     scoped_ptr<LayerImpl> clipping_layer =
         LayerImpl::Create(host_impl().active_tree(), 123);
     // this layer is positioned, and hit testing should correctly know where the
     // layer is located.
     gfx::PointF position(25.f, 25.f);
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(clipping_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     clipping_layer->SetMasksToBounds(true);
 
     scoped_ptr<LayerImpl> child =
         LayerImpl::Create(host_impl().active_tree(), 456);
     Region touch_handler_region(gfx::Rect(10, 10, 50, 50));
     position = gfx::PointF(-50.f, -50.f);
     bounds = gfx::Size(300, 300);
     SetLayerPropertiesForTesting(child.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     child->SetDrawsContent(true);
     child->SetTouchEventHandlerRegion(touch_handler_region);
     clipping_layer->AddChild(child.Pass());
     root->AddChild(clipping_layer.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
@@ skipping 47 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
 
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl().active_tree(), 1);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
-                               false);
+                               false,
+                               true);
   {
     scoped_ptr<LayerImpl> touch_layer =
         LayerImpl::Create(host_impl().active_tree(), 123);
     // this layer is positioned, and hit testing should correctly know where the
     // layer is located.
     gfx::PointF position;
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(touch_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     touch_layer->SetDrawsContent(true);
     touch_layer->SetTouchEventHandlerRegion(gfx::Rect(0, 0, 50, 50));
     root->AddChild(touch_layer.Pass());
   }
 
   {
     scoped_ptr<LayerImpl> notouch_layer =
         LayerImpl::Create(host_impl().active_tree(), 1234);
     // this layer is positioned, and hit testing should correctly know where the
     // layer is located.
     gfx::PointF position(0, 25);
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(notouch_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     notouch_layer->SetDrawsContent(true);
     root->AddChild(notouch_layer.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
@@ skipping 44 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
   root->SetDrawsContent(true);
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, RenderSurfaceLayerList().size());
   ASSERT_EQ(1u, root_layer()->render_surface()->layer_list().size());
 
@@ skipping 55 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
 
   gfx::Vector2dF clipping_offset(10, 10);
   {
     scoped_ptr<LayerImpl> clipping_layer =
         LayerImpl::Create(host_impl().active_tree(), clip_layer_id);
     // The clipping layer should occlude the right selection bound.
     gfx::PointF position = gfx::PointF() + clipping_offset;
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(clipping_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     clipping_layer->SetMasksToBounds(true);
 
     scoped_ptr<LayerImpl> clipped_layer =
         LayerImpl::Create(host_impl().active_tree(), clipped_layer_id);
     position = gfx::PointF();
     bounds = gfx::Size(100, 100);
     SetLayerPropertiesForTesting(clipped_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     clipped_layer->SetDrawsContent(true);
     clipping_layer->AddChild(clipped_layer.Pass());
     root->AddChild(clipping_layer.Pass());
   }
 
   host_impl().SetViewportSize(root->bounds());
   host_impl().active_tree()->SetRootLayer(root.Pass());
   host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree();
 
@@ skipping 64 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Point3F transform_origin;
   gfx::PointF position;
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
-                               false);
+                               false,
+                               true);
 
   gfx::Vector2dF sub_layer_offset(10, 0);
   {
     scoped_ptr<LayerImpl> sub_layer =
         LayerImpl::Create(host_impl().active_tree(), sub_layer_id);
     gfx::PointF position = gfx::PointF() + sub_layer_offset;
     gfx::Size bounds(50, 50);
     SetLayerPropertiesForTesting(sub_layer.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
+                                 false,
                                  false);
     sub_layer->SetDrawsContent(true);
     root->AddChild(sub_layer.Pass());
   }
 
   float device_scale_factor = 3.f;
   float page_scale_factor = 5.f;
   gfx::Size scaled_bounds_for_root = gfx::ToCeiledSize(
       gfx::ScaleSize(root->bounds(), device_scale_factor * page_scale_factor));
   host_impl().SetViewportSize(scaled_bounds_for_root);
@@ skipping 57 matching lines @@
   EXPECT_EQ(0u, host_impl().active_tree()->NumLayers());
   scoped_ptr<LayerImpl> root = LayerImpl::Create(host_impl().active_tree(), 1);
   root->AddChild(LayerImpl::Create(host_impl().active_tree(), 2));
   root->AddChild(LayerImpl::Create(host_impl().active_tree(), 3));
   root->child_at(1)->AddChild(LayerImpl::Create(host_impl().active_tree(), 4));
   EXPECT_EQ(4u, host_impl().active_tree()->NumLayers());
 }
 
 }  // namespace
 }  // namespace cc