| Index: third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| index d29c87d16b399dd5fe5b84de083a39826672f309..3f7d29e4ddd84be6e9303ae3406559741c5f3dad 100644
|
| --- a/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| +++ b/third_party/WebKit/Source/core/html/canvas/CanvasAsyncBlobCreator.cpp
|
| @@ -5,7 +5,7 @@
|
| #include "CanvasAsyncBlobCreator.h"
|
|
|
| #include "core/dom/ContextLifecycleObserver.h"
|
| -#include "core/fileapi/File.h"
|
| +#include "core/fileapi/Blob.h"
|
| #include "platform/Task.h"
|
| #include "platform/ThreadSafeFunctional.h"
|
| #include "platform/graphics/ImageBuffer.h"
|
| @@ -69,14 +69,14 @@ private:
|
| CanvasAsyncBlobCreator* m_asyncBlobCreator;
|
| };
|
|
|
| -PassRefPtr<CanvasAsyncBlobCreator> CanvasAsyncBlobCreator::create(PassRefPtr<DOMUint8ClampedArray> unpremultipliedRGBAImageData, const String& mimeType, const IntSize& size, FileCallback* callback, ExecutionContext* executionContext)
|
| +PassRefPtr<CanvasAsyncBlobCreator> CanvasAsyncBlobCreator::create(PassRefPtr<DOMUint8ClampedArray> unpremultipliedRGBAImageData, const String& mimeType, const IntSize& size, BlobCallback* callback, ExecutionContext* executionContext)
|
| {
|
| RefPtr<CanvasAsyncBlobCreator> asyncBlobCreator = adoptRef(new CanvasAsyncBlobCreator(unpremultipliedRGBAImageData, mimeType, size, callback));
|
| asyncBlobCreator->createContextObserver(executionContext);
|
| return asyncBlobCreator.release();
|
| }
|
|
|
| -CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(PassRefPtr<DOMUint8ClampedArray> data, const String& mimeType, const IntSize& size, FileCallback* callback)
|
| +CanvasAsyncBlobCreator::CanvasAsyncBlobCreator(PassRefPtr<DOMUint8ClampedArray> data, const String& mimeType, const IntSize& size, BlobCallback* callback)
|
| : m_cancelled(false)
|
| , m_data(data)
|
| , m_size(size)
|
| @@ -121,7 +121,7 @@ void CanvasAsyncBlobCreator::initiatePngEncoding(double deadlineSeconds)
|
| {
|
| m_encoderState = PNGImageEncoderState::create(m_size, m_encodedImage.get());
|
| if (!m_encoderState) {
|
| - Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&FileCallback::handleEvent, m_callback, nullptr));
|
| + Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&BlobCallback::handleEvent, m_callback, nullptr));
|
| m_selfRef.clear();
|
| return;
|
| }
|
| @@ -158,8 +158,8 @@ void CanvasAsyncBlobCreator::idleEncodeRowsPng(double deadlineSeconds)
|
|
|
| void CanvasAsyncBlobCreator::createBlobAndCall()
|
| {
|
| - File* resultBlob = File::create(m_encodedImage->data(), m_encodedImage->size(), m_mimeType);
|
| - Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&FileCallback::handleEvent, m_callback, resultBlob));
|
| + Blob* resultBlob = Blob::create(m_encodedImage->data(), m_encodedImage->size(), m_mimeType);
|
| + Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&BlobCallback::handleEvent, m_callback, resultBlob));
|
| clearSelfReference(); // self-destruct once job is done.
|
| }
|
|
|
| @@ -253,7 +253,7 @@ void CanvasAsyncBlobCreator::scheduleCreateBlobAndCallOnMainThread()
|
|
|
| void CanvasAsyncBlobCreator::scheduleCreateNullptrAndCallOnMainThread()
|
| {
|
| - Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&FileCallback::handleEvent, m_callback, nullptr));
|
| + Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&BlobCallback::handleEvent, m_callback, nullptr));
|
| Platform::current()->mainThread()->taskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&CanvasAsyncBlobCreator::clearSelfReference, AllowCrossThreadAccess(this)));
|
| }
|
|
|
|
|