| 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 6a4db8fa2d711b56af64eac34f940d4fd870781b..ed3619a09c52a4fc30670ce2cbade31f45307e39 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp
|
| @@ -32,7 +32,7 @@
|
| namespace blink {
|
|
|
| ImageFrame::ImageFrame()
|
| - : m_allocator(0)
|
| + : m_allocator(nullptr)
|
| , m_hasAlpha(true)
|
| , m_status(FrameEmpty)
|
| , m_duration(0)
|
| @@ -107,7 +107,7 @@ bool ImageFrame::setSizeAndColorProfile(int newWidth, int newHeight, const ICCPr
|
|
|
| m_bitmap.setInfo(SkImageInfo::MakeN32(newWidth, newHeight,
|
| m_premultiplyAlpha ? kPremul_SkAlphaType : kUnpremul_SkAlphaType, colorSpace));
|
| - if (!m_bitmap.tryAllocPixels(m_allocator, 0))
|
| + if (!m_bitmap.tryAllocPixels(m_allocator.get(), 0))
|
| return false;
|
|
|
| zeroFillPixelData();
|
|
|