cc : Clean up cc clip tree

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,
-                                    bool skip_verify_visible_rect_calculations,
                                     LayerImplList* render_surface_layer_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());
 
   FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(root);
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root, root->bounds(), device_scale_factor, render_surface_layer_list);
-  if (skip_verify_visible_rect_calculations)
-    inputs.verify_visible_rect_calculations = false;
   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,
-    bool skip_verify_visible_rect_calculations = false) {
+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;
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
 
   // Iterate back-to-front, so that damage correctly propagates from descendant
   // surfaces to ancestors.
   size_t render_surface_layer_list_size = render_surface_layer_list.size();
   for (size_t i = 0; i < render_surface_layer_list_size; ++i) {
     size_t index = render_surface_layer_list_size - 1 - i;
     RenderSurfaceImpl* target_surface =
         render_surface_layer_list[index]->GetRenderSurface();
     target_surface->damage_tracker()->UpdateDamageTrackingState(
@@ skipping 1368 matching lines @@
     // The child layer covers (0, 0, i, i) of the viewport,
     // but has a huge negative position.
     child->SetPosition(gfx::PointF());
     child->SetBounds(gfx::Size(kBigNumber + i, kBigNumber + i));
     child->test_properties()->transform = transform;
     root->layer_tree_impl()->property_trees()->needs_rebuild = true;
     float device_scale_factor = 1.f;
     // Visible rects computed from combining clips in target space and root
     // space don't match because of the loss in floating point accuracy. So, we
     // skip verify_clip_tree_calculations.
-    bool skip_verify_visible_rect_calculations = true;
-    EmulateDrawingOneFrame(root, device_scale_factor,
-                           skip_verify_visible_rect_calculations);
+    EmulateDrawingOneFrame(root, device_scale_factor);
 
     // The expected damage should cover the visible part of the child layer,
     // which is (0, 0, i, i) in the viewport.
     gfx::Rect root_damage_rect;
     EXPECT_TRUE(
         root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
             &root_damage_rect));
     gfx::Rect damage_we_care_about = gfx::Rect(i, i);
     EXPECT_LE(damage_we_care_about.right(), root_damage_rect.right());
     EXPECT_LE(damage_we_care_about.bottom(), root_damage_rect.bottom());
   }
 }
 
 TEST_F(DamageTrackerTest, DamageRectTooBig) {
   LayerImpl* root = CreateAndSetUpTestTreeWithOneSurface(2);
   LayerImpl* child1 = root->test_properties()->children[0];
   LayerImpl* child2 = root->test_properties()->children[1];
 
   // Really far left.
   child1->SetPosition(gfx::PointF(std::numeric_limits<int>::min() + 100, 0));
   child1->SetBounds(gfx::Size(1, 1));
 
   // Really far right.
   child2->SetPosition(gfx::PointF(std::numeric_limits<int>::max() - 100, 0));
   child2->SetBounds(gfx::Size(1, 1));
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   float device_scale_factor = 1.f;
-  bool skip_verify_visible_rect_calculations = true;
-  EmulateDrawingOneFrame(root, device_scale_factor,
-                         skip_verify_visible_rect_calculations);
+  EmulateDrawingOneFrame(root, device_scale_factor);
 
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything (ie, we don't have a valid rect).
   gfx::Rect damage_rect;
   EXPECT_FALSE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
   EXPECT_EQ(root->GetRenderSurface()->content_rect(),
             root->GetRenderSurface()->GetDamageRect());
 }
 
@@ skipping 10 matching lines @@
   // Really far left.
   child1->SetPosition(gfx::PointF(std::numeric_limits<int>::min() + 100, 0));
   child1->SetBounds(gfx::Size(1, 1));
 
   // Really far right.
   child2->SetPosition(gfx::PointF(std::numeric_limits<int>::max() - 100, 0));
   child2->SetBounds(gfx::Size(1, 1));
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   float device_scale_factor = 1.f;
-  bool skip_verify_visible_rect_calculations = true;
-  EmulateDrawingOneFrame(root, device_scale_factor,
-                         skip_verify_visible_rect_calculations);
+  EmulateDrawingOneFrame(root, device_scale_factor);
 
   // The expected damage would be too large to store in a gfx::Rect, so we
   // should damage everything (ie, we don't have a valid rect).
   gfx::Rect damage_rect;
   EXPECT_FALSE(root->GetRenderSurface()->damage_tracker()->GetDamageRectIfValid(
       &damage_rect));
   EXPECT_EQ(root->GetRenderSurface()->content_rect(),
             root->GetRenderSurface()->GetDamageRect());
 }
 
@@ skipping 10 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;
-  bool skip_verify_visible_rect_calculations = true;
   LayerImplList render_surface_layer_list;
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
 
   auto* surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
   surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
@@ skipping 18 matching lines @@
 
   // 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();
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
   surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
   surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
 
@@ skipping 34 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;
-  bool skip_verify_visible_rect_calculations = true;
   LayerImplList render_surface_layer_list;
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
 
   auto* surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
   surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
@@ skipping 18 matching lines @@
 
   // 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();
   ExecuteCalculateDrawProperties(root, device_scale_factor,
-                                 skip_verify_visible_rect_calculations,
                                  &render_surface_layer_list);
   surface = child1->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
   surface = root->GetRenderSurface();
   surface->damage_tracker()->UpdateDamageTrackingState(
       surface->layer_list(), surface, false, surface->content_rect(),
       surface->MaskLayer(), surface->Filters());
 
@@ skipping 10 matching lines @@
   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