Index: cc/layers/tiled_layer_impl_unittest.cc |
diff --git a/cc/layers/tiled_layer_impl_unittest.cc b/cc/layers/tiled_layer_impl_unittest.cc |
index 50d7baaaef483d62eba43f570ef0f93a6b4800c5..ffc89c8e8dddf351da4f9ef99637d9b2b92974e1 100644 |
--- a/cc/layers/tiled_layer_impl_unittest.cc |
+++ b/cc/layers/tiled_layer_impl_unittest.cc |
@@ -70,9 +70,8 @@ class TiledLayerImplTest : public testing::Test { |
layer->draw_properties().visible_content_rect = visible_content_rect; |
layer->SetBounds(layer_size); |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
AppendQuadsData data; |
- layer->AppendQuads(render_pass, occlusion_tracker, &data); |
+ layer->AppendQuads(render_pass, Occlusion(), &data); |
} |
protected: |
@@ -92,12 +91,11 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) { |
{ |
scoped_ptr<TiledLayerImpl> layer = |
CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS); |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
AppendQuadsData data; |
EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL)); |
- layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
+ layer->AppendQuads(render_pass.get(), Occlusion(), &data); |
layer->DidDraw(NULL); |
unsigned num_tiles = num_tiles_x * num_tiles_y; |
EXPECT_EQ(render_pass->quad_list.size(), num_tiles); |
@@ -109,7 +107,6 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) { |
CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS); |
layer->draw_properties().visible_content_rect = gfx::Rect(); |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
EXPECT_FALSE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL)); |
@@ -123,12 +120,11 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) { |
gfx::Rect outside_bounds(-100, -100, 50, 50); |
layer->draw_properties().visible_content_rect = outside_bounds; |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
AppendQuadsData data; |
EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL)); |
- layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
+ layer->AppendQuads(render_pass.get(), Occlusion(), &data); |
layer->DidDraw(NULL); |
EXPECT_EQ(render_pass->quad_list.size(), 0u); |
} |
@@ -139,11 +135,10 @@ TEST_F(TiledLayerImplTest, EmptyQuadList) { |
CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS); |
layer->set_skips_draw(true); |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
AppendQuadsData data; |
- layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
+ layer->AppendQuads(render_pass.get(), Occlusion(), &data); |
EXPECT_EQ(render_pass->quad_list.size(), 0u); |
} |
} |
@@ -160,11 +155,10 @@ TEST_F(TiledLayerImplTest, Checkerboarding) { |
// No checkerboarding |
{ |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
AppendQuadsData data; |
- layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
+ layer->AppendQuads(render_pass.get(), Occlusion(), &data); |
EXPECT_EQ(render_pass->quad_list.size(), 4u); |
EXPECT_EQ(0u, data.num_missing_tiles); |
@@ -178,11 +172,10 @@ TEST_F(TiledLayerImplTest, Checkerboarding) { |
// All checkerboarding |
{ |
- MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
AppendQuadsData data; |
- layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
+ layer->AppendQuads(render_pass.get(), Occlusion(), &data); |
EXPECT_LT(0u, data.num_missing_tiles); |
EXPECT_EQ(render_pass->quad_list.size(), 4u); |
for (const auto& quad : render_pass->quad_list) |