| Index: third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
|
| index 70198f1f273d547dd024ccacaf14089673ce908e..c444907646158f13909a5c7e0e9b602e515514bf 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/ImageDecoder.h
|
| @@ -36,7 +36,6 @@
|
| #include "platform/image-decoders/SegmentReader.h"
|
| #include "public/platform/Platform.h"
|
| #include "wtf/Assertions.h"
|
| -#include "wtf/PassOwnPtr.h"
|
| #include "wtf/RefPtr.h"
|
| #include "wtf/Threading.h"
|
| #include "wtf/Vector.h"
|
| @@ -109,9 +108,9 @@ public:
|
| // we can't sniff a supported type from the provided data (possibly
|
| // because there isn't enough data yet).
|
| // Sets m_maxDecodedBytes to Platform::maxImageDecodedBytes().
|
| - static PassOwnPtr<ImageDecoder> create(const char* data, size_t length, AlphaOption, GammaAndColorProfileOption);
|
| - static PassOwnPtr<ImageDecoder> create(const SharedBuffer&, AlphaOption, GammaAndColorProfileOption);
|
| - static PassOwnPtr<ImageDecoder> create(const SegmentReader&, AlphaOption, GammaAndColorProfileOption);
|
| + static std::unique_ptr<ImageDecoder> create(const char* data, size_t length, AlphaOption, GammaAndColorProfileOption);
|
| + static std::unique_ptr<ImageDecoder> create(const SharedBuffer&, AlphaOption, GammaAndColorProfileOption);
|
| + static std::unique_ptr<ImageDecoder> create(const SegmentReader&, AlphaOption, GammaAndColorProfileOption);
|
|
|
| virtual String filenameExtension() const = 0;
|
|
|
| @@ -264,7 +263,7 @@ public:
|
|
|
| virtual bool canDecodeToYUV() { return false; }
|
| virtual bool decodeToYUV() { return false; }
|
| - virtual void setImagePlanes(PassOwnPtr<ImagePlanes>) { }
|
| + virtual void setImagePlanes(std::unique_ptr<ImagePlanes>) { }
|
|
|
| protected:
|
| // Calculates the most recent frame whose image data may be needed in
|
|
|