Blob creation methods for ImageBitmap.

Source/core/page/ImageBitmapFactories.cpp

Index: Source/core/page/ImageBitmapFactories.cpp
diff --git a/Source/core/page/ImageBitmapFactories.cpp b/Source/core/page/ImageBitmapFactories.cpp
index 9907616ef9b34709f3dfb5439f07264453fd690f..202255f974b84142e59221b8f5d03967f168660c 100644
--- a/Source/core/page/ImageBitmapFactories.cpp
+++ b/Source/core/page/ImageBitmapFactories.cpp
@@ -34,7 +34,8 @@
 #include "RuntimeEnabledFeatures.h"
 #include "V8ImageBitmap.h"
 #include "bindings/v8/ExceptionState.h"
-#include "core/dom/ExceptionCode.h"
+#include "bindings/v8/ScriptScope.h"
+#include "bindings/v8/ScriptState.h"
 #include "core/html/HTMLCanvasElement.h"
 #include "core/html/HTMLImageElement.h"
 #include "core/html/HTMLVideoElement.h"
@@ -42,11 +43,13 @@
 #include "core/html/canvas/CanvasRenderingContext2D.h"
 #include "core/page/DOMWindow.h"
 #include "core/page/ImageBitmap.h"
+#include "core/platform/SharedBuffer.h"
+#include "core/platform/graphics/BitmapImage.h"
+#include "core/platform/graphics/ImageSource.h"
+#include "core/platform/graphics/skia/NativeImageSkia.h"
 
 namespace WebCore {
 
-namespace ImageBitmapFactories {
-
 static LayoutSize sizeFor(HTMLImageElement* image)
 {
     if (CachedImage* cachedImage = image->cachedImage())
@@ -61,23 +64,22 @@ static IntSize sizeFor(HTMLVideoElement* video)
     return IntSize();
 }
 
-static ScriptObject resolveImageBitmap(PassRefPtr<ImageBitmap> imageBitmap)
+static ScriptObject fulfillImageBitmap(ScriptExecutionContext* context, PassRefPtr<ImageBitmap> imageBitmap)
 {
     // Promises must be enabled.
     ASSERT(RuntimeEnabledFeatures::promiseEnabled());
-
-    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create();
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(context);
     resolver->fulfill(imageBitmap);
     return resolver->promise();
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, ExceptionState& es)
 {
     LayoutSize s = sizeFor(image);
     return createImageBitmap(eventTarget, image, 0, 0, s.width(), s.height(), es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image, int sx, int sy, int sw, int sh, ExceptionState& es)
 {
     if (!image) {
         es.throwTypeError();
@@ -105,16 +107,16 @@ ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLImageElement* image
         return ScriptObject();
     }
     // FIXME: make ImageBitmap creation asynchronous crbug.com/258082
-    return resolveImageBitmap(ImageBitmap::create(image, IntRect(sx, sy, sw, sh)));
+    return fulfillImageBitmap(eventTarget->scriptExecutionContext(), ImageBitmap::create(image, IntRect(sx, sy, sw, sh)));
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, ExceptionState& es)
 {
     IntSize s = sizeFor(video);
     return createImageBitmap(eventTarget, video, 0, 0, s.width(), s.height(), es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video, int sx, int sy, int sw, int sh, ExceptionState& es)
 {
     if (!video) {
         es.throwTypeError();
@@ -145,25 +147,25 @@ ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLVideoElement* video
         return ScriptObject();
     }
     // FIXME: make ImageBitmap creation asynchronous crbug.com/258082
-    return resolveImageBitmap(ImageBitmap::create(video, IntRect(sx, sy, sw, sh)));
+    return fulfillImageBitmap(eventTarget->scriptExecutionContext(), ImageBitmap::create(video, IntRect(sx, sy, sw, sh)));
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, ExceptionState& es)
 {
     return createImageBitmap(eventTarget, context->canvas(), es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, CanvasRenderingContext2D* context, int sx, int sy, int sw, int sh, ExceptionState& es)
 {
     return createImageBitmap(eventTarget, context->canvas(), sx, sy, sw, sh, es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, ExceptionState& es)
 {
     return createImageBitmap(eventTarget, canvas, 0, 0, canvas->width(), canvas->height(), es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canvas, int sx, int sy, int sw, int sh, ExceptionState& es)
 {
     if (!canvas) {
         es.throwTypeError();
@@ -178,15 +180,51 @@ ScriptObject createImageBitmap(EventTarget* eventTarget, HTMLCanvasElement* canv
         return ScriptObject();
     }
     // FIXME: make ImageBitmap creation asynchronous crbug.com/258082
-    return resolveImageBitmap(ImageBitmap::create(canvas, IntRect(sx, sy, sw, sh)));
+    return fulfillImageBitmap(eventTarget->scriptExecutionContext(), ImageBitmap::create(canvas, IntRect(sx, sy, sw, sh)));
+}
+
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, Blob* blob, ExceptionState& es)
+{
+    // Promises must be enabled.
+    ASSERT(RuntimeEnabledFeatures::promiseEnabled());
+
+    if (!blob) {
+        es.throwDOMException(TypeError);
+        return ScriptObject();
+    }
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(eventTarget->scriptExecutionContext());
+    RefPtr<ImageBitmapLoader> loader = ImageBitmapFactories::ImageBitmapLoader::create(eventTarget->toDOMWindow(), resolver, 0);
+    eventTarget->toDOMWindow()->didStartLoading(loader);
+    loader->loadBlobAsync(eventTarget->scriptExecutionContext(), blob);
+    return resolver->promise();
+}
+
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, Blob* blob, int sx, int sy, int sw, int sh, ExceptionState& es)
+{
+    // Promises must be enabled.
+    ASSERT(RuntimeEnabledFeatures::promiseEnabled());
+
+    if (!blob) {
+        es.throwDOMException(TypeError);
+        return ScriptObject();
+    }
+    if (!sw || !sh) {
+        es.throwDOMException(IndexSizeError);
+        return ScriptObject();
+    }
+    RefPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(eventTarget->scriptExecutionContext());
+    IntRect* cropRect = new IntRect(sx, sy, sw, sh);
+    RefPtr<ImageBitmapLoader> loader = ImageBitmapFactories::ImageBitmapLoader::create(eventTarget->toDOMWindow(), resolver, cropRect);
+    loader->loadBlobAsync(eventTarget->scriptExecutionContext(), blob);
+    return resolver->promise();
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, ImageData* data, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageData* data, ExceptionState& es)
 {
     return createImageBitmap(eventTarget, data, 0, 0, data->width(), data->height(), es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, ImageData* data, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageData* data, int sx, int sy, int sw, int sh, ExceptionState& es)
 {
     if (!data) {
         es.throwTypeError();
@@ -197,15 +235,15 @@ ScriptObject createImageBitmap(EventTarget* eventTarget, ImageData* data, int sx
         return ScriptObject();
     }
     // FIXME: make ImageBitmap creation asynchronous crbug.com/258082
-    return resolveImageBitmap(ImageBitmap::create(data, IntRect(sx, sy, sw, sh)));
+    return fulfillImageBitmap(eventTarget->scriptExecutionContext(), ImageBitmap::create(data, IntRect(sx, sy, sw, sh)));
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, ExceptionState& es)
 {
     return createImageBitmap(eventTarget, bitmap, 0, 0, bitmap->width(), bitmap->height(), es);
 }
 
-ScriptObject createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, int sx, int sy, int sw, int sh, ExceptionState& es)
+ScriptObject ImageBitmapFactories::createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, int sx, int sy, int sw, int sh, ExceptionState& es)
 {
     if (!bitmap) {
         es.throwTypeError();
@@ -216,8 +254,76 @@ ScriptObject createImageBitmap(EventTarget* eventTarget, ImageBitmap* bitmap, in
         return ScriptObject();
     }
     // FIXME: make ImageBitmap creation asynchronous crbug.com/258082
-    return resolveImageBitmap(ImageBitmap::create(bitmap, IntRect(sx, sy, sw, sh)));
+    return fulfillImageBitmap(eventTarget->scriptExecutionContext(), ImageBitmap::create(bitmap, IntRect(sx, sy, sw, sh)));
+}
+
+void ImageBitmapFactories::didStartLoading(PassRefPtr<ImageBitmapLoader> loader)
+{
+    m_pendingLoaders.add(loader);
+}
+
+void ImageBitmapFactories::didFinishLoading(PassRefPtr<ImageBitmapLoader> loader)
+{
+    ASSERT(m_pendingLoaders.contains(loader));
+    m_pendingLoaders.remove(loader);
+}
+
+ImageBitmapFactories::ImageBitmapLoader::ImageBitmapLoader(ImageBitmapFactories* factory, PassRefPtr<ScriptPromiseResolver> resolver, IntRect* cropRect)
+    : m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
+    , m_scriptState(ScriptState::current())
+    , m_factory(factory)
+    , m_resolver(resolver)
+    , m_cropRect(cropRect)
+{
+}
+
+void ImageBitmapFactories::ImageBitmapLoader::loadBlobAsync(ScriptExecutionContext* context, Blob* blob)
+{
+    m_factory->didStartLoading(this);
+    m_loader.start(context, *blob);
+}
+
+void ImageBitmapFactories::ImageBitmapLoader::rejectPromise()
+{
+    ScriptScope scope(m_scriptState);
+    RefPtr<ImageBitmap> nullImageBitmap;

[do-not-use, 2013/08/12 15:15:59]

It looks like we don't really need this variable. Can't we simply pass 0 (or
nullptr) to the reject() call below?

+    m_resolver->reject(nullImageBitmap.release());
+    m_factory->didFinishLoading(this);
+}
+
+void ImageBitmapFactories::ImageBitmapLoader::didFinishLoading()
+{
+    if (!m_loader.arrayBufferResult()) {
+        rejectPromise();
+        return;
+    }
+    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create((char*)m_loader.arrayBufferResult()->data(), m_loader.arrayBufferResult()->byteLength());
+
+    OwnPtr<ImageSource> source = adoptPtr(new ImageSource());
+    source->setData(sharedBuffer.get(), true);
+    RefPtr<NativeImageSkia> imageSkia = source->createFrameAtIndex(0);
+    if (!imageSkia) {
+        rejectPromise();
+        return;
+    }
+    RefPtr<Image> image = BitmapImage::create(imageSkia);
+
+    if (!m_cropRect)
+        m_cropRect = new IntRect(image->rect());
+    if (!m_cropRect->width() || !m_cropRect->height()) {
+        rejectPromise();
+        return;
+    }
+
+    RefPtr<ImageBitmap> imageBitmap = ImageBitmap::create(image.get(), *m_cropRect);
+    ScriptScope scope(m_scriptState);
+    m_resolver->fulfill(imageBitmap.release());
+    m_factory->didFinishLoading(this);
+}
+
+void ImageBitmapFactories::ImageBitmapLoader::didFail(FileError::ErrorCode)
+{
+    rejectPromise();
 }
 
-} // namespace ImageBitmapFactories
 } // namespace WebCore