Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>.

third_party/WebKit/Source/platform/graphics/Image.cpp

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 187 matching lines @@
         SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &shaderMatrix, nullptr);
 }
 
 } // anonymous namespace
 
 void Image::drawPattern(GraphicsContext& context, const FloatRect& floatSrcRect, const FloatSize& scale,
     const FloatPoint& phase, SkXfermode::Mode compositeOp, const FloatRect& destRect, const FloatSize& repeatSpacing)
 {
     TRACE_EVENT0("skia", "Image::drawPattern");
 
-    RefPtr<SkImage> image = imageForCurrentFrame();
+    sk_sp<SkImage> image = imageForCurrentFrame();
     if (!image)
         return;
 
     FloatRect normSrcRect = floatSrcRect;
 
     normSrcRect.intersect(FloatRect(0, 0, image->width(), image->height()));
     if (destRect.isEmpty() || normSrcRect.isEmpty())
         return; // nothing to draw
 
     SkMatrix localMatrix;
     // We also need to translate it such that the origin of the pattern is the
     // origin of the destination rect, which is what WebKit expects. Skia uses
     // the coordinate system origin as the base for the pattern. If WebKit wants
     // a shifted image, it will shift it from there using the localMatrix.
     const float adjustedX = phase.x() + normSrcRect.x() * scale.width();
     const float adjustedY = phase.y() + normSrcRect.y() * scale.height();
     localMatrix.setTranslate(SkFloatToScalar(adjustedX), SkFloatToScalar(adjustedY));
 
     // Because no resizing occurred, the shader transform should be
     // set to the pattern's transform, which just includes scale.
     localMatrix.preScale(scale.width(), scale.height());
 
     // Fetch this now as subsetting may swap the image.
     auto imageID = image->uniqueID();
 
-    image = fromSkSp(image->makeSubset(enclosingIntRect(normSrcRect)));
+    image = image->makeSubset(enclosingIntRect(normSrcRect));
     if (!image)
         return;
 
     {
         SkPaint paint = context.fillPaint();
         paint.setColor(SK_ColorBLACK);
         paint.setXfermodeMode(compositeOp);
         paint.setFilterQuality(context.computeFilterQuality(this, destRect, normSrcRect));
         paint.setAntiAlias(context.shouldAntialias());
         paint.setShader(createPatternShader(image.get(), localMatrix, paint,
             FloatSize(repeatSpacing.width() / scale.width(), repeatSpacing.height() / scale.height())));
         context.drawRect(destRect, paint);
     }
 
     if (currentFrameIsLazyDecoded())
         PlatformInstrumentation::didDrawLazyPixelRef(imageID);
 }
 
 PassRefPtr<Image> Image::imageForDefaultFrame()
 {
     RefPtr<Image> image(this);
 
     return image.release();
 }
 
 bool Image::isTextureBacked()
 {
-    RefPtr<SkImage> image = imageForCurrentFrame();
+    sk_sp<SkImage> image = imageForCurrentFrame();
     return image ? image->isTextureBacked() : false;
 }
 
 bool Image::applyShader(SkPaint& paint, const SkMatrix& localMatrix)
 {
     // Default shader impl: attempt to build a shader based on the current frame SkImage.
-    RefPtr<SkImage> image = imageForCurrentFrame();
+    sk_sp<SkImage> image = imageForCurrentFrame();
     if (!image)
         return false;
 
     paint.setShader(
         image->makeShader(SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &localMatrix));
 
     return true;
 }
 
 FloatRect Image::computeTileContaining(const FloatPoint& point,
@@ skipping 18 matching lines @@
     FloatRect subset = dest;
     subset.setX((dest.x() - tile.x()) / scale.width());
     subset.setY((dest.y() - tile.y()) / scale.height());
     subset.setWidth(dest.width() / scale.width());
     subset.setHeight(dest.height() / scale.height());
 
     return subset;
 }
 
 } // namespace blink