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

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 271683004: Expose default ctor of SQS and remove Create and Copy funciton of SQS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@RPPower
Patch Set: Address review comments Created 6 years, 7 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 | « no previous file | cc/quads/render_pass.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/quads/draw_quad_unittest.cc
diff --git a/cc/quads/draw_quad_unittest.cc b/cc/quads/draw_quad_unittest.cc
index cb116092d4a6e486bb4acaecc7cb419c018faa59..c038214d47bed42c6812770e82937cc2a1d95426 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -39,7 +39,7 @@ TEST(DrawQuadTest, CopySharedQuadState) {
float opacity = 0.25f;
SkXfermode::Mode blend_mode = SkXfermode::kMultiply_Mode;
- scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
+ scoped_ptr<SharedQuadState> state(new SharedQuadState);
state->SetAll(quad_transform,
content_bounds,
visible_content_rect,
@@ -48,7 +48,8 @@ TEST(DrawQuadTest, CopySharedQuadState) {
opacity,
blend_mode);
- scoped_ptr<SharedQuadState> copy(state->Copy());
+ scoped_ptr<SharedQuadState> copy(new SharedQuadState);
+ copy->CopyFrom(state.get());
EXPECT_EQ(quad_transform, copy->content_to_target_transform);
EXPECT_RECT_EQ(visible_content_rect, copy->visible_content_rect);
EXPECT_EQ(opacity, copy->opacity);
@@ -66,7 +67,7 @@ scoped_ptr<SharedQuadState> CreateSharedQuadState() {
float opacity = 1.f;
SkXfermode::Mode blend_mode = SkXfermode::kSrcOver_Mode;
- scoped_ptr<SharedQuadState> state(SharedQuadState::Create());
+ scoped_ptr<SharedQuadState> state(new SharedQuadState);
state->SetAll(quad_transform,
content_bounds,
visible_content_rect,
@@ -88,9 +89,10 @@ void CompareDrawQuad(DrawQuad* quad,
EXPECT_EQ(copy_shared_state, copy->shared_quad_state);
}
-#define CREATE_SHARED_STATE() \
- scoped_ptr<SharedQuadState> shared_state(CreateSharedQuadState()); \
- scoped_ptr<SharedQuadState> copy_shared_state(shared_state->Copy()); \
+#define CREATE_SHARED_STATE() \
+ scoped_ptr<SharedQuadState> shared_state(CreateSharedQuadState()); \
+ scoped_ptr<SharedQuadState> copy_shared_state(new SharedQuadState); \
+ copy_shared_state->CopyFrom(shared_state.get());
#define QUAD_DATA \
gfx::Rect quad_rect(30, 40, 50, 60); \
« no previous file with comments | « no previous file | cc/quads/render_pass.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698