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

Unified Diff: cc/quads/draw_quad_unittest.cc

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 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/draw_quad_perftest.cc ('k') | cc/quads/io_surface_draw_quad.h » ('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 1059470cbd07e53dd368e3f5a3e0f6738d40b29a..8360f1ed3300a72406f83db8c37ae274d8ec232f 100644
--- a/cc/quads/draw_quad_unittest.cc
+++ b/cc/quads/draw_quad_unittest.cc
@@ -43,11 +43,11 @@ TEST(DrawQuadTest, CopySharedQuadState) {
SkXfermode::Mode blend_mode = SkXfermode::kMultiply_Mode;
int sorting_context_id = 65536;
- scoped_ptr<SharedQuadState> state(new SharedQuadState);
+ std::unique_ptr<SharedQuadState> state(new SharedQuadState);
state->SetAll(quad_transform, layer_bounds, visible_layer_rect, clip_rect,
is_clipped, opacity, blend_mode, sorting_context_id);
- scoped_ptr<SharedQuadState> copy(new SharedQuadState);
+ std::unique_ptr<SharedQuadState> copy(new SharedQuadState);
copy->CopyFrom(state.get());
EXPECT_EQ(quad_transform, copy->quad_to_target_transform);
EXPECT_EQ(visible_layer_rect, copy->visible_quad_layer_rect);
@@ -85,7 +85,7 @@ void CompareDrawQuad(DrawQuad* quad,
}
#define CREATE_SHARED_STATE() \
- scoped_ptr<RenderPass> render_pass = RenderPass::Create(); \
+ std::unique_ptr<RenderPass> render_pass = RenderPass::Create(); \
SharedQuadState* shared_state(CreateSharedQuadState(render_pass.get())); \
SharedQuadState* copy_shared_state = \
render_pass->CreateAndAppendSharedQuadState(); \
« no previous file with comments | « cc/quads/draw_quad_perftest.cc ('k') | cc/quads/io_surface_draw_quad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698