| Index: third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
|
| index 00d19d7eba0776767bf69ae1cb21bd02216c6ecb..f8d39b99ad264cef00633c49a40f6643b3af1b64 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/ico/ICOImageDecoder.cpp
|
| @@ -32,9 +32,8 @@
|
|
|
| #include "platform/Histogram.h"
|
| #include "platform/image-decoders/png/PNGImageDecoder.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/Threading.h"
|
| -
|
| #include <algorithm>
|
|
|
| namespace blink {
|
| @@ -196,7 +195,7 @@ bool ICOImageDecoder::decodeAtIndex(size_t index)
|
|
|
| if (imageType == BMP) {
|
| if (!m_bmpReaders[index]) {
|
| - m_bmpReaders[index] = adoptPtr(new BMPImageReader(this, dirEntry.m_imageOffset, 0, true));
|
| + m_bmpReaders[index] = wrapUnique(new BMPImageReader(this, dirEntry.m_imageOffset, 0, true));
|
| m_bmpReaders[index]->setData(m_data.get());
|
| }
|
| // Update the pointer to the buffer as it could change after
|
| @@ -211,7 +210,7 @@ bool ICOImageDecoder::decodeAtIndex(size_t index)
|
| if (!m_pngDecoders[index]) {
|
| AlphaOption alphaOption = m_premultiplyAlpha ? AlphaPremultiplied : AlphaNotPremultiplied;
|
| GammaAndColorProfileOption colorOptions = m_ignoreGammaAndColorProfile ? GammaAndColorProfileIgnored : GammaAndColorProfileApplied;
|
| - m_pngDecoders[index] = adoptPtr(new PNGImageDecoder(alphaOption, colorOptions, m_maxDecodedBytes, dirEntry.m_imageOffset));
|
| + m_pngDecoders[index] = wrapUnique(new PNGImageDecoder(alphaOption, colorOptions, m_maxDecodedBytes, dirEntry.m_imageOffset));
|
| setDataForPNGDecoderAtIndex(index);
|
| }
|
| // Fail if the size the PNGImageDecoder calculated does not match the size
|
|
|