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

Unified Diff: cc/draw_quad_unittest.cc

Issue 11416088: cc: Turn SharedQuadState into a struct-like class similar to DrawQuads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix debug build Created 8 years, 1 month 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/draw_quad.h ('k') | cc/layer_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/draw_quad_unittest.cc
diff --git a/cc/draw_quad_unittest.cc b/cc/draw_quad_unittest.cc
index f0544e451cb3af82cd4a388669e7dc1523da74db..d1d8c99af11466f9f48433ab38d5947357434a2d 100644
--- a/cc/draw_quad_unittest.cc
+++ b/cc/draw_quad_unittest.cc
@@ -28,16 +28,14 @@ TEST(DrawQuadTest, copySharedQuadState)
gfx::Rect visibleContentRect(10, 12, 14, 16);
gfx::Rect clippedRectInTarget(19, 21, 23, 25);
float opacity = 0.25;
- int id = 3;
- scoped_ptr<SharedQuadState> state(SharedQuadState::create(quadTransform, visibleContentRect, clippedRectInTarget, opacity));
- state->id = id;
+ scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
+ state->SetAll(quadTransform, visibleContentRect, clippedRectInTarget, opacity);
- scoped_ptr<SharedQuadState> copy(state->copy());
- EXPECT_EQ(id, copy->id);
- EXPECT_EQ(quadTransform, copy->quadTransform);
- EXPECT_RECT_EQ(visibleContentRect, copy->visibleContentRect);
- EXPECT_RECT_EQ(clippedRectInTarget, copy->clippedRectInTarget);
+ scoped_ptr<SharedQuadState> copy(state->Copy());
+ EXPECT_EQ(quadTransform, copy->content_to_target_transform);
+ EXPECT_RECT_EQ(visibleContentRect, copy->visible_content_rect);
+ EXPECT_RECT_EQ(clippedRectInTarget, copy->clipped_rect_in_target);
EXPECT_EQ(opacity, copy->opacity);
}
@@ -47,10 +45,9 @@ scoped_ptr<SharedQuadState> createSharedQuadState()
gfx::Rect visibleContentRect(10, 12, 14, 16);
gfx::Rect clippedRectInTarget(19, 21, 23, 25);
float opacity = 1;
- int id = 3;
- scoped_ptr<SharedQuadState> state(SharedQuadState::create(quadTransform, visibleContentRect, clippedRectInTarget, opacity));
- state->id = id;
+ scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
+ state->SetAll(quadTransform, visibleContentRect, clippedRectInTarget, opacity);
return state.Pass();
}
@@ -66,8 +63,7 @@ void compareDrawQuad(DrawQuad* quad, DrawQuad* copy, SharedQuadState* copyShared
#define CREATE_SHARED_STATE() \
scoped_ptr<SharedQuadState> sharedState(createSharedQuadState()); \
- scoped_ptr<SharedQuadState> copySharedState(sharedState->copy()); \
- copySharedState->id = 5;
+ scoped_ptr<SharedQuadState> copySharedState(sharedState->Copy()); \
#define QUAD_DATA \
gfx::Rect quadRect(30, 40, 50, 60); \
« no previous file with comments | « cc/draw_quad.h ('k') | cc/layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698