cc: Replace render surface layer list with a render surface list

cc/trees/damage_tracker_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/damage_tracker.h"
 
 #include <stddef.h>
 
 #include "cc/base/filter_operation.h"
 #include "cc/base/filter_operations.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 namespace {
 
 void ExecuteCalculateDrawProperties(LayerImpl* root,
                                     float device_scale_factor,
-                                    LayerImplList* render_surface_layer_list) {
+                                    RenderSurfaceList* render_surface_list) {
   // Sanity check: The test itself should create the root layer's render
   //               surface, so that the surface (and its damage tracker) can
   //               persist across multiple calls to this function.
-  ASSERT_FALSE(render_surface_layer_list->size());
+  ASSERT_FALSE(render_surface_list->size());
 
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-      root, root->bounds(), device_scale_factor, render_surface_layer_list);
+      root, root->bounds(), device_scale_factor, render_surface_list);
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
   ASSERT_TRUE(root->GetRenderSurface());
 }
 
 void ClearDamageForAllSurfaces(LayerImpl* root) {
   for (auto* layer : *root->layer_tree_impl()) {
     if (layer->GetRenderSurface())
       layer->GetRenderSurface()->damage_tracker()->DidDrawDamagedArea();
   }
 }
 
 void EmulateDrawingOneFrame(LayerImpl* root, float device_scale_factor = 1.f) {
   // This emulates only steps that are relevant to testing the damage tracker:
   //   1. computing the render passes and layerlists
   //   2. updating all damage trackers in the correct order
   //   3. resetting all update_rects and property_changed flags for all layers
   //      and surfaces.
 
-  LayerImplList render_surface_layer_list;
+  RenderSurfaceList render_surface_list;
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 &render_surface_layer_list);
+                                 &render_surface_list);
 
   DamageTracker::UpdateDamageTracking(root->layer_tree_impl(),
-                                      render_surface_layer_list);
+                                      render_surface_list);
 
   root->layer_tree_impl()->ResetAllChangeTracking();
 }
 
 class DamageTrackerTest : public testing::Test {
  public:
   DamageTrackerTest()
       : host_impl_(&task_runner_provider_, &task_graph_runner_) {}
 
   LayerImpl* CreateTestTreeWithOneSurface(int number_of_children) {
@@ skipping 95 matching lines @@
   }
 
  protected:
   FakeImplTaskRunnerProvider task_runner_provider_;
   TestTaskGraphRunner task_graph_runner_;
   FakeLayerTreeHostImpl host_impl_;
 };
 
 TEST_F(DamageTrackerTest, SanityCheckTestTreeWithOneSurface) {
   // Sanity check that the simple test tree will actually produce the expected
-  // render surfaces and layer lists.
+  // render surfaces.
 
   LayerImpl* root = CreateAndSetUpTestTreeWithOneSurface();
+  LayerImpl* child = root->test_properties()->children[0];
 
-  EXPECT_EQ(2u, root->GetRenderSurface()->layer_list().size());
-  EXPECT_EQ(1, root->GetRenderSurface()->layer_list()[0]->id());
-  EXPECT_EQ(2, root->GetRenderSurface()->layer_list()[1]->id());
+  EXPECT_EQ(2, root->GetRenderSurface()->num_contributors());
+  EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
+  EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
 
   gfx::Rect root_damage_rect;
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
 
   EXPECT_EQ(gfx::Rect(500, 500).ToString(), root_damage_rect.ToString());
 }
 
 TEST_F(DamageTrackerTest, SanityCheckTestTreeWithTwoSurfaces) {
   // Sanity check that the complex test tree will actually produce the expected
-  // render surfaces and layer lists.
+  // render surfaces.
 
   LayerImpl* root = CreateAndSetUpTestTreeWithTwoSurfaces();
 
   LayerImpl* child1 = root->test_properties()->children[0];
   LayerImpl* child2 = root->test_properties()->children[1];
 
   gfx::Rect child_damage_rect;
   EXPECT_TRUE(
       child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
           &child_damage_rect));
   gfx::Rect root_damage_rect;
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
 
   ASSERT_TRUE(child1->GetRenderSurface());
   EXPECT_FALSE(child2->GetRenderSurface());
-  EXPECT_EQ(3u, root->GetRenderSurface()->layer_list().size());
-  EXPECT_EQ(2u, child1->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(3, root->GetRenderSurface()->num_contributors());
+  EXPECT_EQ(2, child1->GetRenderSurface()->num_contributors());
 
   // The render surface for child1 only has a content_rect that encloses
   // grand_child1 and grand_child2, because child1 does not draw content.
   EXPECT_EQ(gfx::Rect(190, 190, 16, 18).ToString(),
             child_damage_rect.ToString());
   EXPECT_EQ(gfx::Rect(500, 500).ToString(), root_damage_rect.ToString());
 }
 
 TEST_F(DamageTrackerTest, VerifyDamageForUpdateRects) {
   LayerImpl* root = CreateAndSetUpTestTreeWithOneSurface();
@@ skipping 149 matching lines @@
   // CASE 1: The layer's property changed flag takes priority over update rect.
   //
   child->test_properties()->force_render_surface = true;
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   ClearDamageForAllSurfaces(root);
   child->SetUpdateRect(gfx::Rect(10, 11, 12, 13));
   root->layer_tree_impl()->SetOpacityMutated(child->element_id(), 0.5f);
   EmulateDrawingOneFrame(root);
 
-  ASSERT_EQ(2u, root->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(2, root->GetRenderSurface()->num_contributors());
 
   // Damage should be the entire child layer in target_surface space.
   gfx::Rect expected_rect = gfx::Rect(100, 100, 30, 30);
   gfx::Rect root_damage_rect;
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(expected_rect.ToString(), root_damage_rect.ToString());
 
   // CASE 2: If a layer moves due to property change, it damages both the new
   //         location and the old (exposed) location. The old location is the
@@ skipping 468 matching lines @@
     child2->SetPosition(gfx::PointF(400.f, 380.f));
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
     root->test_properties()->AddChild(std::move(child2));
   }
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
-  ASSERT_EQ(3u, root->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(3, root->GetRenderSurface()->num_contributors());
 
   gfx::Rect root_damage_rect;
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(400, 380, 6, 8).ToString(), root_damage_rect.ToString());
 
   // CASE 2: If the layer is removed, its entire old layer becomes exposed, not
   //         just the last update rect.
 
   // Advance one frame without damage so that we know the damage rect is not
@@ skipping 39 matching lines @@
     // trigger, it means the test no longer actually covers the intended
     // scenario.
     ASSERT_FALSE(child2_ptr->LayerPropertyChanged());
     ASSERT_TRUE(child2_ptr->update_rect().IsEmpty());
   }
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
-  ASSERT_EQ(3u, root->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(3, root->GetRenderSurface()->num_contributors());
 
   gfx::Rect root_damage_rect;
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(400, 380, 6, 8).ToString(), root_damage_rect.ToString());
 }
 
 TEST_F(DamageTrackerTest, VerifyDamageForMultipleLayers) {
   LayerImpl* root = CreateAndSetUpTestTreeWithOneSurface();
   LayerImpl* child1 = root->test_properties()->children[0];
@@ skipping 160 matching lines @@
 
   // CASE 1: If a descendant surface disappears, its entire old area becomes
   //         exposed.
   ClearDamageForAllSurfaces(root);
   child1->test_properties()->force_render_surface = false;
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check that there is only one surface now.
   ASSERT_FALSE(child1->GetRenderSurface());
-  ASSERT_EQ(4u, root->GetRenderSurface()->layer_list().size());
+  ASSERT_EQ(4, root->GetRenderSurface()->num_contributors());
 
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(290, 290, 16, 18).ToString(),
             root_damage_rect.ToString());
 
   // CASE 2: If a descendant surface appears, its entire old area becomes
   //         exposed.
 
   // Cycle one frame of no change, just to sanity check that the next rect is
   // not because of the old damage state.
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_TRUE(root_damage_rect.IsEmpty());
 
   // Then change the tree so that the render surface is added back.
   ClearDamageForAllSurfaces(root);
   child1->test_properties()->force_render_surface = true;
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check that there is a new surface now.
   ASSERT_TRUE(child1->GetRenderSurface());
-  EXPECT_EQ(3u, root->GetRenderSurface()->layer_list().size());
-  EXPECT_EQ(2u, child1->GetRenderSurface()->layer_list().size());
+  EXPECT_EQ(3, root->GetRenderSurface()->num_contributors());
+  EXPECT_EQ(2, child1->GetRenderSurface()->num_contributors());
 
   EXPECT_TRUE(
       child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
           &child_damage_rect));
   EXPECT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &root_damage_rect));
   EXPECT_EQ(gfx::Rect(190, 190, 16, 18).ToString(),
             child_damage_rect.ToString());
   EXPECT_EQ(gfx::Rect(290, 290, 16, 18).ToString(),
             root_damage_rect.ToString());
@@ skipping 349 matching lines @@
   grandchild1->SetDrawsContent(true);
 
   // Really far right.
   grandchild2->SetPosition(
       gfx::PointF(std::numeric_limits<int>::max() - 500, 0));
   grandchild2->SetBounds(gfx::Size(1, 1));
   grandchild2->SetDrawsContent(true);
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   float device_scale_factor = 1.f;
-  LayerImplList render_surface_layer_list;
+  RenderSurfaceList render_surface_list;
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 &render_surface_layer_list);
+                                 &render_surface_list);
   // Avoid the descendant-only property change path that skips unioning damage
   // from descendant layers.
   child1->GetRenderSurface()->NoteAncestorPropertyChanged();
   DamageTracker::UpdateDamageTracking(host_impl_.active_tree(),
-                                      render_surface_layer_list);
+                                      render_surface_list);
 
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything on child1.
   gfx::Rect damage_rect;
   EXPECT_FALSE(
       child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
           &damage_rect));
   EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
             child1->GetRenderSurface()->GetDamageRect());
 
   // However, the root should just use the child1 render surface's content rect
   // as damage.
   ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
   EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
       gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
   EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 
   // Add new damage, without changing properties, which goes down a different
   // path in the damage tracker.
   root->layer_tree_impl()->ResetAllChangeTracking();
   grandchild1->AddDamageRect(gfx::Rect(grandchild1->bounds()));
   grandchild2->AddDamageRect(gfx::Rect(grandchild1->bounds()));
 
   // Recompute all damage / properties.
-  render_surface_layer_list.clear();
+  render_surface_list.clear();
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 &render_surface_layer_list);
+                                 &render_surface_list);
   DamageTracker::UpdateDamageTracking(host_impl_.active_tree(),
-                                      render_surface_layer_list);
+                                      render_surface_list);
 
   // Child1 should still not have a valid rect, since the union of the damage of
   // its children is not representable by a single rect.
   EXPECT_FALSE(
       child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
           &damage_rect));
   EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
             child1->GetRenderSurface()->GetDamageRect());
 
   // Root should have valid damage and contain both its content rect and the
@@ skipping 25 matching lines @@
   grandchild1->SetDrawsContent(true);
 
   // Really far right.
   grandchild2->SetPosition(
       gfx::PointF(std::numeric_limits<int>::max() - 500, 0));
   grandchild2->SetBounds(gfx::Size(1, 1));
   grandchild2->SetDrawsContent(true);
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   float device_scale_factor = 1.f;
-  LayerImplList render_surface_layer_list;
+  RenderSurfaceList render_surface_list;
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 &render_surface_layer_list);
+                                 &render_surface_list);
   // Avoid the descendant-only property change path that skips unioning damage
   // from descendant layers.
   child1->GetRenderSurface()->NoteAncestorPropertyChanged();
   DamageTracker::UpdateDamageTracking(host_impl_.active_tree(),
-                                      render_surface_layer_list);
+                                      render_surface_list);
 
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything on child1.
   gfx::Rect damage_rect;
   EXPECT_FALSE(
       child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
           &damage_rect));
   EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
             child1->GetRenderSurface()->GetDamageRect());
 
   // However, the root should just use the child1 render surface's content rect
   // as damage.
   ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
   EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
       gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
   EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 
   // Add new damage, without changing properties, which goes down a different
   // path in the damage tracker.
   root->layer_tree_impl()->ResetAllChangeTracking();
   grandchild1->AddDamageRect(gfx::Rect(grandchild1->bounds()));
   grandchild2->AddDamageRect(gfx::Rect(grandchild1->bounds()));
 
   // Recompute all damage / properties.
-  render_surface_layer_list.clear();
+  render_surface_list.clear();
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 &render_surface_layer_list);
+                                 &render_surface_list);
   DamageTracker::UpdateDamageTracking(host_impl_.active_tree(),
-                                      render_surface_layer_list);
+                                      render_surface_list);
 
   // Child1 should still not have a valid rect, since the union of the damage of
   // its children is not representable by a single rect.
   EXPECT_FALSE(
       child1->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
           &damage_rect));
   EXPECT_EQ(child1->GetRenderSurface()->content_rect(),
             child1->GetRenderSurface()->GetDamageRect());
 
   // Root should have valid damage and contain both its content rect and the
   // drawable content rect of child1.
   ASSERT_TRUE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
   EXPECT_TRUE(damage_rect.Contains(root->GetRenderSurface()->content_rect()));
   EXPECT_TRUE(damage_rect.Contains(
       gfx::ToEnclosingRect(child1->GetRenderSurface()->DrawableContentRect())));
   EXPECT_EQ(damage_rect, root->GetRenderSurface()->GetDamageRect());
 }
 
 }  // namespace
 }  // namespace cc