| Index: Source/modules/imagebitmap/ImageBitmapFactories.cpp
|
| diff --git a/Source/modules/imagebitmap/ImageBitmapFactories.cpp b/Source/modules/imagebitmap/ImageBitmapFactories.cpp
|
| index 7a3d6083f80c28b166172cf2e4bed728502cf08e..06646b5abfbca5092d3b5eaaaa0a5c3687758b40 100644
|
| --- a/Source/modules/imagebitmap/ImageBitmapFactories.cpp
|
| +++ b/Source/modules/imagebitmap/ImageBitmapFactories.cpp
|
| @@ -186,7 +186,7 @@ ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState,
|
|
|
| ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState, EventTarget& eventTarget, Blob* blob, ExceptionState& exceptionState)
|
| {
|
| - RefPtrWillBeRawPtr<ImageBitmapLoader> loader = ImageBitmapFactories::ImageBitmapLoader::create(from(eventTarget), eventTarget.executionContext(), IntRect());
|
| + RefPtrWillBeRawPtr<ImageBitmapLoader> loader = ImageBitmapFactories::ImageBitmapLoader::create(from(eventTarget), IntRect(), scriptState);
|
| ScriptPromise promise = loader->promise();
|
| from(eventTarget).addLoader(loader);
|
| loader->loadBlobAsync(eventTarget.executionContext(), blob);
|
| @@ -199,7 +199,7 @@ ScriptPromise ImageBitmapFactories::createImageBitmap(ScriptState* scriptState,
|
| exceptionState.throwDOMException(IndexSizeError, String::format("The source %s provided is 0.", sw ? "height" : "width"));
|
| return ScriptPromise();
|
| }
|
| - RefPtrWillBeRawPtr<ImageBitmapLoader> loader = ImageBitmapFactories::ImageBitmapLoader::create(from(eventTarget), eventTarget.executionContext(), IntRect(sx, sy, sw, sh));
|
| + RefPtrWillBeRawPtr<ImageBitmapLoader> loader = ImageBitmapFactories::ImageBitmapLoader::create(from(eventTarget), IntRect(sx, sy, sw, sh), scriptState);
|
| ScriptPromise promise = loader->promise();
|
| from(eventTarget).addLoader(loader);
|
| loader->loadBlobAsync(eventTarget.executionContext(), blob);
|
| @@ -272,10 +272,10 @@ void ImageBitmapFactories::didFinishLoading(ImageBitmapLoader* loader)
|
| m_pendingLoaders.remove(loader);
|
| }
|
|
|
| -ImageBitmapFactories::ImageBitmapLoader::ImageBitmapLoader(ImageBitmapFactories& factory, ExecutionContext* context, const IntRect& cropRect)
|
| +ImageBitmapFactories::ImageBitmapLoader::ImageBitmapLoader(ImageBitmapFactories& factory, const IntRect& cropRect, ScriptState* scriptState)
|
| : m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
|
| , m_factory(&factory)
|
| - , m_resolver(ScriptPromiseResolverWithContext::create(ScriptState::current(toIsolate(context))))
|
| + , m_resolver(ScriptPromiseResolverWithContext::create(scriptState))
|
| , m_cropRect(cropRect)
|
| {
|
| }
|
|
|