| 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 e50b37c361ee927d03183f39e764da215a702aef..a6ac130224dd8e02ae6f93a27547ecc8830e9dd3 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 {
|
| @@ -178,7 +177,7 @@ bool ICOImageDecoder::decodeAtIndex(size_t index)
|
| // We need to have already sized m_frameBufferCache before this, and
|
| // we must not resize it again later (see caution in frameCount()).
|
| ASSERT(m_frameBufferCache.size() == m_dirEntries.size());
|
| - 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());
|
| m_bmpReaders[index]->setBuffer(&m_frameBufferCache[index]);
|
| }
|
| @@ -191,7 +190,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
|
|
|