SkPDF Create working move constructor for inner classes

src/pdf/SkPDFDevice.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPDFDevice_DEFINED
 #define SkPDFDevice_DEFINED
 
@@ skipping 184 matching lines @@
         return fLegacyBitmap;
     }
 
     SkSurface* newSurface(const SkImageInfo&, const SkSurfaceProps&) override;
 
     void drawAnnotation(const SkDraw&, const SkRect&, const char key[], SkData* value) override;
 
 private:
     struct RectWithData {
         SkRect rect;
-        SkData* data;
+        sk_sp<SkData> data;
         RectWithData(const SkRect& rect, SkData* data)
             : rect(rect), data(SkRef(data)) {}
-        ~RectWithData() { data->unref(); }
+        RectWithData(RectWithData&& other)

[reed1, 2016/03/07 20:47:42]

Seems like these are explicitly written (as opposed to just relying on what the
compiler will do for us) as a performance step for 1 bad compiler that will go
away soonish (e.g. windows 2013).

Perhaps we can simplify this code (and reviewing it) by just leaving these off,
and go slow on that windows compiler. I suggest that also since this data type
is hardly ever used (annotations) so we are not interested in paying more
complexity for speed (imho).

+            : rect(other.rect), data(std::move(other.data)) {}
+        RectWithData& operator=(RectWithData&& other) {
+            rect = other.rect;
+            data = std::move(other.data);
+            return *this;
+        }
     };
 
     struct NamedDestination {
-        SkData* nameData;
+        sk_sp<SkData> nameData;
         SkPoint point;
         NamedDestination(SkData* nameData, const SkPoint& point)
             : nameData(SkRef(nameData)), point(point) {}
-        ~NamedDestination() { nameData->unref(); }
+        NamedDestination(NamedDestination&& other)
+            : nameData(std::move(other.nameData)), point(other.point) {}
+        NamedDestination& operator=(NamedDestination&& other) {
+            nameData = std::move(other.nameData);
+            point = other.point;
+            return *this;
+        }
     };
 
     // TODO(vandebo): push most of SkPDFDevice's state into a core object in
     // order to get the right access levels without using friend.
     friend class ScopedContentEntry;
 
     SkISize fPageSize;
     SkISize fContentSize;
     SkMatrix fInitialTransform;
     SkClipStack fExistingClipStack;
@@ skipping 98 matching lines @@
 
     typedef SkBaseDevice INHERITED;
 
     // TODO(edisonn): Only SkDocument_PDF and SkPDFImageShader should be able to create
     // an SkPDFDevice
     //friend class SkDocument_PDF;
     //friend class SkPDFImageShader;
 };
 
 #endif