cc: Simplify the logic for deciding to update tile priorities.

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 "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/base/thread.h"
 #include "cc/layers/content_layer.h"
@@ skipping 101 matching lines @@
   gfx::Transform identity_matrix;
   LayerImplList dummy_render_surface_layer_list;
   int dummy_max_texture_size = 512;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width() * device_scale_factor,
                 root_layer->bounds().height() * device_scale_factor);
 
   // We are probably not testing what is intended if the root_layer bounds are
   // empty.
   DCHECK(!root_layer->bounds().IsEmpty());
-  LayerTreeHostCommon::CalculateDrawProperties(root_layer,
-                                               device_viewport_size,
-                                               device_scale_factor,
-                                               page_scale_factor,
-                                               dummy_max_texture_size,
-                                               can_use_lcd_text,
-                                               &dummy_render_surface_layer_list,
-                                               false);
+  LayerTreeHostCommon::CalculateDrawProperties(
+      root_layer,
+      device_viewport_size,
+      device_scale_factor,
+      page_scale_factor,
+      dummy_max_texture_size,
+      can_use_lcd_text,
+      &dummy_render_surface_layer_list);
 }
 
 template <class LayerType>
 void ExecuteCalculateDrawProperties(LayerType* root_layer) {
   ExecuteCalculateDrawProperties(root_layer, 1.f, 1.f, false);
 }
 
 template <class LayerType>
 void ExecuteCalculateDrawProperties(LayerType* root_layer,
                                     float device_scale_factor) {
@@ skipping 3946 matching lines @@
   root->SetDrawsContent(true);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit testing for a point outside the layer should return a null pointer.
   gfx::Point test_point(101, 101);
   LayerImpl* result_layer = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
       test_point, render_surface_layer_list);
   EXPECT_FALSE(result_layer);
@@ skipping 53 matching lines @@
   root->AddChild(hud.PassAs<LayerImpl>());
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                hud_bounds,
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(2u, root->render_surface()->layer_list().size());
 
   // Hit testing for a point inside HUD, but outside root should return null
   gfx::Point test_point(101, 101);
   LayerImpl* result_layer = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
       test_point, render_surface_layer_list);
   EXPECT_FALSE(result_layer);
@@ skipping 45 matching lines @@
   root->SetDrawsContent(true);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
   ASSERT_FALSE(root->screen_space_transform().IsInvertible());
 
   // Hit testing any point should not hit the layer. If the invertible matrix is
   // accidentally ignored and treated like an identity, then the hit testing
   // will incorrectly hit the layer when it shouldn't.
   gfx::Point test_point(1, 1);
@@ skipping 54 matching lines @@
   root->SetDrawsContent(true);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit testing for a point outside the layer should return a null pointer.
   gfx::Point test_point(49, 49);
   LayerImpl* result_layer = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
       test_point, render_surface_layer_list);
   EXPECT_FALSE(result_layer);
@@ skipping 43 matching lines @@
   root->SetDrawsContent(true);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit testing for points outside the layer.
   // These corners would have been inside the un-transformed layer, but they
   // should not hit the correctly transformed layer.
   gfx::Point test_point(99, 99);
   LayerImpl* result_layer = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
@@ skipping 56 matching lines @@
   root->SetDrawsContent(true);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit testing for points outside the layer.
   // These corners would have been inside the un-transformed layer, but they
   // should not hit the correctly transformed layer.
   gfx::Point test_point(24, 24);
   LayerImpl* result_layer = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
@@ skipping 67 matching lines @@
   }
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   // The visible content rect for test_layer is actually 100x100, even though
   // its layout size is 50x50, positioned at 25x25.
   LayerImpl* test_layer = root->children()[0];
   EXPECT_RECT_EQ(gfx::Rect(0, 0, 100, 100),
                  test_layer->visible_content_rect());
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
@@ skipping 78 matching lines @@
   }
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
   ASSERT_EQ(456, root->render_surface()->layer_list()[0]->id());
 
   // Hit testing for a point outside the layer should return a null pointer.
   // Despite the child layer being very large, it should be clipped to the root
   // layer's bounds.
   gfx::Point test_point(24, 24);
@@ skipping 111 matching lines @@
   }
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // 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, render_surface_layer_list.size());
   ASSERT_EQ(
       1u, render_surface_layer_list[0]->render_surface()->layer_list().size());
   ASSERT_EQ(789,
             render_surface_layer_list[0]->render_surface()->layer_list()[0]
                 ->id());  // grand_child's surface.
@@ skipping 104 matching lines @@
   }
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
   ASSERT_EQ(456, root->render_surface()->layer_list()[0]->id());
 
   // Hit testing for a point outside the layer should return a null pointer.
   gfx::Point test_point(69, 69);
   LayerImpl* result_layer = LayerTreeHostCommon::FindLayerThatIsHitByPoint(
       test_point, render_surface_layer_list);
@@ skipping 95 matching lines @@
   LayerImpl* grand_child1 = child1->children()[0];
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_TRUE(child1);
   ASSERT_TRUE(child2);
   ASSERT_TRUE(grand_child1);
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(4u, root->render_surface()->layer_list().size());
   ASSERT_EQ(1, root->render_surface()->layer_list()[0]->id());  // root layer
   ASSERT_EQ(2, root->render_surface()->layer_list()[1]->id());  // child1
   ASSERT_EQ(4, root->render_surface()->layer_list()[2]->id());  // grand_child1
@@ skipping 131 matching lines @@
   LayerImpl* grand_child1 = child1->children()[0];
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_TRUE(child1);
   ASSERT_TRUE(child2);
   ASSERT_TRUE(grand_child1);
   ASSERT_TRUE(child1->render_surface());
   ASSERT_TRUE(child2->render_surface());
   ASSERT_TRUE(grand_child1->render_surface());
   ASSERT_EQ(4u, render_surface_layer_list.size());
   // The root surface has the root layer, and child1's and child2's render
@@ skipping 95 matching lines @@
   root->SetDrawsContent(true);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit checking for any point should return a null pointer for a layer without
   // any touch event handler regions.
   gfx::Point test_point(11, 11);
   LayerImpl* result_layer =
       LayerTreeHostCommon::FindLayerThatIsHitByPointInTouchHandlerRegion(
@@ skipping 75 matching lines @@
   root->SetTouchEventHandlerRegion(touch_handler_region);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
   ASSERT_FALSE(root->screen_space_transform().IsInvertible());
 
   // Hit checking any point should not hit the touch handler region on the
   // layer. If the invertible matrix is accidentally ignored and treated like an
   // identity, then the hit testing will incorrectly hit the layer when it
   // shouldn't.
@@ skipping 65 matching lines @@
   root->SetTouchEventHandlerRegion(touch_handler_region);
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit checking for a point outside the layer should return a null pointer.
   gfx::Point test_point(49, 49);
   LayerImpl* result_layer =
       LayerTreeHostCommon::FindLayerThatIsHitByPointInTouchHandlerRegion(
           test_point, render_surface_layer_list);
@@ skipping 83 matching lines @@
   }
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   // The visible content rect for test_layer is actually 100x100, even though
   // its layout size is 50x50, positioned at 25x25.
   LayerImpl* test_layer = root->children()[0];
   EXPECT_RECT_EQ(gfx::Rect(0, 0, 100, 100), test_layer->visible_content_rect());
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Hit checking for a point outside the layer should return a null pointer
@@ skipping 94 matching lines @@
   // Applying the page_scale_factor through impl_transform.
   root->SetImplTransform(page_scale_transform);
   gfx::Size scaled_bounds_for_root = gfx::ToCeiledSize(
       gfx::ScaleSize(root->bounds(), device_scale_factor * page_scale_factor));
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                scaled_bounds_for_root,
                                                device_scale_factor,
                                                1,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   // The visible content rect for test_layer is actually 100x100, even though
   // its layout size is 50x50, positioned at 25x25.
   LayerImpl* test_layer = root->children()[0];
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
 
   // Check whether the child layer fits into the root after scaled.
   EXPECT_RECT_EQ(gfx::Rect(test_layer->content_bounds()),
@@ skipping 117 matching lines @@
   }
 
   LayerImplList render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // Sanity check the scenario we just created.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(1u, root->render_surface()->layer_list().size());
   ASSERT_EQ(456, root->render_surface()->layer_list()[0]->id());
 
   // Hit checking for a point outside the layer should return a null pointer.
   // Despite the child layer being very large, it should be clipped to the root
   // layer's bounds.
   gfx::Point test_point(24, 24);
@@ skipping 1439 matching lines @@
   root->AddChild(child.Pass());
 
   std::vector<LayerImpl*> render_surface_layer_list;
   int dummy_max_texture_size = 512;
   LayerTreeHostCommon::CalculateDrawProperties(root.get(),
                                                root->bounds(),
                                                1.f,
                                                1.f,
                                                dummy_max_texture_size,
                                                false,
-                                               &render_surface_layer_list,
-                                               false);
+                                               &render_surface_layer_list);
 
   // We should have one render surface and two layers. The child
   // layer should be included even though it is transparent.
   ASSERT_EQ(1u, render_surface_layer_list.size());
   ASSERT_EQ(2u, root->render_surface()->layer_list().size());
 }
 
 typedef std::tr1::tuple<bool, bool> LCDTextTestParam;
 class LCDTextTest : public testing::TestWithParam<LCDTextTestParam> {
  protected:
@@ skipping 127 matching lines @@
   EXPECT_EQ(can_use_lcd_text_, child_->can_use_lcd_text());
   EXPECT_EQ(can_use_lcd_text_, grand_child_->can_use_lcd_text());
 }
 
 INSTANTIATE_TEST_CASE_P(LayerTreeHostCommonTest,
                         LCDTextTest,
                         testing::Combine(testing::Bool(), testing::Bool()));
 
 }  // namespace
 }  // namespace cc