update callsites for Make image factories

src/image/SkSurface_Base.h

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkSurface_Base_DEFINED
 #define SkSurface_Base_DEFINED
 
@@ skipping 63 matching lines @@
      *  Called only when we _didn't_ copy-on-write; we assume the copies start mutable.
      */
     virtual void onRestoreBackingMutability() {}
 
     /**
      * Issue any pending surface IO to the current backend 3D API and resolve any surface MSAA.
      */
     virtual void onPrepareForExternalIO() {}
 
     inline SkCanvas* getCachedCanvas();
-    inline SkImage* refCachedImage(SkBudgeted, ForceUnique);
+    inline sk_sp<SkImage> refCachedImage(SkBudgeted, ForceUnique);
 
     bool hasCachedImage() const { return fCachedImage != nullptr; }
 
     // called by SkSurface to compute a new genID
     uint32_t newGenerationID();
 
 private:
     SkCanvas*   fCachedCanvas;
     SkImage*    fCachedImage;
 
@@ skipping 12 matching lines @@
 SkCanvas* SkSurface_Base::getCachedCanvas() {
     if (nullptr == fCachedCanvas) {
         fCachedCanvas = this->onNewCanvas();
         if (fCachedCanvas) {
             fCachedCanvas->setSurfaceBase(this);
         }
     }
     return fCachedCanvas;
 }
 
-SkImage* SkSurface_Base::refCachedImage(SkBudgeted budgeted, ForceUnique unique) {
+sk_sp<SkImage> SkSurface_Base::refCachedImage(SkBudgeted budgeted, ForceUnique unique) {
     SkImage* snap = fCachedImage;
     if (kYes_ForceUnique == unique && snap && !snap->unique()) {
         snap = nullptr;
     }
     if (snap) {
-        return SkRef(snap);
+        return sk_ref_sp(snap);
     }
     ForceCopyMode fcm = (kYes_ForceUnique == unique) ? kYes_ForceCopyMode :
                                                        kNo_ForceCopyMode;
     snap = this->onNewImageSnapshot(budgeted, fcm);
     if (kNo_ForceUnique == unique) {
         SkASSERT(!fCachedImage);
         fCachedImage = SkSafeRef(snap);
     }
     SkASSERT(!fCachedCanvas || fCachedCanvas->getSurfaceBase() == this);
-    return snap;
+    return sk_sp<SkImage>(snap);
 }
 
 #endif