Use sk_sp<SkBitmap::Allocator> instead of raw pointers or WTF::RefPtr<T>.

third_party/WebKit/Source/platform/image-decoders/ImageFrame.h

Index: third_party/WebKit/Source/platform/image-decoders/ImageFrame.h
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.h b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.h
index 3541f7dcc1eef4f979dc05d574220a55a52d69d7..fe2c260a60ba6ec86f6172d9956a739de99e8541 100644
--- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.h
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.h
@@ -124,7 +124,7 @@ public:
     DisposalMethod getDisposalMethod() const { return m_disposalMethod; }
     AlphaBlendSource getAlphaBlendSource() const { return m_alphaBlendSource; }
     bool premultiplyAlpha() const { return m_premultiplyAlpha; }
-    SkBitmap::Allocator* allocator() const { return m_allocator; }
+    const sk_sp<SkBitmap::Allocator>& allocator() const { return m_allocator; }

[scroggo_chromium, 2016/09/13 14:54:42]

We went back and forth on how to handle this inside Skia. I think we decided to
return a raw pointer in this case. I don't know whether that means we should do
the same for sk_sp's in Chromium/Blink.

(You may have already seen the document about sk_sp, but just in case, it's
here:
https://docs.google.com/document/d/1PZRnDBwhnB_Ug6DtlkphAvJ9Ga5U3ONbSn1wf6jXX...)

[Łukasz Anforowicz, 2016/09/13 18:17:31]

I've reverted this part of the change and just focused on eradicating
RefPtr<SkXxx> by allocating ExternalMemoryAllocator on the stack.
Thanks - I think I have not seen this document before.

     const SkBitmap& bitmap() const { return m_bitmap; }
     // Returns true if the pixels changed, but the bitmap has not yet been notified.
     bool pixelsChanged() const { return m_pixelsChanged; }
@@ -136,7 +136,7 @@ public:
     void setDisposalMethod(DisposalMethod disposalMethod) { m_disposalMethod = disposalMethod; }
     void setAlphaBlendSource(AlphaBlendSource alphaBlendSource) { m_alphaBlendSource = alphaBlendSource; }
     void setPremultiplyAlpha(bool premultiplyAlpha) { m_premultiplyAlpha = premultiplyAlpha; }
-    void setMemoryAllocator(SkBitmap::Allocator* allocator) { m_allocator = allocator; }
+    void setMemoryAllocator(sk_sp<SkBitmap::Allocator> allocator) { m_allocator = allocator; }

[scroggo_chromium, 2016/09/13 14:54:42]

Don't you want to std::move |allocator|?

[Łukasz Anforowicz, 2016/09/13 18:17:31]

Ooops - yes, std::move would be appropriate here.

At any rate, I've reverted this part of the change and just focused on
eradicating RefPtr<SkXxx> by allocating ExternalMemoryAllocator on the stack.

     // The pixelsChanged flag needs to be set when the raw pixel data was directly modified
     // (e.g. through a pointer or setRGBA). The flag is usually set after a batch of changes was made.
     void setPixelsChanged(bool pixelsChanged) { m_pixelsChanged = pixelsChanged; }
@@ -201,7 +201,7 @@ private:
     SkAlphaType computeAlphaType() const;
 
     SkBitmap m_bitmap;
-    SkBitmap::Allocator* m_allocator;
+    sk_sp<SkBitmap::Allocator> m_allocator;
     bool m_hasAlpha;
     // This will always just be the entire buffer except for GIF or WebP
     // frames whose original rect was smaller than the overall image size.