| Index: third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
|
| index d444caa0bf644e481d7a9f15e3952de5ec2c4397..0de310a9e1bd4d5778df8c1a51061444cb5302f6 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
|
| @@ -40,7 +40,9 @@
|
|
|
| #include "platform/Histogram.h"
|
| #include "png.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/Threading.h"
|
| +#include <memory>
|
|
|
| #if !defined(PNG_LIBPNG_VER_MAJOR) || !defined(PNG_LIBPNG_VER_MINOR)
|
| #error version error: compile against a versioned libpng.
|
| @@ -144,10 +146,10 @@ public:
|
| bool hasAlpha() const { return m_hasAlpha; }
|
|
|
| png_bytep interlaceBuffer() const { return m_interlaceBuffer.get(); }
|
| - void createInterlaceBuffer(int size) { m_interlaceBuffer = adoptArrayPtr(new png_byte[size]); }
|
| + void createInterlaceBuffer(int size) { m_interlaceBuffer = wrapArrayUnique(new png_byte[size]); }
|
| #if USE(QCMSLIB)
|
| png_bytep rowBuffer() const { return m_rowBuffer.get(); }
|
| - void createRowBuffer(int size) { m_rowBuffer = adoptArrayPtr(new png_byte[size]); }
|
| + void createRowBuffer(int size) { m_rowBuffer = wrapArrayUnique(new png_byte[size]); }
|
| #endif
|
|
|
| private:
|
| @@ -158,9 +160,9 @@ private:
|
| size_t m_currentBufferSize;
|
| bool m_decodingSizeOnly;
|
| bool m_hasAlpha;
|
| - OwnPtr<png_byte[]> m_interlaceBuffer;
|
| + std::unique_ptr<png_byte[]> m_interlaceBuffer;
|
| #if USE(QCMSLIB)
|
| - OwnPtr<png_byte[]> m_rowBuffer;
|
| + std::unique_ptr<png_byte[]> m_rowBuffer;
|
| #endif
|
| };
|
|
|
| @@ -435,7 +437,7 @@ void PNGImageDecoder::decode(bool onlySize)
|
| return;
|
|
|
| if (!m_reader)
|
| - m_reader = adoptPtr(new PNGImageReader(this, m_offset));
|
| + m_reader = wrapUnique(new PNGImageReader(this, m_offset));
|
|
|
| // If we couldn't decode the image but have received all the data, decoding
|
| // has failed.
|
|
|