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

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) Research In Motion Limited 2009-2010. 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 106 matching lines @@
     // succeeded.
     bool setSizeAndColorProfile(int newWidth, int newHeight, const ICCProfile& newIccProfile);
 
     bool hasAlpha() const;
     const IntRect& originalFrameRect() const { return m_originalFrameRect; }
     Status getStatus() const { return m_status; }
     unsigned duration() const { return m_duration; }
     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; }
     size_t requiredPreviousFrameIndex() const { return m_requiredPreviousFrameIndex; }
     void setHasAlpha(bool alpha);
     void setOriginalFrameRect(const IntRect& r) { m_originalFrameRect = r; }
     void setStatus(Status);
     void setDuration(unsigned duration) { m_duration = duration; }
     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; }
     void setRequiredPreviousFrameIndex(size_t previousFrameIndex) { m_requiredPreviousFrameIndex = previousFrameIndex; }
 
     inline PixelData* getAddr(int x, int y)
     {
         return m_bitmap.getAddr32(x, y);
     }
 
@@ skipping 44 matching lines @@
     }
 
     int height() const
     {
         return m_bitmap.height();
     }
 
     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.
     IntRect m_originalFrameRect;
     Status m_status;
     unsigned m_duration;
     DisposalMethod m_disposalMethod;
     AlphaBlendSource m_alphaBlendSource;
     bool m_premultiplyAlpha;
     // True if the pixels changed, but the bitmap has not yet been notified.
     bool m_pixelsChanged;
 
     // The frame that must be decoded before this frame can be decoded.
     // WTF::kNotFound if this frame doesn't require any previous frame.
     // This is used by ImageDecoder::clearCacheExceptFrame(), and will never
     // be read for image formats that do not have multiple frames.
     size_t m_requiredPreviousFrameIndex;
 };
 
 } // namespace blink
 
 #endif