Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: cc/quads/render_pass_unittest.cc

Issue 1271843005: cc: Remove code for drawing checkerboard quads, it's not used. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rm-checkers: sizes Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/quads/render_pass.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/render_pass_unittest.cc
diff --git a/cc/quads/render_pass_unittest.cc b/cc/quads/render_pass_unittest.cc
index 5ab8c3170c3488011d8910e2ab6ceaa4fc31fae0..5661aa0712aff32c0f3b01da3d0c03181009e80a 100644
--- a/cc/quads/render_pass_unittest.cc
+++ b/cc/quads/render_pass_unittest.cc
@@ -7,8 +7,8 @@
#include "cc/base/math_util.h"
#include "cc/base/scoped_ptr_vector.h"
#include "cc/output/copy_output_request.h"
-#include "cc/quads/checkerboard_draw_quad.h"
#include "cc/quads/render_pass_draw_quad.h"
+#include "cc/quads/solid_color_draw_quad.h"
#include "cc/test/geometry_test_utils.h"
#include "cc/test/render_pass_test_common.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -92,10 +92,10 @@ TEST(RenderPassTest, CopyShouldBeIdenticalExceptIdAndQuads) {
SkXfermode::kSrcOver_Mode,
0);
- CheckerboardDrawQuad* checkerboard_quad =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad->SetNew(pass->shared_quad_state_list.back(), gfx::Rect(),
- gfx::Rect(), SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad->SetNew(pass->shared_quad_state_list.back(), gfx::Rect(),
+ gfx::Rect(), SkColor(), false);
RenderPassId new_id(63, 4);
@@ -143,17 +143,17 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
SkXfermode::kSrcOver_Mode,
0);
- CheckerboardDrawQuad* checkerboard_quad1 =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad1->SetNew(pass->shared_quad_state_list.back(),
- gfx::Rect(1, 1, 1, 1), gfx::Rect(1, 1, 1, 1),
- SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad1 =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad1->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(1, 1, 1, 1), gfx::Rect(1, 1, 1, 1), SkColor(),
+ false);
- CheckerboardDrawQuad* checkerboard_quad2 =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad2->SetNew(pass->shared_quad_state_list.back(),
- gfx::Rect(2, 2, 2, 2), gfx::Rect(2, 2, 2, 2),
- SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad2 =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad2->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(2, 2, 2, 2), gfx::Rect(2, 2, 2, 2), SkColor(),
+ false);
// And two quads using another shared state.
SharedQuadState* shared_state2 = pass->CreateAndAppendSharedQuadState();
@@ -166,17 +166,17 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
SkXfermode::kSrcOver_Mode,
0);
- CheckerboardDrawQuad* checkerboard_quad3 =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad3->SetNew(pass->shared_quad_state_list.back(),
- gfx::Rect(3, 3, 3, 3), gfx::Rect(3, 3, 3, 3),
- SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad3 =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad3->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(3, 3, 3, 3), gfx::Rect(3, 3, 3, 3), SkColor(),
+ false);
- CheckerboardDrawQuad* checkerboard_quad4 =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad4->SetNew(pass->shared_quad_state_list.back(),
- gfx::Rect(4, 4, 4, 4), gfx::Rect(4, 4, 4, 4),
- SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad4 =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad4->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(4, 4, 4, 4), gfx::Rect(4, 4, 4, 4), SkColor(),
+ false);
// A second render pass with a quad.
RenderPassId contrib_id(4, 1);
@@ -204,11 +204,11 @@ TEST(RenderPassTest, CopyAllShouldBeIdentical) {
SkXfermode::kSrcOver_Mode,
0);
- CheckerboardDrawQuad* contrib_quad =
- contrib->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
+ SolidColorDrawQuad* contrib_quad =
+ contrib->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
contrib_quad->SetNew(contrib->shared_quad_state_list.back(),
gfx::Rect(3, 3, 3, 3), gfx::Rect(3, 3, 3, 3), SkColor(),
- 1.f);
+ false);
// And a RenderPassDrawQuad for the contributing pass.
scoped_ptr<RenderPassDrawQuad> pass_quad =
@@ -262,11 +262,11 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) {
SkXfermode::kSrcOver_Mode,
0);
- CheckerboardDrawQuad* checkerboard_quad1 =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad1->SetNew(pass->shared_quad_state_list.back(),
- gfx::Rect(1, 1, 1, 1), gfx::Rect(1, 1, 1, 1),
- SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad1 =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad1->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(1, 1, 1, 1), gfx::Rect(1, 1, 1, 1), SkColor(),
+ false);
// A shared state with no quads, they were culled.
SharedQuadState* shared_state2 = pass->CreateAndAppendSharedQuadState();
@@ -301,11 +301,11 @@ TEST(RenderPassTest, CopyAllWithCulledQuads) {
SkXfermode::kSrcOver_Mode,
0);
- CheckerboardDrawQuad* checkerboard_quad2 =
- pass->CreateAndAppendDrawQuad<CheckerboardDrawQuad>();
- checkerboard_quad2->SetNew(pass->shared_quad_state_list.back(),
- gfx::Rect(3, 3, 3, 3), gfx::Rect(3, 3, 3, 3),
- SkColor(), 1.f);
+ SolidColorDrawQuad* color_quad2 =
+ pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+ color_quad2->SetNew(pass->shared_quad_state_list.back(),
+ gfx::Rect(3, 3, 3, 3), gfx::Rect(3, 3, 3, 3), SkColor(),
+ false);
pass_list.push_back(pass.Pass());
« no previous file with comments | « cc/quads/render_pass.cc ('k') | cc/test/render_pass_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698