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

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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.
@@ skipping 241 matching lines @@
     scaledSrc.scale(1 / zoom);
 
     // Compensate for the container size rounding by adjusting the source rect.
     FloatSize adjustedSrcSize = scaledSrc.size();
     adjustedSrcSize.scale(roundedContainerSize.width() / containerSize.width(), roundedContainerSize.height() / containerSize.height());
     scaledSrc.setSize(adjustedSrcSize);
 
     drawInternal(canvas, paint, dstRect, scaledSrc, DoNotRespectImageOrientation, ClampImageToSourceRect, url);
 }
 
-PassRefPtr<SkImage> SVGImage::imageForCurrentFrame()
+sk_sp<SkImage> SVGImage::imageForCurrentFrame()
 {
     return imageForCurrentFrameForContainer(KURL(), FloatSize(size()));
 }
 
 void SVGImage::drawPatternForContainer(GraphicsContext& context, const FloatSize containerSize,
     float zoom, const FloatRect& srcRect, const FloatSize& tileScale, const FloatPoint& phase,
     SkXfermode::Mode compositeOp, const FloatRect& dstRect,
     const FloatSize& repeatSpacing, const KURL& url)
 {
     // Tile adjusted for scaling/stretch.
     FloatRect tile(srcRect);
     tile.scale(tileScale.width(), tileScale.height());
 
     // Expand the tile to account for repeat spacing.
     FloatRect spacedTile(tile);
     spacedTile.expand(FloatSize(repeatSpacing));
 
     SkPictureBuilder patternPicture(spacedTile, nullptr, &context);
     {
         DrawingRecorder patternPictureRecorder(patternPicture.context(), patternPicture, DisplayItem::Type::kSVGImage, spacedTile);
         // When generating an expanded tile, make sure we don't draw into the spacing area.
         if (tile != spacedTile)
             patternPicture.context().clip(tile);
         SkPaint paint;
         drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect, url);
     }
-    RefPtr<SkPicture> tilePicture = patternPicture.endRecording();
+    sk_sp<SkPicture> tilePicture = patternPicture.endRecording();
 
     SkMatrix patternTransform;
     patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
 
     SkPaint paint;
-    paint.setShader(SkShader::MakePictureShader(toSkSp(tilePicture.release()),
+    paint.setShader(SkShader::MakePictureShader(std::move(tilePicture),
         SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &patternTransform, nullptr));
     paint.setXfermodeMode(compositeOp);
     paint.setColorFilter(sk_ref_sp(context.colorFilter()));
     context.drawRect(dstRect, paint);
 }
 
-PassRefPtr<SkImage> SVGImage::imageForCurrentFrameForContainer(const KURL& url, const FloatSize& containerSize)
+sk_sp<SkImage> SVGImage::imageForCurrentFrameForContainer(const KURL& url, const FloatSize& containerSize)
 {
     if (!m_page)
         return nullptr;
 
     const FloatRect containerRect(FloatPoint(), containerSize);
 
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(containerRect);
     drawForContainer(canvas, SkPaint(), containerSize, 1, containerRect, containerRect, url);
 
     const IntSize imageSize = roundedIntSize(containerSize);
     const SkMatrix residualScale = SkMatrix::MakeScale(
         static_cast<float>(imageSize.width()) / containerSize.width(),
         static_cast<float>(imageSize.height()) / containerSize.height());
-    return fromSkSp(SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
-        SkISize::Make(imageSize.width(), imageSize.height()), &residualScale, nullptr));
+    return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
+        SkISize::Make(imageSize.width(), imageSize.height()), &residualScale, nullptr);
 }
 
 static bool drawNeedsLayer(const SkPaint& paint)
 {
     if (SkColorGetA(paint.getColor()) < 255)
         return true;
 
     SkXfermode::Mode xfermode;
     if (SkXfermode::AsMode(paint.getXfermode(), &xfermode)) {
         if (xfermode != SkXfermode::kSrcOver_Mode)
@@ skipping 47 matching lines @@
         view->paint(imagePicture.context(), CullRect(enclosingIntRect(srcRect)));
         ASSERT(!view->needsLayout());
     }
 
     {
         SkAutoCanvasRestore ar(canvas, false);
         if (drawNeedsLayer(paint)) {
             SkRect layerRect = dstRect;
             canvas->saveLayer(&layerRect, &paint);
         }
-        RefPtr<const SkPicture> recording = imagePicture.endRecording();
+        sk_sp<const SkPicture> recording = imagePicture.endRecording();
         canvas->drawPicture(recording.get());
     }
 
     if (getImageObserver())
         getImageObserver()->didDraw(this);
 
     // Start any (SMIL) animations if needed. This will restart or continue
     // animations if preceded by calls to resetAnimation or stopAnimation
     // respectively.
     startAnimation();
@@ skipping 191 matching lines @@
 
     return m_page ? SizeAvailable : SizeUnavailable;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink