| Index: third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.h b/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| index 102232a3b496cb80c1571df51ed04b74005d27da..71aba7f19ff322fb2aca2d6352f73933316b6a1a 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| @@ -17,7 +17,6 @@
|
| #include "platform/graphics/StaticBitmapImage.h"
|
| #include "platform/heap/Handle.h"
|
| #include "wtf/PassRefPtr.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -42,14 +41,14 @@ public:
|
| static ImageBitmap* create(PassRefPtr<StaticBitmapImage>);
|
| static ImageBitmap* create(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());
|
| static ImageBitmap* create(WebExternalTextureMailbox&);
|
| - static PassRefPtr<SkImage> getSkImageFromDecoder(std::unique_ptr<ImageDecoder>);
|
| + static PassRefPtr<SkImage> getSkImageFromDecoder(PassOwnPtr<ImageDecoder>);
|
|
|
| // Type and helper function required by CallbackPromiseAdapter:
|
| using WebType = sk_sp<SkImage>;
|
| static ImageBitmap* take(ScriptPromiseResolver*, sk_sp<SkImage>);
|
|
|
| StaticBitmapImage* bitmapImage() const { return (m_image) ? m_image.get() : nullptr; }
|
| - std::unique_ptr<uint8_t[]> copyBitmapData(AlphaDisposition alphaOp = DontPremultiplyAlpha);
|
| + PassOwnPtr<uint8_t[]> copyBitmapData(AlphaDisposition alphaOp = DontPremultiplyAlpha);
|
| unsigned long width() const;
|
| unsigned long height() const;
|
| IntSize size() const;
|
|
|