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

Unified Diff: cc/surfaces/surfaces_pixeltest.cc

Issue 1455023002: cc: Replace Pass() with std::move() in some subdirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pass-cc
Patch Set: pass-cc2: . Created 5 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/surfaces/surface_hittest_unittest.cc ('k') | cc/trees/damage_tracker_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surfaces_pixeltest.cc
diff --git a/cc/surfaces/surfaces_pixeltest.cc b/cc/surfaces/surfaces_pixeltest.cc
index f0903f2afdcfe4d427510a368a3740d3b174d44a..053a5636ae63bdac6afdcb398db5d344d1729491 100644
--- a/cc/surfaces/surfaces_pixeltest.cc
+++ b/cc/surfaces/surfaces_pixeltest.cc
@@ -81,14 +81,14 @@ TEST_F(SurfacesPixelTest, DrawSimpleFrame) {
force_anti_aliasing_off);
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
- delegated_frame_data->render_pass_list.push_back(pass.Pass());
+ delegated_frame_data->render_pass_list.push_back(std::move(pass));
scoped_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = delegated_frame_data.Pass();
+ root_frame->delegated_frame_data = std::move(delegated_frame_data);
SurfaceId root_surface_id = allocator_.GenerateId();
factory_.Create(root_surface_id);
- factory_.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
+ factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
EmptySurfaceAggregatorClient surface_aggregator_client;
@@ -140,12 +140,12 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
force_anti_aliasing_off);
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
- delegated_frame_data->render_pass_list.push_back(pass.Pass());
+ delegated_frame_data->render_pass_list.push_back(std::move(pass));
scoped_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = delegated_frame_data.Pass();
+ root_frame->delegated_frame_data = std::move(delegated_frame_data);
- factory_.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
+ factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
}
@@ -168,12 +168,12 @@ TEST_F(SurfacesPixelTest, DrawSimpleAggregatedFrame) {
force_anti_aliasing_off);
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
- delegated_frame_data->render_pass_list.push_back(pass.Pass());
+ delegated_frame_data->render_pass_list.push_back(std::move(pass));
scoped_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = delegated_frame_data.Pass();
+ child_frame->delegated_frame_data = std::move(delegated_frame_data);
- factory_.SubmitCompositorFrame(child_surface_id, child_frame.Pass(),
+ factory_.SubmitCompositorFrame(child_surface_id, std::move(child_frame),
SurfaceFactory::DrawCallback());
}
@@ -241,12 +241,12 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
right_child_id);
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
- delegated_frame_data->render_pass_list.push_back(pass.Pass());
+ delegated_frame_data->render_pass_list.push_back(std::move(pass));
scoped_ptr<CompositorFrame> root_frame(new CompositorFrame);
- root_frame->delegated_frame_data = delegated_frame_data.Pass();
+ root_frame->delegated_frame_data = std::move(delegated_frame_data);
- factory_.SubmitCompositorFrame(root_surface_id, root_frame.Pass(),
+ factory_.SubmitCompositorFrame(root_surface_id, std::move(root_frame),
SurfaceFactory::DrawCallback());
}
@@ -277,12 +277,12 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
force_anti_aliasing_off);
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
- delegated_frame_data->render_pass_list.push_back(pass.Pass());
+ delegated_frame_data->render_pass_list.push_back(std::move(pass));
scoped_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = delegated_frame_data.Pass();
+ child_frame->delegated_frame_data = std::move(delegated_frame_data);
- factory_.SubmitCompositorFrame(left_child_id, child_frame.Pass(),
+ factory_.SubmitCompositorFrame(left_child_id, std::move(child_frame),
SurfaceFactory::DrawCallback());
}
@@ -313,12 +313,12 @@ TEST_F(SurfacesPixelTest, DrawAggregatedFrameWithSurfaceTransforms) {
force_anti_aliasing_off);
scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
- delegated_frame_data->render_pass_list.push_back(pass.Pass());
+ delegated_frame_data->render_pass_list.push_back(std::move(pass));
scoped_ptr<CompositorFrame> child_frame(new CompositorFrame);
- child_frame->delegated_frame_data = delegated_frame_data.Pass();
+ child_frame->delegated_frame_data = std::move(delegated_frame_data);
- factory_.SubmitCompositorFrame(right_child_id, child_frame.Pass(),
+ factory_.SubmitCompositorFrame(right_child_id, std::move(child_frame),
SurfaceFactory::DrawCallback());
}
« no previous file with comments | « cc/surfaces/surface_hittest_unittest.cc ('k') | cc/trees/damage_tracker_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698