Index: cc/layers/ui_resource_layer_impl_unittest.cc |
diff --git a/cc/layers/ui_resource_layer_impl_unittest.cc b/cc/layers/ui_resource_layer_impl_unittest.cc |
index cd0d7bf02f73c29cecfde4758b5f8917638a5673..59c1300b017d81828cfd543a5137db294dfa6c0c 100644 |
--- a/cc/layers/ui_resource_layer_impl_unittest.cc |
+++ b/cc/layers/ui_resource_layer_impl_unittest.cc |
@@ -4,13 +4,13 @@ |
#include "cc/layers/append_quads_data.h" |
#include "cc/layers/ui_resource_layer_impl.h" |
+#include "cc/quads/draw_quad.h" |
#include "cc/resources/ui_resource_bitmap.h" |
#include "cc/resources/ui_resource_client.h" |
#include "cc/test/fake_impl_proxy.h" |
#include "cc/test/fake_layer_tree_host_impl.h" |
#include "cc/test/fake_ui_resource_layer_tree_host_impl.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/trees/single_thread_proxy.h" |
#include "testing/gmock/include/gmock/gmock.h" |
@@ -47,13 +47,12 @@ void QuadSizeTest(scoped_ptr<UIResourceLayerImpl> layer, |
size_t expected_quad_size) { |
MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
- MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker); |
AppendQuadsData data; |
- layer->AppendQuads(&quad_culler, &data); |
+ layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
// Verify quad rects |
- const QuadList& quads = quad_culler.quad_list(); |
+ const QuadList& quads = render_pass->quad_list; |
EXPECT_EQ(expected_quad_size, quads.size()); |
} |
@@ -89,13 +88,12 @@ void OpaqueBoundsTest(scoped_ptr<UIResourceLayerImpl> layer, |
const gfx::Rect& expected_opaque_bounds) { |
MockOcclusionTracker<LayerImpl> occlusion_tracker; |
scoped_ptr<RenderPass> render_pass = RenderPass::Create(); |
- MockQuadCuller quad_culler(render_pass.get(), &occlusion_tracker); |
AppendQuadsData data; |
- layer->AppendQuads(&quad_culler, &data); |
+ layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
// Verify quad rects |
- const QuadList& quads = quad_culler.quad_list(); |
+ const QuadList& quads = render_pass->quad_list; |
EXPECT_GE(quads.size(), (size_t)0); |
gfx::Rect opaque_rect = quads.at(0)->opaque_rect; |
EXPECT_EQ(expected_opaque_bounds, opaque_rect); |