| Index: third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
|
| diff --git a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
|
| index 4838182b349908322925d7b26cf1a22c84633d36..3db9411945014f97371cdcf03a006332439f4c30 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
|
| +++ b/third_party/WebKit/Source/platform/graphics/DeferredImageDecoder.h
|
| @@ -32,8 +32,8 @@
|
| #include "third_party/skia/include/core/SkRWBuffer.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/Forward.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| class SkImage;
|
|
|
| @@ -47,9 +47,9 @@ class PLATFORM_EXPORT DeferredImageDecoder final {
|
| WTF_MAKE_NONCOPYABLE(DeferredImageDecoder);
|
| USING_FAST_MALLOC(DeferredImageDecoder);
|
| public:
|
| - static PassOwnPtr<DeferredImageDecoder> create(const SharedBuffer& data, ImageDecoder::AlphaOption, ImageDecoder::GammaAndColorProfileOption);
|
| + static std::unique_ptr<DeferredImageDecoder> create(const SharedBuffer& data, ImageDecoder::AlphaOption, ImageDecoder::GammaAndColorProfileOption);
|
|
|
| - static PassOwnPtr<DeferredImageDecoder> createForTesting(PassOwnPtr<ImageDecoder>);
|
| + static std::unique_ptr<DeferredImageDecoder> createForTesting(std::unique_ptr<ImageDecoder>);
|
|
|
| ~DeferredImageDecoder();
|
|
|
| @@ -74,7 +74,7 @@ public:
|
| bool hotSpot(IntPoint&) const;
|
|
|
| private:
|
| - explicit DeferredImageDecoder(PassOwnPtr<ImageDecoder> actualDecoder);
|
| + explicit DeferredImageDecoder(std::unique_ptr<ImageDecoder> actualDecoder);
|
|
|
| friend class DeferredImageDecoderTest;
|
| ImageFrameGenerator* frameGenerator() { return m_frameGenerator.get(); }
|
| @@ -86,9 +86,9 @@ private:
|
|
|
| // Copy of the data that is passed in, used by deferred decoding.
|
| // Allows creating readonly snapshots that may be read in another thread.
|
| - OwnPtr<SkRWBuffer> m_rwBuffer;
|
| + std::unique_ptr<SkRWBuffer> m_rwBuffer;
|
| bool m_allDataReceived;
|
| - OwnPtr<ImageDecoder> m_actualDecoder;
|
| + std::unique_ptr<ImageDecoder> m_actualDecoder;
|
|
|
| String m_filenameExtension;
|
| IntSize m_size;
|
|
|