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

third_party/WebKit/Source/platform/DragImage.cpp

 /*
  * Copyright (C) 2007 Apple 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 55 matching lines @@
 const float kLabelBorderYOffset = 2;
 
 const float kMaxDragLabelWidth = 300;
 const float kMaxDragLabelStringWidth = (kMaxDragLabelWidth - 2 * kDragLabelBorderX);
 
 const float kDragLinkLabelFontSize = 11;
 const float kDragLinkUrlFontSize = 10;
 
 } // anonymous namespace
 
-PassRefPtr<SkImage> DragImage::resizeAndOrientImage(PassRefPtr<SkImage> image, ImageOrientation orientation,
+sk_sp<SkImage> DragImage::resizeAndOrientImage(sk_sp<SkImage> image, ImageOrientation orientation,
     FloatSize imageScale, float opacity, InterpolationQuality interpolationQuality)
 {
     IntSize size(image->width(), image->height());
     size.scale(imageScale.width(), imageScale.height());
     AffineTransform transform;
     if (orientation != DefaultImageOrientation) {
         if (orientation.usesWidthAsHeight())
             size = size.transposedSize();
         transform *= orientation.transformFromDefault(FloatSize(size));
     }
@@ skipping 14 matching lines @@
         return nullptr;
 
     SkPaint paint;
     ASSERT(opacity >= 0 && opacity <= 1);
     paint.setAlpha(opacity * 255);
     paint.setFilterQuality(interpolationQuality == InterpolationNone
         ? kNone_SkFilterQuality : kHigh_SkFilterQuality);
 
     SkCanvas* canvas = surface->getCanvas();
     canvas->concat(affineTransformToSkMatrix(transform));
     canvas->drawImage(image.get(), 0, 0, &paint);

[f(malita), 2016/09/01 03:55:38]

Ditto.

[Łukasz Anforowicz, 2016/09/01 20:50:57]

Done.

 
-    return fromSkSp(surface->makeImageSnapshot());
+    return surface->makeImageSnapshot();
 }
 
 FloatSize DragImage::clampedImageScale(const IntSize& imageSize, const IntSize& size,
     const IntSize& maxSize)
 {
     // Non-uniform scaling for size mapping.
     FloatSize imageScale(
         static_cast<float>(size.width()) / imageSize.width(),
         static_cast<float>(size.height()) / imageSize.height());
 
     // Uniform scaling for clamping.
     const float clampScaleX = size.width() > maxSize.width()
         ? static_cast<float>(maxSize.width()) / size.width() : 1;
     const float clampScaleY = size.height() > maxSize.height()
         ? static_cast<float>(maxSize.height()) / size.height() : 1;
     imageScale.scale(std::min(clampScaleX, clampScaleY));
 
     return imageScale;
 }
 
 std::unique_ptr<DragImage> DragImage::create(Image* image,
     RespectImageOrientationEnum shouldRespectImageOrientation, float deviceScaleFactor,
     InterpolationQuality interpolationQuality, float opacity, FloatSize imageScale)
 {
     if (!image)
         return nullptr;
 
-    RefPtr<SkImage> skImage = image->imageForCurrentFrame();
+    sk_sp<SkImage> skImage = image->imageForCurrentFrame();
     if (!skImage)
         return nullptr;
 
     ImageOrientation orientation;
     if (shouldRespectImageOrientation == RespectImageOrientation && image->isBitmapImage())
         orientation = toBitmapImage(image)->currentFrameOrientation();
 
     SkBitmap bm;
-    RefPtr<SkImage> resizedImage =
-        resizeAndOrientImage(skImage.release(), orientation, imageScale, opacity, interpolationQuality);
+    sk_sp<SkImage> resizedImage =
+        resizeAndOrientImage(std::move(skImage), orientation, imageScale, opacity, interpolationQuality);
     if (!resizedImage || !resizedImage->asLegacyBitmap(&bm, SkImage::kRO_LegacyBitmapMode))
         return nullptr;
 
     return wrapUnique(new DragImage(bm, deviceScaleFactor, interpolationQuality));
 }
 
 static Font deriveDragLabelFont(int size, FontWeight fontWeight, const FontDescription& systemFont)
 {
     FontDescription description = systemFont;
     description.setWeight(fontWeight);
@@ skipping 105 matching lines @@
 
 void DragImage::scale(float scaleX, float scaleY)
 {
     skia::ImageOperations::ResizeMethod resizeMethod = m_interpolationQuality == InterpolationNone ? skia::ImageOperations::RESIZE_BOX : skia::ImageOperations::RESIZE_LANCZOS3;
     int imageWidth = scaleX * m_bitmap.width();
     int imageHeight = scaleY * m_bitmap.height();
     m_bitmap = skia::ImageOperations::Resize(m_bitmap, resizeMethod, imageWidth, imageHeight);
 }
 
 } // namespace blink