cc: Convert backface LTHCommon tests from Layer->LayerImpl

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 <algorithm>
 #include <set>
 
 #include "cc/animation/layer_animation_controller.h"
@@ skipping 3600 matching lines @@
                                true,
                                false);
   SetLayerPropertiesForTesting(back_facing_child_of_back_facing_surface.get(),
                                backface_matrix,
                                gfx::Point3F(),
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
                                false);
 
-  RenderSurfaceLayerList render_surface_layer_list;
-  LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
-      parent.get(), parent->bounds(), &render_surface_layer_list);
-  inputs.can_adjust_raster_scales = true;
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  ExecuteCalculateDrawPropertiesWithPropertyTrees(parent.get());
 
   // Verify which render surfaces were created.
   EXPECT_FALSE(front_facing_child->render_surface());
   EXPECT_FALSE(back_facing_child->render_surface());
   EXPECT_TRUE(front_facing_surface->render_surface());
   EXPECT_TRUE(back_facing_surface->render_surface());
   EXPECT_FALSE(front_facing_child_of_front_facing_surface->render_surface());
   EXPECT_FALSE(back_facing_child_of_front_facing_surface->render_surface());
   EXPECT_FALSE(front_facing_child_of_back_facing_surface->render_surface());
   EXPECT_FALSE(back_facing_child_of_back_facing_surface->render_surface());
 
-  // Verify the render_surface_layer_list.
-  ASSERT_EQ(3u, render_surface_layer_list.size());
-  EXPECT_EQ(parent->id(), render_surface_layer_list.at(0)->id());
-  EXPECT_EQ(front_facing_surface->id(), render_surface_layer_list.at(1)->id());
-  // Even though the back facing surface LAYER gets culled, the other
-  // descendants should still be added, so the SURFACE should not be culled.
-  EXPECT_EQ(back_facing_surface->id(), render_surface_layer_list.at(2)->id());
-
-  // Verify root surface's layer list.
-  ASSERT_EQ(
-      3u,
-      render_surface_layer_list.at(0)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_child->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()
-                ->layer_list()
-                .at(0)
-                ->id());
-  EXPECT_EQ(front_facing_surface->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()
-                ->layer_list()
-                .at(1)
-                ->id());
-  EXPECT_EQ(back_facing_surface->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()
-                ->layer_list()
-                .at(2)
-                ->id());
-
-  // Verify front_facing_surface's layer list.
-  ASSERT_EQ(
-      2u,
-      render_surface_layer_list.at(1)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()
-                ->layer_list()
-                .at(0)
-                ->id());
-  EXPECT_EQ(front_facing_child_of_front_facing_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()
-                ->layer_list()
-                .at(1)
-                ->id());
-
-  // Verify back_facing_surface's layer list; its own layer should be culled
-  // from the surface list.
-  ASSERT_EQ(
-      1u,
-      render_surface_layer_list.at(2)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_child_of_back_facing_surface->id(),
-            render_surface_layer_list.at(2)
-                ->render_surface()
-                ->layer_list()
-                .at(0)
-                ->id());
+  EXPECT_EQ(4u, update_layer_list().size());
+  EXPECT_TRUE(UpdateLayerListContains(front_facing_child->id()));
+  EXPECT_TRUE(UpdateLayerListContains(front_facing_surface->id()));
+  EXPECT_TRUE(UpdateLayerListContains(
+      front_facing_child_of_front_facing_surface->id()));
+  EXPECT_TRUE(
+      UpdateLayerListContains(front_facing_child_of_back_facing_surface->id()));
 }
 
 TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithPreserves3d) {
   // Verify the behavior of back-face culling when preserves-3d transform style
   // is used.
 
   const gfx::Transform identity_matrix;
   scoped_refptr<Layer> parent = Layer::Create(layer_settings());
   scoped_refptr<LayerWithForcedDrawsContent> front_facing_child =
       make_scoped_refptr(new LayerWithForcedDrawsContent(layer_settings()));
@@ skipping 116 matching lines @@
                                true,
                                true);
   SetLayerPropertiesForTesting(back_facing_child_of_back_facing_surface.get(),
                                backface_matrix,
                                gfx::Point3F(),
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
                                true);
 
-  RenderSurfaceLayerList render_surface_layer_list;
-  LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
-      parent.get(), parent->bounds(), &render_surface_layer_list);
-  inputs.can_adjust_raster_scales = true;
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  ExecuteCalculateDrawPropertiesWithPropertyTrees(parent.get());
 
   // Verify which render surfaces were created and used.
   EXPECT_FALSE(front_facing_child->render_surface());
   EXPECT_FALSE(back_facing_child->render_surface());
   EXPECT_TRUE(front_facing_surface->render_surface());
   EXPECT_NE(back_facing_surface->render_target(), back_facing_surface);
   // We expect that a render_surface was created but not used.
   EXPECT_TRUE(back_facing_surface->render_surface());
   EXPECT_FALSE(front_facing_child_of_front_facing_surface->render_surface());
   EXPECT_FALSE(back_facing_child_of_front_facing_surface->render_surface());
   EXPECT_FALSE(front_facing_child_of_back_facing_surface->render_surface());
   EXPECT_FALSE(back_facing_child_of_back_facing_surface->render_surface());
 
-  // Verify the render_surface_layer_list. The back-facing surface should be
-  // culled.
-  ASSERT_EQ(2u, render_surface_layer_list.size());
-  EXPECT_EQ(parent->id(), render_surface_layer_list.at(0)->id());
-  EXPECT_EQ(front_facing_surface->id(), render_surface_layer_list.at(1)->id());
+  EXPECT_EQ(4u, update_layer_list().size());
 
-  // Verify root surface's layer list.
-  ASSERT_EQ(
-      2u,
-      render_surface_layer_list.at(0)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_child->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()->layer_list().at(0)->id());
-  EXPECT_EQ(front_facing_surface->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()->layer_list().at(1)->id());
-
-  // Verify front_facing_surface's layer list.
-  ASSERT_EQ(
-      2u,
-      render_surface_layer_list.at(1)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()->layer_list().at(0)->id());
-  EXPECT_EQ(front_facing_child_of_front_facing_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()->layer_list().at(1)->id());
+  EXPECT_TRUE(UpdateLayerListContains(front_facing_child->id()));
+  EXPECT_TRUE(UpdateLayerListContains(front_facing_surface->id()));
+  EXPECT_TRUE(UpdateLayerListContains(
+      front_facing_child_of_front_facing_surface->id()));
+  EXPECT_TRUE(

[enne (OOO), 2015/07/07 23:31:00]

This didn't used to be included.

+      UpdateLayerListContains(front_facing_child_of_back_facing_surface->id()));
 }
 
 TEST_F(LayerTreeHostCommonTest, BackFaceCullingWithAnimatingTransforms) {
   // Verify that layers are appropriately culled when their back face is showing
   // and they are not double sided, while animations are going on.
   //
   // Layers that are animating do not get culled on the main thread, as their
   // transforms should be treated as "unknown" so we can not be sure that their
   // back face is really showing.
   const gfx::Transform identity_matrix;
@@ skipping 87 matching lines @@
       parent.get(), parent->bounds(), &render_surface_layer_list);
   inputs.can_adjust_raster_scales = true;
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
   EXPECT_FALSE(child->render_surface());
   EXPECT_TRUE(animating_surface->render_surface());
   EXPECT_FALSE(child_of_animating_surface->render_surface());
   EXPECT_FALSE(animating_child->render_surface());
   EXPECT_FALSE(child2->render_surface());
 
-  // Verify that the animating_child and child_of_animating_surface were not
-  // culled, but that child was.
-  ASSERT_EQ(2u, render_surface_layer_list.size());
-  EXPECT_EQ(parent->id(), render_surface_layer_list.at(0)->id());
-  EXPECT_EQ(animating_surface->id(), render_surface_layer_list.at(1)->id());
+  ExecuteCalculateDrawPropertiesWithPropertyTrees(parent.get());
+
+  EXPECT_EQ(4u, update_layer_list().size());
 
   // The non-animating child be culled from the layer list for the parent render
   // surface.
-  ASSERT_EQ(
-      3u,
-      render_surface_layer_list.at(0)->render_surface()->layer_list().size());
-  EXPECT_EQ(animating_surface->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()->layer_list().at(0)->id());
-  EXPECT_EQ(animating_child->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()->layer_list().at(1)->id());
-  EXPECT_EQ(child2->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()->layer_list().at(2)->id());
+  EXPECT_TRUE(UpdateLayerListContains(animating_surface->id()));
+  EXPECT_TRUE(UpdateLayerListContains(animating_child->id()));
+  EXPECT_TRUE(UpdateLayerListContains(child2->id()));
+  EXPECT_TRUE(UpdateLayerListContains(child_of_animating_surface->id()));
 
-  ASSERT_EQ(
-      2u,
-      render_surface_layer_list.at(1)->render_surface()->layer_list().size());
-  EXPECT_EQ(animating_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()->layer_list().at(0)->id());
-  EXPECT_EQ(child_of_animating_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()->layer_list().at(1)->id());
-
-  EXPECT_FALSE(child2->visible_layer_rect().IsEmpty());
+  EXPECT_FALSE(child2->visible_rect_from_property_trees().IsEmpty());
 
   // The animating layers should have a visible content rect that represents the
   // area of the front face that is within the viewport.
-  EXPECT_EQ(animating_child->visible_layer_rect(),
+  EXPECT_EQ(animating_child->visible_rect_from_property_trees(),
             gfx::Rect(animating_child->bounds()));
-  EXPECT_EQ(animating_surface->visible_layer_rect(),
+  EXPECT_EQ(animating_surface->visible_rect_from_property_trees(),
             gfx::Rect(animating_surface->bounds()));
   // And layers in the subtree of the animating layer should have valid visible
   // content rects also.
-  EXPECT_EQ(child_of_animating_surface->visible_layer_rect(),
+  EXPECT_EQ(child_of_animating_surface->visible_rect_from_property_trees(),
             gfx::Rect(child_of_animating_surface->bounds()));
 }
 
 TEST_F(LayerTreeHostCommonTest,
      BackFaceCullingWithPreserves3dForFlatteningSurface) {
   // Verify the behavior of back-face culling for a render surface that is
   // created when it flattens its subtree, and its parent has preserves-3d.
 
   const gfx::Transform identity_matrix;
   scoped_refptr<Layer> parent = Layer::Create(layer_settings());
@@ skipping 54 matching lines @@
                                identity_matrix,
                                gfx::Point3F(),
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
                                false);
 
   front_facing_surface->Set3dSortingContextId(1);
   back_facing_surface->Set3dSortingContextId(1);
 
-  RenderSurfaceLayerList render_surface_layer_list;
-  LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
-      parent.get(), parent->bounds(), &render_surface_layer_list);
-  inputs.can_adjust_raster_scales = true;
-  LayerTreeHostCommon::CalculateDrawProperties(&inputs);
+  ExecuteCalculateDrawPropertiesWithPropertyTrees(parent.get());
 
   // Verify which render surfaces were created and used.
   EXPECT_TRUE(front_facing_surface->render_surface());
 
   // We expect the render surface to have been created, but remain unused.
   EXPECT_TRUE(back_facing_surface->render_surface());
   EXPECT_NE(back_facing_surface->render_target(),
             back_facing_surface);  // because it should be culled
   EXPECT_FALSE(child1->render_surface());
   EXPECT_FALSE(child2->render_surface());
 
-  // Verify the render_surface_layer_list. The back-facing surface should be
-  // culled.
-  ASSERT_EQ(2u, render_surface_layer_list.size());
-  EXPECT_EQ(parent->id(), render_surface_layer_list.at(0)->id());
-  EXPECT_EQ(front_facing_surface->id(), render_surface_layer_list.at(1)->id());
-
-  // Verify root surface's layer list.
-  ASSERT_EQ(
-      1u,
-      render_surface_layer_list.at(0)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_surface->id(),
-            render_surface_layer_list.at(0)
-                ->render_surface()->layer_list().at(0)->id());
-
-  // Verify front_facing_surface's layer list.
-  ASSERT_EQ(
-      2u,
-      render_surface_layer_list.at(1)->render_surface()->layer_list().size());
-  EXPECT_EQ(front_facing_surface->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()->layer_list().at(0)->id());
-  EXPECT_EQ(child1->id(),
-            render_surface_layer_list.at(1)
-                ->render_surface()->layer_list().at(1)->id());
+  EXPECT_EQ(4u, update_layer_list().size());
+  EXPECT_TRUE(UpdateLayerListContains(front_facing_surface->id()));
+  EXPECT_TRUE(UpdateLayerListContains(child1->id()));
+  EXPECT_TRUE(UpdateLayerListContains(back_facing_surface->id()));

[enne (OOO), 2015/07/07 23:31:00]

This and child2 also didn't used to be included.

+  EXPECT_TRUE(UpdateLayerListContains(child2->id()));
 }
 
 TEST_F(LayerTreeHostCommonScalingTest, LayerTransformsInHighDPI) {
   // Verify draw and screen space transforms of layers not in a surface.
   gfx::Transform identity_matrix;
 
   LayerImpl* parent = root_layer();
   SetLayerPropertiesForTesting(parent, identity_matrix, gfx::Point3F(),
                                gfx::PointF(), gfx::Size(100, 100), false, true,
                                true);
@@ skipping 4311 matching lines @@
   EXPECT_FALSE(root->layer_or_descendant_is_drawn());
   EXPECT_FALSE(root->visited());
   EXPECT_FALSE(root->sorted_for_recursion());
   EXPECT_FALSE(child->layer_or_descendant_is_drawn());
   EXPECT_FALSE(child->visited());
   EXPECT_FALSE(child->sorted_for_recursion());
 }
 
 }  // namespace
 }  // namespace cc