summaryrefslogtreecommitdiffstats
path: root/cc/test
diff options
context:
space:
mode:
Diffstat (limited to 'cc/test')
-rw-r--r--cc/test/mock_quad_culler.cc8
-rw-r--r--cc/test/mock_quad_culler.h1
-rw-r--r--cc/test/render_pass_test_utils.cc10
3 files changed, 5 insertions, 14 deletions
diff --git a/cc/test/mock_quad_culler.cc b/cc/test/mock_quad_culler.cc
index 781647d..773430f 100644
--- a/cc/test/mock_quad_culler.cc
+++ b/cc/test/mock_quad_culler.cc
@@ -60,14 +60,6 @@ gfx::Rect MockQuadCuller::UnoccludedContributingSurfaceContentRect(
return result;
}
-bool MockQuadCuller::MaybeAppend(scoped_ptr<DrawQuad> draw_quad) {
- if (!draw_quad->rect.IsEmpty()) {
- active_quad_list_->push_back(draw_quad.Pass());
- return true;
- }
- return false;
-}
-
void MockQuadCuller::Append(scoped_ptr<DrawQuad> draw_quad) {
DCHECK(!draw_quad->rect.IsEmpty());
DCHECK(!draw_quad->visible_rect.IsEmpty());
diff --git a/cc/test/mock_quad_culler.h b/cc/test/mock_quad_culler.h
index 541f66b..6e3436a 100644
--- a/cc/test/mock_quad_culler.h
+++ b/cc/test/mock_quad_culler.h
@@ -29,7 +29,6 @@ class MockQuadCuller : public QuadSink {
virtual gfx::Rect UnoccludedContributingSurfaceContentRect(
const gfx::Rect& content_rect,
const gfx::Transform& draw_transform) OVERRIDE;
- virtual bool MaybeAppend(scoped_ptr<DrawQuad> draw_quad) OVERRIDE;
virtual void Append(scoped_ptr<DrawQuad> draw_quad) OVERRIDE;
const QuadList& quad_list() const { return *active_quad_list_; }
diff --git a/cc/test/render_pass_test_utils.cc b/cc/test/render_pass_test_utils.cc
index 679ce19..8d0d955 100644
--- a/cc/test/render_pass_test_utils.cc
+++ b/cc/test/render_pass_test_utils.cc
@@ -44,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.MaybeAppend(quad.PassAs<DrawQuad>());
+ quad_sink.Append(quad.PassAs<DrawQuad>());
return quad_ptr;
}
@@ -64,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.MaybeAppend(quad.PassAs<DrawQuad>());
+ quad_sink.Append(quad.PassAs<DrawQuad>());
return quad_ptr;
}
@@ -80,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.MaybeAppend(quad.PassAs<DrawQuad>());
+ quad_sink.Append(quad.PassAs<DrawQuad>());
return quad_ptr;
}
@@ -109,7 +109,7 @@ void AddRenderPassQuad(TestRenderPass* to_pass,
gfx::RectF(),
FilterOperations(),
FilterOperations());
- quad_sink.MaybeAppend(quad.PassAs<DrawQuad>());
+ quad_sink.Append(quad.PassAs<DrawQuad>());
}
void AddRenderPassQuad(TestRenderPass* to_pass,
@@ -140,7 +140,7 @@ void AddRenderPassQuad(TestRenderPass* to_pass,
gfx::RectF(),
filters,
FilterOperations());
- quad_sink.MaybeAppend(quad.PassAs<DrawQuad>());
+ quad_sink.Append(quad.PassAs<DrawQuad>());
}
} // namespace cc