Index: third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp |
diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp |
index 1390439648a4bbd767300fe45c3ee736ab1ead0f..47f41060695d502f5f779f74a54c300870bfdee1 100644 |
--- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp |
+++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp |
@@ -29,8 +29,7 @@ |
namespace blink { |
ImageFrame::ImageFrame() |
- : m_allocator(0) |
- , m_hasAlpha(true) |
+ : m_hasAlpha(true) |
, m_status(FrameEmpty) |
, m_duration(0) |
, m_disposalMethod(DisposeNotSpecified) |
@@ -53,7 +52,7 @@ ImageFrame& ImageFrame::operator=(const ImageFrame& other) |
// 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()); |
@@ -100,7 +99,7 @@ bool ImageFrame::setSize(int newWidth, int newHeight) |
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(); |