diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:08:25 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-19 12:08:25 +0200 |
| commit | d7df65954a585e97ccee21fa9cb50cb116efddcc (patch) | |
| tree | 9ed9a1f46f5d2e8373dcab553bad55b54bb8103b /dom/workers/ServiceWorkerEvents.cpp | |
| parent | ba71cc45fef6dfaecef8f5edf65ce1f1ff457624 (diff) | |
| parent | 9135a11e8c8f0837738fd976b28d36a53fd1de27 (diff) | |
| download | UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.gz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.lz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.tar.xz UXP-d7df65954a585e97ccee21fa9cb50cb116efddcc.zip | |
Merge branch 'ported-upstream'
Diffstat (limited to 'dom/workers/ServiceWorkerEvents.cpp')
| -rw-r--r-- | dom/workers/ServiceWorkerEvents.cpp | 4 |
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; } |