From b2cbc7b654d51543d9b5e75f0397bdc8c8b5fc5b Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@gmail.com>
Date: Sun, 16 Sep 2018 10:26:02 +0200
Subject: Stop using the worker MainThreadTaskQueue from dom/fetch.

---
 dom/fetch/Fetch.cpp         |  2 +-
 dom/fetch/FetchConsumer.cpp | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'dom/fetch')

diff --git a/dom/fetch/Fetch.cpp b/dom/fetch/Fetch.cpp
index e2c139426..f944352e3 100644
--- a/dom/fetch/Fetch.cpp
+++ b/dom/fetch/Fetch.cpp
@@ -260,7 +260,7 @@ FetchRequest(nsIGlobalObject* aGlobal, const RequestOrUSVString& aInput,
     }
 
     RefPtr<MainThreadFetchRunnable> run = new MainThreadFetchRunnable(resolver, r);
-    worker->DispatchToMainThread(run.forget());
+    MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(run));
   }
 
   return p.forget();
diff --git a/dom/fetch/FetchConsumer.cpp b/dom/fetch/FetchConsumer.cpp
index 42dfcbaba..e82e5ec51 100644
--- a/dom/fetch/FetchConsumer.cpp
+++ b/dom/fetch/FetchConsumer.cpp
@@ -339,11 +339,7 @@ FetchBodyConsumer<Derived>::Create(nsIGlobalObject* aGlobal,
 
   nsCOMPtr<nsIRunnable> r = new BeginConsumeBodyRunnable<Derived>(consumer);
 
-  if (workerPrivate) {
-    aRv = workerPrivate->DispatchToMainThread(r.forget());
-  } else {
-    aRv = NS_DispatchToMainThread(r.forget());
-  }
+  aRv = NS_DispatchToMainThread(r.forget());
 
   if (NS_WARN_IF(aRv.Failed())) {
     return nullptr;
@@ -655,9 +651,7 @@ FetchBodyConsumer<Derived>::ShutDownMainThreadConsuming()
     nsCOMPtr<nsIRunnable> r = NS_NewRunnableFunction(
       [self] () { self->ShutDownMainThreadConsuming(); });
 
-    WorkerPrivate* workerPrivate = GetCurrentThreadWorkerPrivate();
-    MOZ_ASSERT(workerPrivate);
-    workerPrivate->DispatchToMainThread(r.forget());
+    MOZ_ALWAYS_SUCCEEDS(NS_DispatchToMainThread(r.forget()));
     return;
   }
 
-- 
cgit v1.2.3