From a31b8aa25b9db0ee6781967e1a603ff060ef8adf Mon Sep 17 00:00:00 2001 From: "l.gombos" Date: Wed, 20 Jan 2016 08:42:01 -0800 Subject: [PATCH] Fix caca backend build. A previous patch has replaced Pass() with std::move in ui/ozone, but missed two sites under caca/. BUG=557422 Review URL: https://codereview.chromium.org/1603343003 Cr-Commit-Position: refs/heads/master@{#370409} --- ui/ozone/platform/caca/caca_window_manager.cc | 2 +- ui/ozone/platform/caca/ozone_platform_caca.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/ozone/platform/caca/caca_window_manager.cc b/ui/ozone/platform/caca/caca_window_manager.cc index 11fc46d663507..561a57d886410 100644 --- a/ui/ozone/platform/caca/caca_window_manager.cc +++ b/ui/ozone/platform/caca/caca_window_manager.cc @@ -140,7 +140,7 @@ scoped_ptr CacaWindowManager::CreateCanvasForWidget( scoped_ptr canvas(new CacaSurface(window)); bool initialized = canvas->Initialize(); DCHECK(initialized); - return canvas; + return std::move(canvas); } } // namespace ui diff --git a/ui/ozone/platform/caca/ozone_platform_caca.cc b/ui/ozone/platform/caca/ozone_platform_caca.cc index fa2d21422251f..9f7873e4060ea 100644 --- a/ui/ozone/platform/caca/ozone_platform_caca.cc +++ b/ui/ozone/platform/caca/ozone_platform_caca.cc @@ -57,7 +57,7 @@ class OzonePlatformCaca : public OzonePlatform { delegate, window_manager_.get(), event_source_.get(), bounds)); if (!caca_window->Initialize()) return nullptr; - return caca_window; + return std::move(caca_window); } scoped_ptr CreateNativeDisplayDelegate() override { return make_scoped_ptr(new NativeDisplayDelegateOzone());