Make sp variants for SkData

src/core/SkPictureRecord.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 SkPictureRecord_DEFINED
 #define SkPictureRecord_DEFINED
 
@@ skipping 25 matching lines @@
     }
 
     const SkTDArray<const SkTextBlob* >& getTextBlobRefs() const {
         return fTextBlobRefs;
     }
 
     const SkTDArray<const SkImage* >& getImageRefs() const {
         return fImageRefs;
     }
 
-    SkData* opData(bool deepCopy) const {
+    sk_sp<SkData> opData(bool deepCopy) const {
         this->validate(fWriter.bytesWritten(), 0);
 
         if (fWriter.bytesWritten() == 0) {
-            return SkData::NewEmpty();
+            return SkData::MakeEmpty();
         }
 
         if (deepCopy) {
-            return SkData::NewWithCopy(fWriter.contiguousArray(), fWriter.bytesWritten());
+            return SkData::MakeWithCopy(fWriter.contiguousArray(), fWriter.bytesWritten());
         }
 
         return fWriter.snapshotAsData();
     }
 
     const SkPictureContentInfo& contentInfo() const {
         return fContentInfo;
     }
 
     void setFlags(uint32_t recordFlags) {
@@ skipping 177 matching lines @@
 
     uint32_t fRecordFlags;
     int      fInitialSaveCount;
 
     friend class SkPictureData;   // for SkPictureData's SkPictureRecord-based constructor
 
     typedef SkCanvas INHERITED;
 };
 
 #endif