| Index: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h
|
| diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h
|
| index 3b309fba78f6260f7ced82d04759291ba232c07a..de3f72ad4d323e785776e487e9a05e48cf4936d5 100644
|
| --- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h
|
| +++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.h
|
| @@ -61,8 +61,8 @@ class ImageBitmapFactories final : public GarbageCollectedFinalized<ImageBitmapF
|
| public:
|
| static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, const ImageBitmapSourceUnion&, const ImageBitmapOptions&, ExceptionState&);
|
| static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, const ImageBitmapSourceUnion&, int sx, int sy, int sw, int sh, const ImageBitmapOptions&, ExceptionState&);
|
| - static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageBitmapSource*, int sx, int sy, int sw, int sh, const ImageBitmapOptions&, ExceptionState&);
|
| - static ScriptPromise createImageBitmapFromBlob(ScriptState*, EventTarget&, ImageBitmapSource*, const IntRect&, const ImageBitmapOptions&);
|
| + static ScriptPromise createImageBitmap(ScriptState*, EventTarget&, ImageBitmapSource*, Optional<IntRect> cropRect, const ImageBitmapOptions&, ExceptionState&);
|
| + static ScriptPromise createImageBitmapFromBlob(ScriptState*, EventTarget&, ImageBitmapSource*, Optional<IntRect> cropRect, const ImageBitmapOptions&, ExceptionState&);
|
|
|
| virtual ~ImageBitmapFactories() { }
|
|
|
| @@ -74,7 +74,7 @@ protected:
|
| private:
|
| class ImageBitmapLoader final : public GarbageCollectedFinalized<ImageBitmapLoader>, public FileReaderLoaderClient {
|
| public:
|
| - static ImageBitmapLoader* create(ImageBitmapFactories& factory, const IntRect& cropRect, const ImageBitmapOptions& options, ScriptState* scriptState)
|
| + static ImageBitmapLoader* create(ImageBitmapFactories& factory, Optional<IntRect> cropRect, const ImageBitmapOptions& options, ScriptState* scriptState)
|
| {
|
| return new ImageBitmapLoader(factory, cropRect, scriptState, options);
|
| }
|
| @@ -87,7 +87,7 @@ private:
|
| ~ImageBitmapLoader() override { }
|
|
|
| private:
|
| - ImageBitmapLoader(ImageBitmapFactories&, const IntRect&, ScriptState*, const ImageBitmapOptions&);
|
| + ImageBitmapLoader(ImageBitmapFactories&, Optional<IntRect> cropRect, ScriptState*, const ImageBitmapOptions&);
|
|
|
| void rejectPromise();
|
|
|
| @@ -104,7 +104,7 @@ private:
|
| FileReaderLoader m_loader;
|
| Member<ImageBitmapFactories> m_factory;
|
| Member<ScriptPromiseResolver> m_resolver;
|
| - IntRect m_cropRect;
|
| + Optional<IntRect> m_cropRect;
|
| ImageBitmapOptions m_options;
|
| };
|
|
|
|
|