Index: cc/trees/layer_tree_impl_unittest.cc |
diff --git a/cc/trees/layer_tree_impl_unittest.cc b/cc/trees/layer_tree_impl_unittest.cc |
index ed081140326e824d072f320ae7b6fe48e6ad8620..4fa154670c0a406724aebefee4347d5a5dd270bb 100644 |
--- a/cc/trees/layer_tree_impl_unittest.cc |
+++ b/cc/trees/layer_tree_impl_unittest.cc |
@@ -10,7 +10,6 @@ |
#include "cc/test/fake_layer_tree_host_impl.h" |
#include "cc/test/geometry_test_utils.h" |
#include "cc/test/layer_test_common.h" |
-#include "cc/test/layer_tree_settings_for_testing.h" |
#include "cc/trees/clip_node.h" |
#include "cc/trees/draw_property_utils.h" |
#include "cc/trees/layer_tree_host_common.h" |
@@ -22,7 +21,7 @@ |
namespace cc { |
namespace { |
-class LayerTreeImplTestSettings : public LayerTreeSettingsForTesting { |
+class LayerTreeImplTestSettings : public LayerTreeSettings { |
public: |
LayerTreeImplTestSettings() { |
layer_transforms_should_scale_layer_contents = true; |
@@ -41,9 +40,7 @@ class LayerTreeImplTest : public testing::Test { |
return host_impl().active_tree()->RenderSurfaceLayerList(); |
} |
- void ExecuteCalculateDrawProperties( |
- LayerImpl* root_layer, |
- bool skip_verify_visible_rect_calculations = false) { |
+ void ExecuteCalculateDrawProperties(LayerImpl* root_layer) { |
// We are probably not testing what is intended if the root_layer bounds are |
// empty. |
DCHECK(!root_layer->bounds().IsEmpty()); |
@@ -52,8 +49,6 @@ class LayerTreeImplTest : public testing::Test { |
LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs( |
root_layer, root_layer->bounds(), &render_surface_layer_list_impl_); |
inputs.can_adjust_raster_scales = true; |
- if (skip_verify_visible_rect_calculations) |
- inputs.verify_visible_rect_calculations = false; |
LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs); |
} |
@@ -247,14 +242,7 @@ TEST_F(LayerTreeImplTest, HitTestingForUninvertibleTransform) { |
root->SetDrawsContent(true); |
host_impl().SetViewportSize(root->bounds()); |
- // While computing visible rects by combining clips in screen space, we set |
- // the entire layer as visible if the screen space transform is singular. This |
- // is not always true when we combine clips in target space because if the |
- // intersection of combined_clip in taret space with layer_rect projected to |
- // target space is empty, we set it to an empty rect. |
- bool skip_verify_visible_rect_calculations = true; |
- host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree( |
- skip_verify_visible_rect_calculations); |
+ host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, RenderSurfaceLayerList().size()); |
ASSERT_EQ(1u, root_layer()->GetRenderSurface()->layer_list().size()); |
@@ -441,10 +429,6 @@ TEST_F(LayerTreeImplTest, HitTestingClipNodeDifferentTransformAndTargetIds) { |
host_impl().active_tree()->FindLayerThatIsHitByPoint(test_point); |
ASSERT_TRUE(result_layer); |
EXPECT_EQ(5, result_layer->id()); |
- |
- ClipTree& clip_tree = host_impl().active_tree()->property_trees()->clip_tree; |
- ClipNode* clip_node = clip_tree.Node(result_layer->clip_tree_index()); |
- EXPECT_NE(clip_node->transform_id, clip_node->target_transform_id); |
} |
TEST_F(LayerTreeImplTest, HitTestingSiblings) { |
@@ -637,7 +621,6 @@ TEST_F(LayerTreeImplTest, HitTestingForMultiClippedRotatedLayer) { |
// Visible rects computed by combinig clips in target space and root space |
// don't match because of rotation transforms. So, we skip |
// verify_visible_rect_calculations. |
- bool skip_verify_visible_rect_calculations = true; |
{ |
std::unique_ptr<LayerImpl> child = |
LayerImpl::Create(host_impl().active_tree(), 456); |
@@ -677,12 +660,11 @@ TEST_F(LayerTreeImplTest, HitTestingForMultiClippedRotatedLayer) { |
child->test_properties()->AddChild(std::move(grand_child)); |
root->test_properties()->AddChild(std::move(child)); |
- ExecuteCalculateDrawProperties(root, skip_verify_visible_rect_calculations); |
+ ExecuteCalculateDrawProperties(root); |
} |
host_impl().SetViewportSize(root->bounds()); |
- host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree( |
- skip_verify_visible_rect_calculations); |
+ host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); |
// (11, 89) is close to the the bottom left corner within the clip, but it is |
// not inside the layer. |
gfx::PointF test_point(11.f, 89.f); |
@@ -1343,14 +1325,7 @@ TEST_F(LayerTreeImplTest, |
root->SetTouchEventHandlerRegion(touch_handler_region); |
host_impl().SetViewportSize(root->bounds()); |
- // While computing visible rects by combining clips in screen space, we set |
- // the entire layer as visible if the screen space transform is singular. This |
- // is not always true when we combine clips in target space because if the |
- // intersection of combined_clip in taret space with layer_rect projected to |
- // target space is empty, we set it to an empty rect. |
- bool skip_verify_visible_rect_calculations = true; |
- host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree( |
- skip_verify_visible_rect_calculations); |
+ host_impl().UpdateNumChildrenAndDrawPropertiesForActiveTree(); |
// Sanity check the scenario we just created. |
ASSERT_EQ(1u, RenderSurfaceLayerList().size()); |