| Index: third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.h
|
| diff --git a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.h b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.h
|
| index 845bfcb0d6089ee864819cb0971c6027a7ad1c15..0dc93f1a5dcad58a6440307fac269e94a7919d90 100644
|
| --- a/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.h
|
| +++ b/third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoder.h
|
| @@ -27,7 +27,6 @@
|
| #define JPEGImageDecoder_h
|
|
|
| #include "platform/image-decoders/ImageDecoder.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -48,7 +47,7 @@ public:
|
| size_t decodedYUVWidthBytes(int component) const override;
|
| bool canDecodeToYUV() override;
|
| bool decodeToYUV() override;
|
| - void setImagePlanes(std::unique_ptr<ImagePlanes>) override;
|
| + void setImagePlanes(PassOwnPtr<ImagePlanes>) override;
|
| bool hasImagePlanes() const { return m_imagePlanes.get(); }
|
|
|
| bool outputScanlines();
|
| @@ -68,8 +67,8 @@ private:
|
| // data coming, sets the "decode failure" flag.
|
| void decode(bool onlySize);
|
|
|
| - std::unique_ptr<JPEGImageReader> m_reader;
|
| - std::unique_ptr<ImagePlanes> m_imagePlanes;
|
| + OwnPtr<JPEGImageReader> m_reader;
|
| + OwnPtr<ImagePlanes> m_imagePlanes;
|
| IntSize m_decodedSize;
|
| };
|
|
|
|
|