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>
---
 src/pdf/SkPDFBitmap.cpp      | 4 ++--
 src/pdf/SkPDFFormXObject.cpp | 2 +-
 src/pdf/SkPDFMetadata.cpp    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/pdf')

diff --git a/src/pdf/SkPDFBitmap.cpp b/src/pdf/SkPDFBitmap.cpp
index b575d16430..9d86d90bed 100644
--- a/src/pdf/SkPDFBitmap.cpp
+++ b/src/pdf/SkPDFBitmap.cpp
@@ -433,7 +433,7 @@ sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image, int encodingQua
     SkISize dimensions = image->dimensions();
     sk_sp<SkData> data = image->refEncodedData();
     if (auto jpeg = make_jpeg_bitmap(std::move(data), dimensions)) {
-        return jpeg;
+        return std::move(jpeg);
     }
 
     const bool isOpaque = image_compute_is_opaque(image.get());
@@ -441,7 +441,7 @@ sk_sp<SkPDFObject> SkPDFCreateBitmapObject(sk_sp<SkImage> image, int encodingQua
     if (encodingQuality <= 100 && isOpaque) {
         data = image->encodeToData(SkEncodedImageFormat::kJPEG, encodingQuality);
         if (auto jpeg = make_jpeg_bitmap(std::move(data), dimensions)) {
-            return jpeg;
+            return std::move(jpeg);
         }
     }
 
diff --git a/src/pdf/SkPDFFormXObject.cpp b/src/pdf/SkPDFFormXObject.cpp
index d0c7fe76c5..99146a29f3 100644
--- a/src/pdf/SkPDFFormXObject.cpp
+++ b/src/pdf/SkPDFFormXObject.cpp
@@ -35,5 +35,5 @@ sk_sp<SkPDFObject> SkPDFMakeFormXObject(std::unique_ptr<SkStreamAsset> content,
     }
     group->insertBool("I", true);  // Isolated.
     form->dict()->insertObject("Group", std::move(group));
-    return form;
+    return std::move(form);
 }
diff --git a/src/pdf/SkPDFMetadata.cpp b/src/pdf/SkPDFMetadata.cpp
index d91272cb2e..ccb3ef38b5 100644
--- a/src/pdf/SkPDFMetadata.cpp
+++ b/src/pdf/SkPDFMetadata.cpp
@@ -132,7 +132,7 @@ sk_sp<SkPDFObject> SkPDFMetadata::MakeDocumentInformationDict(
     if (metadata.fModified.fEnabled) {
         dict->insertString("ModDate", pdf_date(metadata.fModified.fDateTime));
     }
-    return dict;
+    return std::move(dict);
 }
 
 SkPDFMetadata::UUID SkPDFMetadata::CreateUUID(
@@ -184,7 +184,7 @@ sk_sp<SkPDFObject> SkPDFMetadata::MakePdfId(const UUID& doc,
             SkString(reinterpret_cast<const char*>(&doc), sizeof(UUID)));
     array->appendString(
             SkString(reinterpret_cast<const char*>(&instance), sizeof(UUID)));
-    return array;
+    return std::move(array);
 }
 
 // Convert a block of memory to hexadecimal.  Input and output pointers will be
-- 
cgit v1.2.3