summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 06:58:49 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 06:58:49 +0000
commit2f6816dabb5202210f62f8946856e9981bc6e6a6 (patch)
tree11ec4fe4de0379c4603a189152ccec99884b23b7 /cc/test
parente55515f306a3156dd959a2a66a13ff346e5d909e (diff)
downloadchromium_src-2f6816dabb5202210f62f8946856e9981bc6e6a6.zip
chromium_src-2f6816dabb5202210f62f8946856e9981bc6e6a6.tar.gz
chromium_src-2f6816dabb5202210f62f8946856e9981bc6e6a6.tar.bz2
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
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/mock_quad_culler.cc2
-rw-r--r--cc/test/mock_quad_culler.h3
-rw-r--r--cc/test/render_pass_test_utils.cc16
3 files changed, 7 insertions, 14 deletions
diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc
index f9924c8..7bf70b7 100644
--- a/cc/test/mock_quad_culler.cc
+++ b/cc/test/mock_quad_culler.cc
@@ -20,7 +20,7 @@ MockQuadCuller::MockQuadCuller(
MockQuadCuller::~MockQuadCuller() {}
-bool MockQuadCuller::Append(scoped_ptr<DrawQuad> draw_quad, AppendQuadsData*) {
+bool MockQuadCuller::Append(scoped_ptr<DrawQuad> draw_quad) {
if (!draw_quad->rect.IsEmpty()) {
active_quad_list_->push_back(draw_quad.Pass());
return true;
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h
index 4b9ef1e..238f187 100644
--- a/cc/test/mock_quad_culler.h
+++ b/cc/test/mock_quad_culler.h
@@ -21,8 +21,7 @@ class MockQuadCuller : public QuadSink {
SharedQuadStateList* external_shared_quad_state_list);
// QuadSink interface.
- virtual bool Append(scoped_ptr<DrawQuad> draw_quad,
- AppendQuadsData* append_quads_data) OVERRIDE;
+ virtual bool Append(scoped_ptr<DrawQuad> draw_quad) OVERRIDE;
virtual SharedQuadState* UseSharedQuadState(
scoped_ptr<SharedQuadState> shared_quad_state) OVERRIDE;
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<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
quad->SetNew(shared_state, rect, rect, color, false);
SolidColorDrawQuad* quad_ptr = quad.get();
- quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
+ quad_sink.Append(quad.PassAs<DrawQuad>());
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<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
quad->SetNew(shared_state, rect, rect, color, false);
SolidColorDrawQuad* quad_ptr = quad.get();
- quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
+ quad_sink.Append(quad.PassAs<DrawQuad>());
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<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
quad->SetNew(shared_state, rect, rect, color, false);
SolidColorDrawQuad* quad_ptr = quad.get();
- quad_sink.Append(quad.PassAs<DrawQuad>(), &data);
+ quad_sink.Append(quad.PassAs<DrawQuad>());
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<DrawQuad>(), &data);
+ quad_sink.Append(quad.PassAs<DrawQuad>());
}
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<DrawQuad>(), &data);
+ quad_sink.Append(quad.PassAs<DrawQuad>());
}
} // namespace cc