diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 15:48:48 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-23 15:48:48 +0000 |
| commit | 59be4dbc6242ed7c8d5c29aec529f9fc7c7e9da9 (patch) | |
| tree | 627df820ed95c7c266378f6017eb274a15e42279 /cc/test | |
| parent | fc6b05e9e695857354c4b4160d16581172815fee (diff) | |
| download | chromium_src-59be4dbc6242ed7c8d5c29aec529f9fc7c7e9da9.zip chromium_src-59be4dbc6242ed7c8d5c29aec529f9fc7c7e9da9.tar.gz chromium_src-59be4dbc6242ed7c8d5c29aec529f9fc7c7e9da9.tar.bz2 | |
Remove QuadSink::MaybeAppend and the QuadCuller unit tests.
The QuadCuller unit tests are now testing the TiledLayerImpl instead
of the QuadCuller, and have been superceded by the
FooLayerImpl.Occlusion tests for each LayerImpl subclass.
R=enne@chromium.org
BUG=344962
Review URL: https://codereview.chromium.org/248223002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/test')
| -rw-r--r-- | cc/test/mock_quad_culler.cc | 8 | ||||
| -rw-r--r-- | cc/test/mock_quad_culler.h | 1 | ||||
| -rw-r--r-- | cc/test/render_pass_test_utils.cc | 10 |
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 |