From 2f6816dabb5202210f62f8946856e9981bc6e6a6 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Wed, 12 Mar 2014 06:58:49 +0000 Subject: cc: Remove the AppendQuadsData from QuadSink::Append. The variable was unused, so drop it. R=enne BUG=344962 Review URL: https://codereview.chromium.org/194573009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256466 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/render_pass_test_utils.cc | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'cc/test/render_pass_test_utils.cc') diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc index 5db6799..8d0d955 100644 --- a/cc/test/render_pass_test_utils.cc +++ b/cc/test/render_pass_test_utils.cc @@ -4,7 +4,6 @@ #include "cc/test/render_pass_test_utils.h" -#include "cc/layers/append_quads_data.h" #include "cc/layers/quad_sink.h" #include "cc/quads/render_pass_draw_quad.h" #include "cc/quads/shared_quad_state.h" @@ -33,7 +32,6 @@ SolidColorDrawQuad* AddQuad(TestRenderPass* pass, const gfx::Rect& rect, SkColor color) { MockQuadCuller quad_sink(&pass->quad_list, &pass->shared_quad_state_list); - AppendQuadsData data(pass->id); SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); shared_state->SetAll(gfx::Transform(), @@ -46,7 +44,7 @@ SolidColorDrawQuad* AddQuad(TestRenderPass* pass, scoped_ptr quad = SolidColorDrawQuad::Create(); quad->SetNew(shared_state, rect, rect, color, false); SolidColorDrawQuad* quad_ptr = quad.get(); - quad_sink.Append(quad.PassAs(), &data); + quad_sink.Append(quad.PassAs()); return quad_ptr; } @@ -54,7 +52,6 @@ SolidColorDrawQuad* AddClippedQuad(TestRenderPass* pass, const gfx::Rect& rect, SkColor color) { MockQuadCuller quad_sink(&pass->quad_list, &pass->shared_quad_state_list); - AppendQuadsData data(pass->id); SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); shared_state->SetAll(gfx::Transform(), @@ -67,7 +64,7 @@ SolidColorDrawQuad* AddClippedQuad(TestRenderPass* pass, scoped_ptr quad = SolidColorDrawQuad::Create(); quad->SetNew(shared_state, rect, rect, color, false); SolidColorDrawQuad* quad_ptr = quad.get(); - quad_sink.Append(quad.PassAs(), &data); + quad_sink.Append(quad.PassAs()); return quad_ptr; } @@ -76,7 +73,6 @@ SolidColorDrawQuad* AddTransformedQuad(TestRenderPass* pass, SkColor color, const gfx::Transform& transform) { MockQuadCuller quad_sink(&pass->quad_list, &pass->shared_quad_state_list); - AppendQuadsData data(pass->id); SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); shared_state->SetAll( @@ -84,7 +80,7 @@ SolidColorDrawQuad* AddTransformedQuad(TestRenderPass* pass, scoped_ptr quad = SolidColorDrawQuad::Create(); quad->SetNew(shared_state, rect, rect, color, false); SolidColorDrawQuad* quad_ptr = quad.get(); - quad_sink.Append(quad.PassAs(), &data); + quad_sink.Append(quad.PassAs()); return quad_ptr; } @@ -92,7 +88,6 @@ void AddRenderPassQuad(TestRenderPass* to_pass, TestRenderPass* contributing_pass) { MockQuadCuller quad_sink(&to_pass->quad_list, &to_pass->shared_quad_state_list); - AppendQuadsData data(to_pass->id); gfx::Rect output_rect = contributing_pass->output_rect; SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); @@ -114,7 +109,7 @@ void AddRenderPassQuad(TestRenderPass* to_pass, gfx::RectF(), FilterOperations(), FilterOperations()); - quad_sink.Append(quad.PassAs(), &data); + quad_sink.Append(quad.PassAs()); } void AddRenderPassQuad(TestRenderPass* to_pass, @@ -124,7 +119,6 @@ void AddRenderPassQuad(TestRenderPass* to_pass, gfx::Transform transform) { MockQuadCuller quad_sink(&to_pass->quad_list, &to_pass->shared_quad_state_list); - AppendQuadsData data(to_pass->id); gfx::Rect output_rect = contributing_pass->output_rect; SharedQuadState* shared_state = quad_sink.UseSharedQuadState(SharedQuadState::Create()); @@ -146,7 +140,7 @@ void AddRenderPassQuad(TestRenderPass* to_pass, gfx::RectF(), filters, FilterOperations()); - quad_sink.Append(quad.PassAs(), &data); + quad_sink.Append(quad.PassAs()); } } // namespace cc -- cgit v1.1