diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-18 16:31:30 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-18 16:31:30 +0200 |
| commit | abb2a2a1d4fd755510d71b7a6985e5076ed8c2ce (patch) | |
| tree | 15953e11c470eea03182a175f83d7e67062e0458 /dom/workers/ServiceWorkerClients.cpp | |
| parent | 89f2f76274916083a1533e8ead8374e12ccfa4a3 (diff) | |
| parent | 0384dc34be59a77d74cc9a1f8e754694b95dd13a (diff) | |
| download | UXP-abb2a2a1d4fd755510d71b7a6985e5076ed8c2ce.tar UXP-abb2a2a1d4fd755510d71b7a6985e5076ed8c2ce.tar.gz UXP-abb2a2a1d4fd755510d71b7a6985e5076ed8c2ce.tar.lz UXP-abb2a2a1d4fd755510d71b7a6985e5076ed8c2ce.tar.xz UXP-abb2a2a1d4fd755510d71b7a6985e5076ed8c2ce.zip | |
Merge branch 'worker-fix'
Diffstat (limited to 'dom/workers/ServiceWorkerClients.cpp')
| -rw-r--r-- | dom/workers/ServiceWorkerClients.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dom/workers/ServiceWorkerClients.cpp b/dom/workers/ServiceWorkerClients.cpp index 11f864443..38f49e355 100644 --- a/dom/workers/ServiceWorkerClients.cpp +++ b/dom/workers/ServiceWorkerClients.cpp @@ -753,7 +753,7 @@ ServiceWorkerClients::Get(const nsAString& aClientId, ErrorResult& aRv) RefPtr<GetRunnable> r = new GetRunnable(promiseProxy, aClientId); - MOZ_ALWAYS_SUCCEEDS(workerPrivate->DispatchToMainThread(r.forget())); + MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(r)); return promise.forget(); } @@ -789,7 +789,7 @@ ServiceWorkerClients::MatchAll(const ClientQueryOptions& aOptions, new MatchAllRunnable(promiseProxy, NS_ConvertUTF16toUTF8(scope), aOptions.mIncludeUncontrolled); - MOZ_ALWAYS_SUCCEEDS(workerPrivate->DispatchToMainThread(r.forget())); + MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(r)); return promise.forget(); } @@ -830,7 +830,7 @@ ServiceWorkerClients::OpenWindow(const nsAString& aUrl, RefPtr<OpenWindowRunnable> r = new OpenWindowRunnable(promiseProxy, aUrl, scope); - MOZ_ALWAYS_SUCCEEDS(workerPrivate->DispatchToMainThread(r.forget())); + MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(r)); return promise.forget(); } @@ -859,6 +859,6 @@ ServiceWorkerClients::Claim(ErrorResult& aRv) RefPtr<ClaimRunnable> runnable = new ClaimRunnable(promiseProxy, NS_ConvertUTF16toUTF8(scope)); - MOZ_ALWAYS_SUCCEEDS(workerPrivate->DispatchToMainThread(runnable.forget())); + MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(runnable)); return promise.forget(); } |