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

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

 /*
  * Copyright (C) 2012 Google 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 81 matching lines @@
 
 DeferredImageDecoder::~DeferredImageDecoder()
 {
 }
 
 String DeferredImageDecoder::filenameExtension() const
 {
     return m_actualDecoder ? m_actualDecoder->filenameExtension() : m_filenameExtension;
 }
 
-PassRefPtr<SkImage> DeferredImageDecoder::createFrameAtIndex(size_t index)
+sk_sp<SkImage> DeferredImageDecoder::createFrameAtIndex(size_t index)
 {
     if (m_frameGenerator && m_frameGenerator->decodeFailed())
         return nullptr;
 
     prepareLazyDecodedFrames();
 
     if (index < m_frameData.size()) {
         DeferredFrameData* frameData = &m_frameData[index];
         if (m_actualDecoder)
             frameData->m_frameBytes = m_actualDecoder->frameBytesAtIndex(index);
         else
             frameData->m_frameBytes = m_size.area() * sizeof(ImageFrame::PixelData);
         // ImageFrameGenerator has the latest known alpha state. There will be a
         // performance boost if this frame is opaque.
         DCHECK(m_frameGenerator);
         return createFrameImageAtIndex(index, !m_frameGenerator->hasAlpha(index));
     }
 
     if (!m_actualDecoder || m_actualDecoder->failed())
         return nullptr;
 
     ImageFrame* frame = m_actualDecoder->frameBufferAtIndex(index);
     if (!frame || frame->getStatus() == ImageFrame::FrameEmpty)
         return nullptr;
 
-    return fromSkSp(SkImage::MakeFromBitmap(frame->bitmap()));
+    return SkImage::MakeFromBitmap(frame->bitmap());
 }
 
 PassRefPtr<SharedBuffer> DeferredImageDecoder::data()
 {
     if (!m_rwBuffer)
         return nullptr;
-    RefPtr<SkROBuffer> roBuffer = adoptRef(m_rwBuffer->newRBufferSnapshot());
+    sk_sp<SkROBuffer> roBuffer(m_rwBuffer->newRBufferSnapshot());
     RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create();
     SkROBuffer::Iter it(roBuffer.get());
     do {
         sharedBuffer->append(static_cast<const char*>(it.data()), it.size());
     } while (it.next());
     return sharedBuffer.release();
 }
 
 void DeferredImageDecoder::setData(PassRefPtr<SharedBuffer> data, bool allDataReceived)
 {
@@ skipping 165 matching lines @@
         m_actualDecoder.reset();
         // Hold on to m_rwBuffer, which is still needed by createFrameAtIndex.
     }
 }
 
 inline SkImageInfo imageInfoFrom(const SkISize& decodedSize, bool knownToBeOpaque)
 {
     return SkImageInfo::MakeN32(decodedSize.width(), decodedSize.height(), knownToBeOpaque ? kOpaque_SkAlphaType : kPremul_SkAlphaType);
 }
 
-PassRefPtr<SkImage> DeferredImageDecoder::createFrameImageAtIndex(size_t index, bool knownToBeOpaque)
+sk_sp<SkImage> DeferredImageDecoder::createFrameImageAtIndex(size_t index, bool knownToBeOpaque)
 {
     const SkISize& decodedSize = m_frameGenerator->getFullSize();
     ASSERT(decodedSize.width() > 0);
     ASSERT(decodedSize.height() > 0);
 
-    RefPtr<SkROBuffer> roBuffer = adoptRef(m_rwBuffer->newRBufferSnapshot());
-    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkROBuffer(roBuffer.release());
+    sk_sp<SkROBuffer> roBuffer(m_rwBuffer->newRBufferSnapshot());
+    RefPtr<SegmentReader> segmentReader = SegmentReader::createFromSkROBuffer(std::move(roBuffer));
     DecodingImageGenerator* generator = new DecodingImageGenerator(m_frameGenerator, imageInfoFrom(decodedSize, knownToBeOpaque), segmentReader.release(), m_allDataReceived, index, m_frameData[index].m_uniqueID);
-    RefPtr<SkImage> image = fromSkSp(SkImage::MakeFromGenerator(generator)); // SkImage takes ownership of the generator.
+    sk_sp<SkImage> image = SkImage::MakeFromGenerator(generator); // SkImage takes ownership of the generator.
     if (!image)
         return nullptr;
 
     // We can consider decoded bitmap constant and reuse uniqueID only after all
     // data is received.  We reuse it also for multiframe images when image data
     // is partially received but the frame data is fully received.
     if (m_allDataReceived || m_frameData[index].m_isComplete) {
         DCHECK(m_frameData[index].m_uniqueID == DecodingImageGenerator::kNeedNewImageUniqueID || m_frameData[index].m_uniqueID == image->uniqueID());
         m_frameData[index].m_uniqueID = image->uniqueID();
     }
 
     generator->setCanYUVDecode(m_canYUVDecode);
 
-    return image.release();
+    return image;
 }
 
 bool DeferredImageDecoder::hotSpot(IntPoint& hotSpot) const
 {
     if (m_actualDecoder)
         return m_actualDecoder->hotSpot(hotSpot);
     if (m_hasHotSpot)
         hotSpot = m_hotSpot;
     return m_hasHotSpot;
 }
 
 } // namespace blink
 
 namespace WTF {
 template<> struct VectorTraits<blink::DeferredFrameData> : public SimpleClassVectorTraits<blink::DeferredFrameData> {
     STATIC_ONLY(VectorTraits);
     static const bool canInitializeWithMemset = false; // Not all DeferredFrameData members initialize to 0.
 };
 }