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

third_party/WebKit/Source/platform/graphics/gpu/WebGLImageConversion.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/graphics/gpu/WebGLImageConversion.h"
 
 #include "platform/CheckedInt.h"
 #include "platform/graphics/ImageObserver.h"
 #include "platform/graphics/cpu/arm/WebGLImageConversionNEON.h"
 #include "platform/graphics/cpu/x86/WebGLImageConversionSSE.h"
@@ skipping 2114 matching lines @@
     extractImage(premultiplyAlpha, ignoreGammaAndColorProfile);
 }
 
 void WebGLImageConversion::ImageExtractor::extractImage(bool premultiplyAlpha, bool ignoreGammaAndColorProfile)
 {
     ASSERT(!m_imagePixelLocker);
 
     if (!m_image)
         return;
 
-    RefPtr<SkImage> skiaImage = m_image->imageForCurrentFrame();
+    sk_sp<SkImage> skiaImage = m_image->imageForCurrentFrame();
     SkImageInfo info = skiaImage
         ? SkImageInfo::MakeN32Premul(m_image->width(), m_image->height())
         : SkImageInfo::MakeUnknown();
     m_alphaOp = AlphaDoNothing;
     bool hasAlpha = skiaImage ? !skiaImage->isOpaque() : true;
 
     if ((!skiaImage || ignoreGammaAndColorProfile || (hasAlpha && !premultiplyAlpha)) && m_image->data()) {
         // Attempt to get raw unpremultiplied image data.
         std::unique_ptr<ImageDecoder> decoder(ImageDecoder::create(
             m_image->data(), true, ImageDecoder::AlphaNotPremultiplied,
             ignoreGammaAndColorProfile ? ImageDecoder::GammaAndColorProfileIgnored : ImageDecoder::GammaAndColorProfileApplied));
         if (!decoder || !decoder->frameCount())
             return;
         ImageFrame* frame = decoder->frameBufferAtIndex(0);
         if (!frame || frame->getStatus() != ImageFrame::FrameComplete)
             return;
         hasAlpha = frame->hasAlpha();
         SkBitmap bitmap = frame->bitmap();
         if (!frameIsValid(bitmap))
             return;
 
         // TODO(fmalita): Partial frames are not supported currently: frameIsValid ensures that
         // only immutable/fully decoded frames make it through.  We could potentially relax this
         // and allow SkImage::NewFromBitmap to make a copy.
         ASSERT(bitmap.isImmutable());
-        skiaImage = fromSkSp(SkImage::MakeFromBitmap(bitmap));
+        skiaImage = SkImage::MakeFromBitmap(bitmap);
         info = bitmap.info();
 
         if (hasAlpha && premultiplyAlpha)
             m_alphaOp = AlphaDoPremultiply;
     } else if (!premultiplyAlpha && hasAlpha) {
         // 1. For texImage2D with HTMLVideoElment input, assume no PremultiplyAlpha had been applied and the alpha value for each pixel is 0xFF
         // which is true at present and may be changed in the future and needs adjustment accordingly.
         // 2. For texImage2D with HTMLCanvasElement input in which Alpha is already Premultiplied in this port,
         // do AlphaDoUnmultiply if UNPACK_PREMULTIPLY_ALPHA_WEBGL is set to false.
         if (m_imageHtmlDomSource != HtmlDomVideo)
             m_alphaOp = AlphaDoUnmultiply;
     }
 
     if (!skiaImage)
         return;
 
     m_imageSourceFormat = SK_B32_SHIFT ? DataFormatRGBA8 : DataFormatBGRA8;
     m_imageSourceUnpackAlignment = 0; // FIXME: this seems to always be zero - why use at all?
 
     ASSERT(skiaImage->width() && skiaImage->height());
     m_imageWidth = skiaImage->width();
     m_imageHeight = skiaImage->height();
 
     // Fail if the image was downsampled because of memory limits.
     if (m_imageWidth != (unsigned)m_image->width() || m_imageHeight != (unsigned)m_image->height())
         return;
 
     m_imagePixelLocker.emplace(skiaImage, info.alphaType(), kN32_SkColorType);

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

std::move(skiaImage)

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

Done.

 }
 
 unsigned WebGLImageConversion::getChannelBitsByFormat(GLenum format)
 {
     switch (format) {
     case GL_ALPHA:
         return ChannelAlpha;
     case GL_RED:
     case GL_RED_INTEGER:
     case GL_R8:
@@ skipping 202 matching lines @@
     }
 
     FormatConverter converter(width, height, sourceData, destinationData, srcStride, dstStride);
     converter.convert(sourceDataFormat, dstDataFormat, alphaOp);
     if (!converter.Success())
         return false;
     return true;
 }
 
 } // namespace blink