Index: cc/layers/picture_layer_impl_unittest.cc |
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc |
index 194e704a66d33859c8c30427c4f1de32b8239629..64216e513cda4c7a0df39dc641811568f24315a5 100644 |
--- a/cc/layers/picture_layer_impl_unittest.cc |
+++ b/cc/layers/picture_layer_impl_unittest.cc |
@@ -11,6 +11,7 @@ |
#include "cc/layers/append_quads_data.h" |
#include "cc/layers/picture_layer.h" |
+#include "cc/quads/draw_quad.h" |
#include "cc/test/fake_content_layer_client.h" |
#include "cc/test/fake_impl_proxy.h" |
#include "cc/test/fake_layer_tree_host_impl.h" |
@@ -20,7 +21,6 @@ |
#include "cc/test/geometry_test_utils.h" |
#include "cc/test/impl_side_painting_settings.h" |
#include "cc/test/layer_test_common.h" |
-#include "cc/test/mock_quad_culler.h" |
#include "cc/test/test_shared_bitmap_manager.h" |
#include "cc/test/test_web_graphics_context_3d.h" |
#include "cc/trees/layer_tree_impl.h" |
@@ -1385,7 +1385,6 @@ TEST_F(PictureLayerImplTest, ClampSingleTileToToMaxTileSize) { |
TEST_F(PictureLayerImplTest, DisallowTileDrawQuads) { |
MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
- MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker); |
gfx::Size tile_size(400, 400); |
gfx::Size layer_bounds(1300, 1900); |
@@ -1407,11 +1406,11 @@ TEST_F(PictureLayerImplTest, DisallowTileDrawQuads) { |
AppendQuadsData data; |
active_layer_->WillDraw(DRAW_MODE_RESOURCELESS_SOFTWARE, NULL); |
- active_layer_->AppendQuads(&quad_culler, &data); |
+ active_layer_->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
active_layer_->DidDraw(NULL); |
- ASSERT_EQ(1U, quad_culler.quad_list().size()); |
- EXPECT_EQ(DrawQuad::PICTURE_CONTENT, quad_culler.quad_list()[0]->material); |
+ ASSERT_EQ(1U, render_pass->quad_list.size()); |
+ EXPECT_EQ(DrawQuad::PICTURE_CONTENT, render_pass->quad_list[0]->material); |
} |
TEST_F(PictureLayerImplTest, MarkRequiredNullTiles) { |