| Index: cc/layers/picture_image_layer_impl_unittest.cc
|
| diff --git a/cc/layers/picture_image_layer_impl_unittest.cc b/cc/layers/picture_image_layer_impl_unittest.cc
|
| index 80fa3a819601f029328b05a182ebc68555184d9a..86c906826ed0a55defb62d9271b1126ae7b6b504 100644
|
| --- a/cc/layers/picture_image_layer_impl_unittest.cc
|
| +++ b/cc/layers/picture_image_layer_impl_unittest.cc
|
| @@ -5,13 +5,14 @@
|
| #include "cc/layers/picture_image_layer_impl.h"
|
|
|
| #include "cc/layers/append_quads_data.h"
|
| +#include "cc/quads/draw_quad.h"
|
| #include "cc/resources/tile_priority.h"
|
| #include "cc/test/fake_impl_proxy.h"
|
| #include "cc/test/fake_layer_tree_host_impl.h"
|
| #include "cc/test/fake_output_surface.h"
|
| #include "cc/test/fake_picture_layer_tiling_client.h"
|
| #include "cc/test/impl_side_painting_settings.h"
|
| -#include "cc/test/mock_quad_culler.h"
|
| +#include "cc/test/mock_occlusion_tracker.h"
|
| #include "cc/test/test_shared_bitmap_manager.h"
|
| #include "cc/trees/layer_tree_impl.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -168,13 +169,12 @@ TEST_F(PictureImageLayerImplTest, IgnoreIdealContentScale) {
|
| gfx::Rect(active_layer->bounds());
|
| MockOcclusionTracker<LayerImpl> occlusion_tracker;
|
| scoped_ptr<RenderPass> render_pass = RenderPass::Create();
|
| - MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker);
|
| AppendQuadsData data;
|
| active_layer->WillDraw(DRAW_MODE_SOFTWARE, NULL);
|
| - active_layer->AppendQuads(&quad_culler, &data);
|
| + active_layer->AppendQuads(render_pass.get(), occlusion_tracker, &data);
|
| active_layer->DidDraw(NULL);
|
|
|
| - EXPECT_EQ(DrawQuad::TILED_CONTENT, quad_culler.quad_list()[0]->material);
|
| + EXPECT_EQ(DrawQuad::TILED_CONTENT, render_pass->quad_list[0]->material);
|
|
|
| // Tiles are ready at correct scale, so should not set had_incomplete_tile.
|
| EXPECT_FALSE(data.had_incomplete_tile);
|
|
|