From f7621cb5bb4ee181d557aeb6fa557819daba5fd2 Mon Sep 17 00:00:00 2001
From: Kevin Lubick <kjlubick@google.com>
Date: Mon, 16 Apr 2018 15:51:44 -0400
Subject: Fix many return-std-move-in-c++11 warnings

Change-Id: Ib0042cf412fe3c5fa600b7ae644d16740457535e
Reviewed-on: https://skia-review.googlesource.com/121354
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Mike Klein <mtklein@google.com>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>
---
 experimental/skottie/Skottie.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'experimental')

diff --git a/experimental/skottie/Skottie.cpp b/experimental/skottie/Skottie.cpp
index 9c5849ffa6..7486502f2e 100644
--- a/experimental/skottie/Skottie.cpp
+++ b/experimental/skottie/Skottie.cpp
@@ -140,7 +140,7 @@ sk_sp<sksg::RenderNode> AttachOpacity(const Json::Value& jtransform, AttachConte
             opacityNode->setOpacity(o * 0.01f);
         });
 
-    return opacityNode;
+    return std::move(opacityNode);
 }
 
 sk_sp<sksg::RenderNode> AttachComposition(const Json::Value&, AttachContext* ctx);
@@ -182,7 +182,7 @@ sk_sp<sksg::GeometryNode> AttachRRectGeometry(const Json::Value& jrect, AttachCo
         return nullptr;
     }
 
-    return rect_node;
+    return std::move(rect_node);
 }
 
 sk_sp<sksg::GeometryNode> AttachEllipseGeometry(const Json::Value& jellipse, AttachContext* ctx) {
@@ -206,7 +206,7 @@ sk_sp<sksg::GeometryNode> AttachEllipseGeometry(const Json::Value& jellipse, Att
         return nullptr;
     }
 
-    return rect_node;
+    return std::move(rect_node);
 }
 
 sk_sp<sksg::GeometryNode> AttachPolystarGeometry(const Json::Value& jstar, AttachContext* ctx) {
@@ -255,7 +255,7 @@ sk_sp<sksg::GeometryNode> AttachPolystarGeometry(const Json::Value& jstar, Attac
             adapter->setRotation(r);
         });
 
-    return path_node;
+    return std::move(path_node);
 }
 
 sk_sp<sksg::Color> AttachColor(const Json::Value& obj, AttachContext* ctx) {
@@ -1112,7 +1112,7 @@ sk_sp<sksg::RenderNode> AttachLayer(const Json::Value& jlayer,
         layerCtx->fCurrentMatte.reset();
     }
 
-    return controller_node;
+    return std::move(controller_node);
 }
 
 sk_sp<sksg::RenderNode> AttachComposition(const Json::Value& comp, AttachContext* ctx) {
@@ -1142,7 +1142,7 @@ sk_sp<sksg::RenderNode> AttachComposition(const Json::Value& comp, AttachContext
         comp_group->addChild(std::move(layers[i]));
     }
 
-    return comp_group;
+    return std::move(comp_group);
 }
 
 } // namespace
-- 
cgit v1.2.3