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

Unified Diff: cc/surfaces/surface_factory.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_display_output_surface_unittest.cc ('k') | cc/surfaces/surface_factory_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_factory.cc
diff --git a/cc/surfaces/surface_factory.cc b/cc/surfaces/surface_factory.cc
index b35380efb1784bbaa8e21352884b8c9059a1fb90..322d722637e5d833971b075454660ec86a7bfd47 100644
--- a/cc/surfaces/surface_factory.cc
+++ b/cc/surfaces/surface_factory.cc
@@ -40,7 +40,7 @@ void SurfaceFactory::Create(SurfaceId surface_id) {
scoped_ptr<Surface> surface(new Surface(surface_id, this));
manager_->RegisterSurface(surface.get());
DCHECK(!surface_map_.count(surface_id));
- surface_map_.add(surface_id, surface.Pass());
+ surface_map_.add(surface_id, std::move(surface));
}
void SurfaceFactory::Destroy(SurfaceId surface_id) {
@@ -62,7 +62,7 @@ void SurfaceFactory::SubmitCompositorFrame(SurfaceId surface_id,
OwningSurfaceMap::iterator it = surface_map_.find(surface_id);
DCHECK(it != surface_map_.end());
DCHECK(it->second->factory().get() == this);
- it->second->QueueFrame(frame.Pass(), callback);
+ it->second->QueueFrame(std::move(frame), callback);
if (!manager_->SurfaceModified(surface_id)) {
TRACE_EVENT_INSTANT0("cc", "Damage not visible.", TRACE_EVENT_SCOPE_THREAD);
it->second->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED);
@@ -78,7 +78,7 @@ void SurfaceFactory::RequestCopyOfSurface(
return;
}
DCHECK(it->second->factory().get() == this);
- it->second->RequestCopyOfOutput(copy_request.Pass());
+ it->second->RequestCopyOfOutput(std::move(copy_request));
manager_->SurfaceModified(surface_id);
}
« no previous file with comments | « cc/surfaces/surface_display_output_surface_unittest.cc ('k') | cc/surfaces/surface_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698