summaryrefslogtreecommitdiffstats
path: root/dom/workers
diff options
context:
space:
mode:
authorBoris Zbarsky <bzbarsky@mit.edu>2018-04-12 23:26:44 -0400
committerwolfbeast <mcwerewolf@gmail.com>2018-04-19 12:05:25 +0200
commit3b4a81565780b724841c2950513416f14ab95ff3 (patch)
tree4a79368d1e44d3fa573937edc85256a865e71ad4 /dom/workers
parentddbe089a628df4b3f818211aacf3b776dfa31dff (diff)
downloadUXP-3b4a81565780b724841c2950513416f14ab95ff3.tar
UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar.gz
UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar.lz
UXP-3b4a81565780b724841c2950513416f14ab95ff3.tar.xz
UXP-3b4a81565780b724841c2950513416f14ab95ff3.zip
Bug 1453339 - Make it harder to mess up Promise::All. r=peterv, a=RyanVM
MozReview-Commit-ID: UO4wssYHj7
Diffstat (limited to 'dom/workers')
-rw-r--r--dom/workers/ServiceWorkerEvents.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/dom/workers/ServiceWorkerEvents.cpp b/dom/workers/ServiceWorkerEvents.cpp
index 09b09a24b..780b2f5f8 100644
--- a/dom/workers/ServiceWorkerEvents.cpp
+++ b/dom/workers/ServiceWorkerEvents.cpp
@@ -948,10 +948,8 @@ ExtendableEvent::GetPromise()
}
JSContext* cx = jsapi.cx();
- GlobalObject global(cx, globalObj->GetGlobalJSObject());
-
ErrorResult result;
- RefPtr<Promise> p = Promise::All(global, Move(mPromises), result);
+ RefPtr<Promise> p = Promise::All(cx, Move(mPromises), result);
if (NS_WARN_IF(result.MaybeSetPendingException(cx))) {
return nullptr;
}