Index: Source/modules/imagebitmap/ImageBitmapFactories.h |
diff --git a/Source/modules/imagebitmap/ImageBitmapFactories.h b/Source/modules/imagebitmap/ImageBitmapFactories.h |
index 36747c2dab6cf74e425987910c3faf3a0b6c00b1..deba3ae9aad22d18a89e9b7bfeb9e7cddd208bf2 100644 |
--- a/Source/modules/imagebitmap/ImageBitmapFactories.h |
+++ b/Source/modules/imagebitmap/ImageBitmapFactories.h |
@@ -31,6 +31,7 @@ |
#ifndef ImageBitmapFactories_h |
#define ImageBitmapFactories_h |
+#include "bindings/v8/ScriptPromise.h" |
#include "bindings/v8/ScriptPromiseResolver.h" |
#include "bindings/v8/ScriptState.h" |
#include "core/fileapi/FileReaderLoader.h" |
@@ -58,20 +59,20 @@ class ImageBitmapFactories : public Supplement<DOMWindow>, public Supplement<Scr |
class ImageBitmapLoader; |
public: |
- static ScriptObject createImageBitmap(EventTarget*, HTMLImageElement*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, HTMLImageElement*, int sx, int sy, int sw, int sh, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, HTMLVideoElement*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, HTMLVideoElement*, int sx, int sy, int sw, int sh, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, CanvasRenderingContext2D*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, CanvasRenderingContext2D*, int sx, int sy, int sw, int sh, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, HTMLCanvasElement*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, HTMLCanvasElement*, int sx, int sy, int sw, int sh, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, Blob*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, Blob*, int sx, int sy, int sw, int sh, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, ImageData*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, ImageData*, int sx, int sy, int sw, int sh, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, ImageBitmap*, ExceptionState&); |
- static ScriptObject createImageBitmap(EventTarget*, ImageBitmap*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, HTMLImageElement*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, HTMLImageElement*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, HTMLVideoElement*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, HTMLVideoElement*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, CanvasRenderingContext2D*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, CanvasRenderingContext2D*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, HTMLCanvasElement*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, HTMLCanvasElement*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, Blob*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, Blob*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, ImageData*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, ImageData*, int sx, int sy, int sw, int sh, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, ImageBitmap*, ExceptionState&); |
+ static ScriptPromise createImageBitmap(EventTarget*, ImageBitmap*, int sx, int sy, int sw, int sh, ExceptionState&); |
void didFinishLoading(ImageBitmapLoader*); |
@@ -80,7 +81,7 @@ public: |
private: |
class ImageBitmapLoader : public RefCounted<ImageBitmapLoader>, public FileReaderLoaderClient { |
public: |
- static PassRefPtr<ImageBitmapLoader> create(ImageBitmapFactories* factory, PassRefPtr<ScriptPromiseResolver> resolver, const IntRect& cropRect) |
+ static PassRefPtr<ImageBitmapLoader> create(ImageBitmapFactories* factory, ScriptPromiseResolver resolver, const IntRect& cropRect) |
{ |
return adoptRef(new ImageBitmapLoader(factory, resolver, cropRect)); |
} |
@@ -90,7 +91,7 @@ private: |
~ImageBitmapLoader() { } |
private: |
- ImageBitmapLoader(ImageBitmapFactories*, PassRefPtr<ScriptPromiseResolver>, const IntRect&); |
+ ImageBitmapLoader(ImageBitmapFactories*, ScriptPromiseResolver, const IntRect&); |
void rejectPromise(); |
@@ -103,7 +104,7 @@ private: |
ScriptState* m_scriptState; |
FileReaderLoader m_loader; |
ImageBitmapFactories* m_factory; |
- RefPtr<ScriptPromiseResolver> m_resolver; |
+ ScriptPromiseResolver m_resolver; |
IntRect m_cropRect; |
}; |