| 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 1939fe0c6d43f07583a92b2eba6e8f8ecee4d232..b29cdd09f2a277a2cd00638b5917ee662dea8880 100644
|
| --- a/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| +++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h
|
| @@ -24,6 +24,7 @@ namespace blink {
|
| class HTMLCanvasElement;
|
| class HTMLVideoElement;
|
| class ImageData;
|
| +class ImageDecoder;
|
|
|
| enum AlphaDisposition {
|
| PremultiplyAlpha,
|
| @@ -40,6 +41,7 @@ public:
|
| static PassRefPtrWillBeRawPtr<ImageBitmap> create(ImageBitmap*, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());
|
| static PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>);
|
| static PassRefPtrWillBeRawPtr<ImageBitmap> create(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());
|
| + static PassRefPtr<SkImage> getSkImageFromDecoder(PassOwnPtr<ImageDecoder>);
|
|
|
| StaticBitmapImage* bitmapImage() const { return (m_image) ? m_image.get() : nullptr; }
|
| PassOwnPtr<uint8_t[]> copyBitmapData(AlphaDisposition alphaOp = DontPremultiplyAlpha);
|
|
|