Index: ui/compositor/compositor.cc |
diff --git a/ui/compositor/compositor.cc b/ui/compositor/compositor.cc |
index 5a1c7adf8a701a8c272e34ab329e0eee0a5febe9..3d42d53eae7c8c5fc64a52f0ffb1bb2c87ff0e52 100644 |
--- a/ui/compositor/compositor.cc |
+++ b/ui/compositor/compositor.cc |
@@ -6,6 +6,7 @@ |
#include <algorithm> |
#include <deque> |
+#include <utility> |
#include "base/bind.h" |
#include "base/command_line.h" |
@@ -219,7 +220,7 @@ Compositor::~Compositor() { |
void Compositor::SetOutputSurface( |
scoped_ptr<cc::OutputSurface> output_surface) { |
output_surface_requested_ = false; |
- host_->SetOutputSurface(output_surface.Pass()); |
+ host_->SetOutputSurface(std::move(output_surface)); |
} |
void Compositor::ScheduleDraw() { |
@@ -269,7 +270,7 @@ void Compositor::DisableSwapUntilResize() { |
void Compositor::SetLatencyInfo(const ui::LatencyInfo& latency_info) { |
scoped_ptr<cc::SwapPromise> swap_promise( |
new cc::LatencyInfoSwapPromise(latency_info)); |
- host_->QueueSwapPromise(swap_promise.Pass()); |
+ host_->QueueSwapPromise(std::move(swap_promise)); |
} |
void Compositor::SetScaleAndSize(float scale, const gfx::Size& size_in_pixel) { |