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..7e2ebeb5328fc8b8e318364e56e19f28b8bcc6f8 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,9 +43,65 @@
 #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 {
 
+ImageBitmapLoader::ImageBitmapLoader(EventTarget* eventTarget, PassRefPtr<ScriptPromiseResolver> resolver, IntRect* cropRect)
+    : m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
+    , m_eventTarget(eventTarget)
+    , m_scriptState(ScriptState::current())
+    , m_resolver(resolver)
+    , m_cropRect(cropRect)
+{
+}
+
+void ImageBitmapLoader::start(Blob* blob)
+{
+    m_loader.start(m_eventTarget->scriptExecutionContext(), *blob);
+}
+
+void ImageBitmapLoader::didFinishLoading()
+{
+    ScriptScope scope(m_scriptState);
+    RefPtr<ImageBitmap> imageBitmap;
+    if (!m_loader.arrayBufferResult()) {
+        m_resolver->reject(imageBitmap.release());
+        return;
+    }
+    RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create((char*)m_loader.arrayBufferResult()->data(), m_loader.arrayBufferResult()->byteLength());
+
+    ImageSource* source = new ImageSource();
+    source->setData(sharedBuffer.get(), true);
+    RefPtr<NativeImageSkia> imageSkia = source->createFrameAtIndex(0);
+    if (!imageSkia) {
+        m_resolver->reject(imageBitmap.release());
+        return;
+    }
+    RefPtr<Image> image = BitmapImage::create(imageSkia);
+
+    if (!m_cropRect)
+        m_cropRect = new IntRect(image->rect());
+    if (!m_cropRect->width() || !m_cropRect->height()) {
+        m_resolver->reject(imageBitmap.release());
+        return;
+    }
+
+    imageBitmap = ImageBitmap::create(image.get(), *m_cropRect);
+    m_resolver->fulfill(imageBitmap.release());
+    m_eventTarget->toDOMWindow()->finishedLoading(this);
+}
+
+void ImageBitmapLoader::didFail(FileError::ErrorCode)
+{
+    ScriptScope scope(m_scriptState);
+    RefPtr<ImageBitmap> imageBitmap;
+    m_resolver->reject(imageBitmap.release());
+}
+
 namespace ImageBitmapFactories {
 
 static LayoutSize sizeFor(HTMLImageElement* image)
@@ -61,12 +118,11 @@ 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();
 }
@@ -105,7 +161,7 @@ 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)
@@ -145,7 +201,7 @@ 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)
@@ -178,7 +234,50 @@ 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 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());
+    ImageBitmapLoader* loader = new ImageBitmapLoader(eventTarget, resolver, 0);

[Justin Novosad, 2013/08/07 19:35:12]

AFAICT, we you are leaking the loader here.

+
+    // FIXME: the Promise should hold a reference to the ImageBitmapLoader, instead of the DOMWindow.
+    // This requires that a Promise object is returned from createImageBitmap methods, instead of a ScriptObject.
+    eventTarget->toDOMWindow()->loadBlobAsync(loader, blob);
+
+    return resolver->promise();
+}
+
+ScriptObject 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);
+    ImageBitmapLoader* loader = new ImageBitmapLoader(eventTarget, resolver, cropRect);
+
+    // FIXME: the Promise should hold a reference to the ImageBitmapLoader, instead of the DOMWindow.
+    // This requires that a Promise object is returned from createImageBitmap methods, instead of a ScriptObject.
+    eventTarget->toDOMWindow()->loadBlobAsync(loader, blob);
+
+    return resolver->promise();
 }
 
 ScriptObject createImageBitmap(EventTarget* eventTarget, ImageData* data, ExceptionState& es)
@@ -197,7 +296,7 @@ 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)
@@ -216,7 +315,7 @@ 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)));
 }
 
 } // namespace ImageBitmapFactories