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

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

 /*
  * Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2004, 2005, 2006, 2008 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
@@ skipping 59 matching lines @@
     , m_haveSize(false)
     , m_sizeAvailable(false)
     , m_haveFrameCount(false)
 {
 }
 
 BitmapImage::BitmapImage(const SkBitmap& bitmap, ImageObserver* observer)
     : Image(observer)
     , m_size(bitmap.width(), bitmap.height())
     , m_currentFrame(0)
-    , m_cachedFrame(fromSkSp(SkImage::MakeFromBitmap(bitmap)))
+    , m_cachedFrame(SkImage::MakeFromBitmap(bitmap))
     , m_cachedFrameIndex(0)
     , m_repetitionCount(cAnimationNone)
     , m_repetitionCountStatus(Unknown)
     , m_repetitionsComplete(0)
     , m_frameCount(1)
     , m_animationPolicy(ImageAnimationPolicyAllowed)
     , m_animationFinished(true)
     , m_allDataReceived(true)
     , m_haveSize(true)
     , m_sizeAvailable(true)
@@ skipping 13 matching lines @@
     stopAnimation();
 }
 
 bool BitmapImage::currentFrameHasSingleSecurityOrigin() const
 {
     return true;
 }
 
 void BitmapImage::destroyDecodedData()
 {
-    m_cachedFrame.clear();
+    m_cachedFrame.reset();
     for (size_t i = 0; i < m_frames.size(); ++i)
         m_frames[i].clear(true);
     m_source.clearCacheExceptFrame(kNotFound);
     notifyMemoryChanged();
 }
 
 PassRefPtr<SharedBuffer> BitmapImage::data()
 {
     return m_source.data();
 }
 
 void BitmapImage::notifyMemoryChanged()
 {
     if (getImageObserver())
         getImageObserver()->decodedSizeChangedTo(this, totalFrameBytes());
 }
 
 size_t BitmapImage::totalFrameBytes()
 {
     const size_t numFrames = frameCount();
     size_t totalBytes = 0;
     for (size_t i = 0; i < numFrames; ++i)
         totalBytes += m_source.frameBytesAtIndex(i);
     return totalBytes;
 }
 
-PassRefPtr<SkImage> BitmapImage::decodeAndCacheFrame(size_t index)
+sk_sp<SkImage> BitmapImage::decodeAndCacheFrame(size_t index)
 {
     size_t numFrames = frameCount();
     if (m_frames.size() < numFrames)
         m_frames.grow(numFrames);
 
     // We are caching frame snapshots.  This is OK even for partially decoded frames,
     // as they are cleared by dataChanged() when new data arrives.
-    RefPtr<SkImage> image = m_source.createFrameAtIndex(index);
+    sk_sp<SkImage> image = m_source.createFrameAtIndex(index);
     m_cachedFrame = image;
     m_cachedFrameIndex = index;
 
     m_frames[index].m_orientation = m_source.orientationAtIndex(index);
     m_frames[index].m_haveMetadata = true;
     m_frames[index].m_isComplete = m_source.frameIsCompleteAtIndex(index);
     if (repetitionCount(false) != cAnimationNone)
         m_frames[index].m_duration = m_source.frameDurationAtIndex(index);
     m_frames[index].m_hasAlpha = m_source.frameHasAlphaAtIndex(index);
     m_frames[index].m_frameBytes = m_source.frameBytesAtIndex(index);
 
     notifyMemoryChanged();
-    return image.release();
+    return image;
 }
 
 void BitmapImage::updateSize() const
 {
     if (!m_sizeAvailable || m_haveSize)
         return;
 
     m_size = m_source.size();
     m_sizeRespectingOrientation = m_source.size(RespectImageOrientation);
     m_haveSize = true;
@@ skipping 54 matching lines @@
     // start of the frame data), and any or none of them might be the particular
     // frame affected by appending new data here. Thus we have to clear all the
     // incomplete frames to be safe.
     for (size_t i = 0; i < m_frames.size(); ++i) {
         // NOTE: Don't call frameIsCompleteAtIndex() here, that will try to
         // decode any uncached (i.e. never-decoded or
         // cleared-on-a-previous-pass) frames!
         if (m_frames[i].m_haveMetadata && !m_frames[i].m_isComplete) {
             m_frames[i].clear(true);
             if (i == m_cachedFrameIndex)
-                m_cachedFrame.clear();
+                m_cachedFrame.reset();
         }
     }
 
     // Feed all the data we've seen so far to the image decoder.
     m_allDataReceived = allDataReceived;
 
     m_haveFrameCount = false;
     return isSizeAvailable() ? SizeAvailable : SizeUnavailable;
 }
 
 bool BitmapImage::hasColorProfile() const
 {
     return m_source.hasColorProfile();
 }
 
 String BitmapImage::filenameExtension() const
 {
     return m_source.filenameExtension();
 }
 
 void BitmapImage::draw(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum shouldRespectImageOrientation, ImageClampingMode clampMode)
 {
     TRACE_EVENT0("skia", "BitmapImage::draw");
 
-    RefPtr<SkImage> image = imageForCurrentFrame();
+    sk_sp<SkImage> image = imageForCurrentFrame();
     if (!image)
         return; // It's too early and we don't have an image yet.
 
     FloatRect adjustedSrcRect = srcRect;
     adjustedSrcRect.intersect(SkRect::Make(image->bounds()));
 
     if (adjustedSrcRect.isEmpty() || dstRect.isEmpty())
         return; // Nothing to draw.
 
     ImageOrientation orientation = DefaultImageOrientation;
@@ skipping 56 matching lines @@
 
     if (m_sizeAvailable && hasVisibleImageSize(size())) {
         BitmapImageMetrics::countDecodedImageType(m_source.filenameExtension());
         if (m_source.filenameExtension() == "jpg")
             BitmapImageMetrics::countImageOrientation(m_source.orientationAtIndex(0).orientation());
     }
 
     return m_sizeAvailable;
 }
 
-PassRefPtr<SkImage> BitmapImage::frameAtIndex(size_t index)
+sk_sp<SkImage> BitmapImage::frameAtIndex(size_t index)
 {
     if (index >= frameCount())
         return nullptr;
 
     if (index == m_cachedFrameIndex && m_cachedFrame)
         return m_cachedFrame;
 
     return decodeAndCacheFrame(index);
 }
 
 bool BitmapImage::frameIsCompleteAtIndex(size_t index)
 {
     if (index < m_frames.size() && m_frames[index].m_haveMetadata && m_frames[index].m_isComplete)
         return true;
 
     return m_source.frameIsCompleteAtIndex(index);
 }
 
 float BitmapImage::frameDurationAtIndex(size_t index)
 {
     if (index < m_frames.size() && m_frames[index].m_haveMetadata)
         return m_frames[index].m_duration;
 
     return m_source.frameDurationAtIndex(index);
 }
 
-PassRefPtr<SkImage> BitmapImage::imageForCurrentFrame()
+sk_sp<SkImage> BitmapImage::imageForCurrentFrame()
 {
     return frameAtIndex(currentFrame());
 }
 
 PassRefPtr<Image> BitmapImage::imageForDefaultFrame()
 {
     if (frameCount() > 1) {
-        RefPtr<SkImage> firstFrame = frameAtIndex(0);
+        sk_sp<SkImage> firstFrame = frameAtIndex(0);
         if (firstFrame)
             return StaticBitmapImage::create(firstFrame);

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

not new to this CL, but std::move(firstFrame) makes sense here.

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

Good catch.  Done.

     }
 
     return Image::imageForDefaultFrame();
 }
 
 bool BitmapImage::frameHasAlphaAtIndex(size_t index)
 {
     if (m_frames.size() <= index)
         return true;
 
@@ skipping 20 matching lines @@
     return !frameHasAlphaAtIndex(currentFrame());
 }
 
 bool BitmapImage::currentFrameIsComplete()
 {
     return frameIsCompleteAtIndex(currentFrame());
 }
 
 bool BitmapImage::currentFrameIsLazyDecoded()
 {
-    RefPtr<SkImage> image = frameAtIndex(currentFrame());
+    sk_sp<SkImage> image = frameAtIndex(currentFrame());
     return image && image->isLazyGenerated();
 }
 
 ImageOrientation BitmapImage::currentFrameOrientation()
 {
     return frameOrientationAtIndex(currentFrame());
 }
 
 ImageOrientation BitmapImage::frameOrientationAtIndex(size_t index)
 {
@@ skipping 117 matching lines @@
     m_frameTimer.reset();
 }
 
 void BitmapImage::resetAnimation()
 {
     stopAnimation();
     m_currentFrame = 0;
     m_repetitionsComplete = 0;
     m_desiredFrameStartTime = 0;
     m_animationFinished = false;
-    m_cachedFrame.clear();
+    m_cachedFrame.reset();
 }
 
 bool BitmapImage::maybeAnimated()
 {
     if (m_animationFinished)
         return false;
     if (frameCount() > 1)
         return true;
 
     return m_source.repetitionCount() != cAnimationNone;
@@ skipping 69 matching lines @@
 
     return true;
 }
 
 void BitmapImage::notifyObserversOfAnimationAdvance(TimerBase*)
 {
     getImageObserver()->animationAdvanced(this);
 }
 
 } // namespace blink