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

Unified Diff: ui/compositor/test/in_process_context_factory.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 | « ui/compositor/scoped_layer_animation_settings.cc ('k') | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/test/in_process_context_factory.cc
diff --git a/ui/compositor/test/in_process_context_factory.cc b/ui/compositor/test/in_process_context_factory.cc
index a1165b20f90166eb2ba6ddd8e0b61ecf531349c0..d9422dd64789876e9d3eb999f0f001ff868a763a 100644
--- a/ui/compositor/test/in_process_context_factory.cc
+++ b/ui/compositor/test/in_process_context_factory.cc
@@ -4,6 +4,8 @@
#include "ui/compositor/test/in_process_context_factory.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/command_line.h"
#include "base/threading/thread.h"
@@ -153,7 +155,7 @@ void InProcessContextFactory::CreateOutputSurface(
if (surface_manager_) {
scoped_ptr<cc::OnscreenDisplayClient> display_client(
new cc::OnscreenDisplayClient(
- real_output_surface.Pass(), surface_manager_,
+ std::move(real_output_surface), surface_manager_,
GetSharedBitmapManager(), GetGpuMemoryBufferManager(),
compositor->GetRendererSettings(), compositor->task_runner()));
scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
@@ -163,12 +165,12 @@ void InProcessContextFactory::CreateOutputSurface(
display_client->set_surface_output_surface(surface_output_surface.get());
surface_output_surface->set_display_client(display_client.get());
- compositor->SetOutputSurface(surface_output_surface.Pass());
+ compositor->SetOutputSurface(std::move(surface_output_surface));
delete per_compositor_data_[compositor.get()];
per_compositor_data_[compositor.get()] = display_client.release();
} else {
- compositor->SetOutputSurface(real_output_surface.Pass());
+ compositor->SetOutputSurface(std::move(real_output_surface));
}
}
« no previous file with comments | « ui/compositor/scoped_layer_animation_settings.cc ('k') | ui/events/devices/x11/device_data_manager_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698