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

Unified Diff: cc/surfaces/surface_aggregator.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.cc ('k') | cc/surfaces/surface_aggregator_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_aggregator.cc
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index 43c57bcf670bfc6557df1612821e8da9df454e69..75df292316cd5e8aea245b2bc3b6a9dd45470e45 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -231,7 +231,7 @@ void SurfaceAggregator::HandleSurfaceQuad(
child_to_parent_map, gfx::Transform(), ClipData(),
copy_pass.get(), surface_id);
- dest_pass_list_->push_back(copy_pass.Pass());
+ dest_pass_list_->push_back(std::move(copy_pass));
}
gfx::Transform surface_transform =
@@ -457,7 +457,7 @@ void SurfaceAggregator::CopyPasses(const DelegatedFrameData* frame_data,
child_to_parent_map, gfx::Transform(), ClipData(),
copy_pass.get(), surface->surface_id());
- dest_pass_list_->push_back(copy_pass.Pass());
+ dest_pass_list_->push_back(std::move(copy_pass));
}
}
@@ -641,7 +641,7 @@ scoped_ptr<CompositorFrame> SurfaceAggregator::Aggregate(SurfaceId surface_id) {
// TODO(jamesr): Aggregate all resource references into the returned frame's
// resource list.
- return frame.Pass();
+ return frame;
}
void SurfaceAggregator::ReleaseResources(SurfaceId surface_id) {
« no previous file with comments | « cc/surfaces/surface.cc ('k') | cc/surfaces/surface_aggregator_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698