Switch SkSpecialImage & SkSpecialSurface classes over to smart pointers

src/effects/SkImageSource.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkImageSource.h"
 
 #include "SkCanvas.h"
 #include "SkImage.h"
 #include "SkReadBuffer.h"
 #include "SkSpecialImage.h"
 #include "SkSpecialSurface.h"
 #include "SkWriteBuffer.h"
 #include "SkString.h"
 
-SkImageFilter* SkImageSource::Create(const SkImage* image) {
+SkImageFilter* SkImageSource::Create(SkImage* image) {
     return image ? new SkImageSource(image) : nullptr;
 }
 
-SkImageFilter* SkImageSource::Create(const SkImage* image,
+SkImageFilter* SkImageSource::Create(SkImage* image,
                                      const SkRect& srcRect,
                                      const SkRect& dstRect,
                                      SkFilterQuality filterQuality) {
     return image ? new SkImageSource(image, srcRect, dstRect, filterQuality) : nullptr;
 }
 
-SkImageSource::SkImageSource(const SkImage* image)
+SkImageSource::SkImageSource(SkImage* image)
     : INHERITED(0, nullptr)
     , fImage(SkRef(image))
     , fSrcRect(SkRect::MakeIWH(image->width(), image->height()))
     , fDstRect(fSrcRect)
     , fFilterQuality(kHigh_SkFilterQuality) { }
 
-SkImageSource::SkImageSource(const SkImage* image,
+SkImageSource::SkImageSource(SkImage* image,
                              const SkRect& srcRect,
                              const SkRect& dstRect,
                              SkFilterQuality filterQuality)
     : INHERITED(0, nullptr)
     , fImage(SkRef(image))
     , fSrcRect(srcRect)
     , fDstRect(dstRect)
     , fFilterQuality(filterQuality) { }
 
 SkFlattenable* SkImageSource::CreateProc(SkReadBuffer& buffer) {
     SkFilterQuality filterQuality = (SkFilterQuality)buffer.readInt();
 
     SkRect src, dst;
     buffer.readRect(&src);
     buffer.readRect(&dst);
 
     SkAutoTUnref<SkImage> image(buffer.readImage());
     if (!image) {
         return nullptr;
     }
 
     return SkImageSource::Create(image, src, dst, filterQuality);
 }
 
 void SkImageSource::flatten(SkWriteBuffer& buffer) const {
     buffer.writeInt(fFilterQuality);
     buffer.writeRect(fSrcRect);
     buffer.writeRect(fDstRect);
-    buffer.writeImage(fImage);
+    buffer.writeImage(fImage.get());
 }
 
 SkSpecialImage* SkImageSource::onFilterImage(SkSpecialImage* source, const Context& ctx,
                                              SkIPoint* offset) const {
     SkRect dstRect;
     ctx.ctm().mapRect(&dstRect, fDstRect);
 
     SkRect bounds = SkRect::MakeIWH(fImage->width(), fImage->height());
     if (fSrcRect == bounds && dstRect == bounds) {
         // No regions cropped out or resized; return entire image.
         offset->fX = offset->fY = 0;
-        return SkSpecialImage::NewFromImage(source->internal_getProxy(),
-                                            SkIRect::MakeWH(fImage->width(), fImage->height()),
-                                            fImage);
+        return SkSpecialImage::MakeFromImage(source->internal_getProxy(),
+                                             SkIRect::MakeWH(fImage->width(), fImage->height()),
+                                             fImage).release();
     }
 
     const SkIRect dstIRect = dstRect.roundOut();
 
     const SkImageInfo info = SkImageInfo::MakeN32(dstIRect.width(), dstIRect.height(),
                                                   kPremul_SkAlphaType);
 
-    SkAutoTUnref<SkSpecialSurface> surf(source->newSurface(info));
+    sk_sp<SkSpecialSurface> surf(source->makeSurface(info));
     if (!surf) {
         return nullptr;
     }
 
     SkCanvas* canvas = surf->getCanvas();
     SkASSERT(canvas);
 
     // TODO: it seems like this clear shouldn't be necessary (see skbug.com/5075)
     canvas->clear(0x0);
 
     SkPaint paint;
 
     // Subtract off the integer component of the translation (will be applied in offset, below).
     dstRect.offset(-SkIntToScalar(dstIRect.fLeft), -SkIntToScalar(dstIRect.fTop));
     paint.setXfermodeMode(SkXfermode::kSrc_Mode);
     // FIXME: this probably shouldn't be necessary, but drawImageRect asserts
     // None filtering when it's translate-only
     paint.setFilterQuality(
         fSrcRect.width() == dstRect.width() && fSrcRect.height() == dstRect.height() ?
                kNone_SkFilterQuality : fFilterQuality);
-    canvas->drawImageRect(fImage, fSrcRect, dstRect, &paint, SkCanvas::kStrict_SrcRectConstraint);
+    canvas->drawImageRect(fImage.get(), fSrcRect, dstRect, &paint,
+                          SkCanvas::kStrict_SrcRectConstraint);
 
     offset->fX = dstIRect.fLeft;
     offset->fY = dstIRect.fTop;
-    return surf->newImageSnapshot();
+    return surf->makeImageSnapshot().release();
 }
 
 void SkImageSource::computeFastBounds(const SkRect& src, SkRect* dst) const {
     *dst = fDstRect;
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkImageSource::toString(SkString* str) const {
     str->appendf("SkImageSource: (");
     str->appendf("src: (%f,%f,%f,%f) dst: (%f,%f,%f,%f) ",
                  fSrcRect.fLeft, fSrcRect.fTop, fSrcRect.fRight, fSrcRect.fBottom,
                  fDstRect.fLeft, fDstRect.fTop, fDstRect.fRight, fDstRect.fBottom);
     str->appendf("image: (%d,%d)",
                  fImage->width(), fImage->height());
     str->append(")");
 }
 #endif