Use RefPtr for SkBitmap::Allocator in ImageDecoder

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2008, 2009 Google, Inc.
  *
  * 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 11 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/image-decoders/ImageDecoder.h"
 
 namespace blink {
 
 ImageFrame::ImageFrame()
-    : m_allocator(0)
-    , m_hasAlpha(true)
+    : m_hasAlpha(true)
     , m_status(FrameEmpty)
     , m_duration(0)
     , m_disposalMethod(DisposeNotSpecified)
     , m_alphaBlendSource(BlendAtopPreviousFrame)
     , m_premultiplyAlpha(true)
     , m_pixelsChanged(false)
     , m_requiredPreviousFrameIndex(kNotFound)
 {
 }
 
 ImageFrame& ImageFrame::operator=(const ImageFrame& other)
 {
     if (this == &other)
         return *this;
 
     m_bitmap = other.m_bitmap;
     // Keep the pixels locked since we will be writing directly into the
     // bitmap throughout this object's lifetime.
     m_bitmap.lockPixels();
     // Be sure to assign this before calling setStatus(), since setStatus() may
     // call notifyBitmapIfPixelsChanged().
     m_pixelsChanged = other.m_pixelsChanged;
-    setMemoryAllocator(other.allocator());
+    m_allocator = other.m_allocator;
     setOriginalFrameRect(other.originalFrameRect());
     setStatus(other.getStatus());
     setDuration(other.duration());
     setDisposalMethod(other.getDisposalMethod());
     setAlphaBlendSource(other.getAlphaBlendSource());
     setPremultiplyAlpha(other.premultiplyAlpha());
     // Be sure that this is called after we've called setStatus(), since we
     // look at our status to know what to do with the alpha value.
     setHasAlpha(other.hasAlpha());
     setRequiredPreviousFrameIndex(other.requiredPreviousFrameIndex());
@@ skipping 26 matching lines @@
     return other.m_bitmap.copyTo(&m_bitmap, other.m_bitmap.colorType());
 }
 
 bool ImageFrame::setSize(int newWidth, int newHeight)
 {
     // setSize() should only be called once, it leaks memory otherwise.
     ASSERT(!width() && !height());
 
     m_bitmap.setInfo(SkImageInfo::MakeN32(newWidth, newHeight,
         m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType));
-    if (!m_bitmap.tryAllocPixels(m_allocator, 0))
+    if (!m_bitmap.tryAllocPixels(m_allocator.get(), 0))
         return false;
 
     zeroFillPixelData();
     return true;
 }
 
 bool ImageFrame::hasAlpha() const
 {
     return m_hasAlpha;
 }
@@ skipping 31 matching lines @@
     // If the frame is not fully loaded, there will be transparent pixels,
     // so we can't tell skia we're opaque, even for image types that logically
     // always are (e.g. jpeg).
     if (!m_hasAlpha && m_status == FrameComplete)
         return kOpaque_SkAlphaType;
 
     return m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType;
 }
 
 } // namespace blink