diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-07-18 08:24:24 +0200 |
| commit | fc61780b35af913801d72086456f493f63197da6 (patch) | |
| tree | f85891288a7bd988da9f0f15ae64e5c63f00d493 /dom/canvas/ImageBitmap.cpp | |
| parent | 69f7f9e5f1475891ce11cc4f431692f965b0cd30 (diff) | |
| parent | 50d3e596bbe89c95615f96eb71f6bc5be737a1db (diff) | |
| download | UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.gz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.lz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.tar.xz UXP-9ccb235f04529c1ec345d87dad6521cb567d20bb.zip | |
Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18
# Conflicts:
# browser/app/profile/firefox.js
# browser/components/preferences/jar.mn
Diffstat (limited to 'dom/canvas/ImageBitmap.cpp')
| -rw-r--r-- | dom/canvas/ImageBitmap.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp index 6588e0aa3..e45cdfc6f 100644 --- a/dom/canvas/ImageBitmap.cpp +++ b/dom/canvas/ImageBitmap.cpp @@ -950,7 +950,7 @@ ImageBitmap::CreateInternal(nsIGlobalObject* aGlobal, ImageData& aImageData, imageSize, aCropRect, getter_AddRefs(data)); - task->Dispatch(aRv); + task->Dispatch(Terminating, aRv); } if (NS_WARN_IF(!data)) { @@ -1377,10 +1377,10 @@ private: RefPtr<DecodeBlobInMainThreadSyncTask> task = new DecodeBlobInMainThreadSyncTask(mWorkerPrivate, *mBlob, mCropRect, getter_AddRefs(data), sourceSize); - task->Dispatch(rv); // This is a synchronous call. + task->Dispatch(Terminating, rv); // This is a synchronous call. + // In case the worker is terminating, this rejection can be handled. if (NS_WARN_IF(rv.Failed())) { - // XXXbz does this really make sense if we're shutting down? Ah, well. mPromise->MaybeReject(rv); return nullptr; } @@ -2104,7 +2104,10 @@ ImageBitmap::Create(nsIGlobalObject* aGlobal, aFormat, aLayout, getter_AddRefs(data)); - task->Dispatch(aRv); + task->Dispatch(Terminating, aRv); + if (aRv.Failed()) { + return promise.forget(); + } } if (NS_WARN_IF(!data)) { |