diff options
Diffstat (limited to 'cc/trees')
| -rw-r--r-- | cc/trees/layer_tree_host_impl.cc | 5 | ||||
| -rw-r--r-- | cc/trees/layer_tree_host_impl_unittest.cc | 5 | ||||
| -rw-r--r-- | cc/trees/quad_culler.cc | 3 | ||||
| -rw-r--r-- | cc/trees/quad_culler.h | 3 | ||||
| -rw-r--r-- | cc/trees/quad_culler_unittest.cc | 14 |
5 files changed, 12 insertions, 18 deletions
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc index d4c48f9..91aefdd 100644 --- a/cc/trees/layer_tree_host_impl.cc +++ b/cc/trees/layer_tree_host_impl.cc @@ -653,7 +653,6 @@ static void AppendQuadsToFillScreen( opacity, SkXfermode::kSrcOver_Mode); - AppendQuadsData append_quads_data; for (Region::Iterator fill_rects(screen_background_color_region); fill_rects.has_rect(); fill_rects.next()) { @@ -667,7 +666,7 @@ static void AppendQuadsToFillScreen( visible_screen_space_rect, screen_background_color, false); - quad_culler.Append(quad.PassAs<DrawQuad>(), &append_quads_data); + quad_culler.Append(quad.PassAs<DrawQuad>()); } for (Region::Iterator fill_rects(overhang_region); fill_rects.has_rect(); @@ -695,7 +694,7 @@ static void AppendQuadsToFillScreen( screen_background_color, vertex_opacity, false); - quad_culler.Append(tex_quad.PassAs<DrawQuad>(), &append_quads_data); + quad_culler.Append(tex_quad.PassAs<DrawQuad>()); } } diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc index f47b3d7..a652c94 100644 --- a/cc/trees/layer_tree_host_impl_unittest.cc +++ b/cc/trees/layer_tree_host_impl_unittest.cc @@ -3186,8 +3186,7 @@ class BlendStateCheckLayer : public LayerImpl { test_blending_draw_quad->visible_rect = quad_visible_rect_; EXPECT_EQ(blend_, test_blending_draw_quad->ShouldDrawWithBlending()); EXPECT_EQ(has_render_surface_, !!render_surface()); - quad_sink->Append(test_blending_draw_quad.PassAs<DrawQuad>(), - append_quads_data); + quad_sink->Append(test_blending_draw_quad.PassAs<DrawQuad>()); } void SetExpectation(bool blend, bool has_render_surface) { @@ -3961,7 +3960,7 @@ class FakeLayerWithQuads : public LayerImpl { scoped_ptr<SolidColorDrawQuad> my_quad = SolidColorDrawQuad::Create(); my_quad->SetNew( shared_quad_state, quad_rect, visible_quad_rect, gray, false); - quad_sink->Append(my_quad.PassAs<DrawQuad>(), append_quads_data); + quad_sink->Append(my_quad.PassAs<DrawQuad>()); } private: diff --git a/cc/trees/quad_culler.cc b/cc/trees/quad_culler.cc index bbbca9e..bfd99d3 100644 --- a/cc/trees/quad_culler.cc +++ b/cc/trees/quad_culler.cc @@ -80,8 +80,7 @@ static inline bool AppendQuadInternal( return keep_quad; } -bool QuadCuller::Append(scoped_ptr<DrawQuad> draw_quad, - AppendQuadsData* append_quads_data) { +bool QuadCuller::Append(scoped_ptr<DrawQuad> draw_quad) { DCHECK(draw_quad->shared_quad_state == current_shared_quad_state_); DCHECK(!shared_quad_state_list_->empty()); DCHECK(shared_quad_state_list_->back() == current_shared_quad_state_); diff --git a/cc/trees/quad_culler.h b/cc/trees/quad_culler.h index 3d71543..7fdf5e8 100644 --- a/cc/trees/quad_culler.h +++ b/cc/trees/quad_culler.h @@ -28,8 +28,7 @@ class CC_EXPORT QuadCuller : public QuadSink { // QuadSink implementation. virtual SharedQuadState* UseSharedQuadState( scoped_ptr<SharedQuadState> shared_quad_state) OVERRIDE; - virtual bool Append(scoped_ptr<DrawQuad> draw_quad, - AppendQuadsData* append_quads_data) OVERRIDE; + virtual bool Append(scoped_ptr<DrawQuad> draw_quad) OVERRIDE; private: QuadList* quad_list_; diff --git a/cc/trees/quad_culler_unittest.cc b/cc/trees/quad_culler_unittest.cc index c716955..d7cd99ab 100644 --- a/cc/trees/quad_culler_unittest.cc +++ b/cc/trees/quad_culler_unittest.cc @@ -839,10 +839,9 @@ TEST_F(QuadCullerTest, PartialCullingNotDestroyed) { EXPECT_EQ(0u, quad_list.size()); - AppendQuadsData data; - culler.Append(color_quad.PassAs<DrawQuad>(), &data); - culler.Append(pass_quad.PassAs<DrawQuad>(), &data); - culler.Append(replica_quad.PassAs<DrawQuad>(), &data); + culler.Append(color_quad.PassAs<DrawQuad>()); + culler.Append(pass_quad.PassAs<DrawQuad>()); + culler.Append(replica_quad.PassAs<DrawQuad>()); ASSERT_EQ(3u, quad_list.size()); @@ -919,10 +918,9 @@ TEST_F(QuadCullerTest, PartialCullingWithOcclusionNotDestroyed) { EXPECT_EQ(0u, quad_list.size()); - AppendQuadsData data; - culler.Append(color_quad.PassAs<DrawQuad>(), &data); - culler.Append(pass_quad.PassAs<DrawQuad>(), &data); - culler.Append(replica_quad.PassAs<DrawQuad>(), &data); + culler.Append(color_quad.PassAs<DrawQuad>()); + culler.Append(pass_quad.PassAs<DrawQuad>()); + culler.Append(replica_quad.PassAs<DrawQuad>()); ASSERT_EQ(3u, quad_list.size()); |