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); |
} |