Bug 1809753 - Part 4: Remove unnecessary GetMainThreadEventTarget, r=…

…mccr8 This method always returned GetMainThreadSerialEventTarget(). This patch switches all callers over to use that method instead. We can't easily switch all calls to be calls to NS_GetMainThread(), as there is no version of that method returning a bare nsIThread* instance. I didn't introduce one, as we may want to add a lock around mMainThread in the future, which would require removing nsThreadManager::GetMainThreadWeak. As this method only returns nsISerialEventTarget, it method could remain implemented, however, by returning a statically allocated fake event target which forwards dispatches (and QIs to nsIThread) to the real main thread. Differential Revision: https://phabricator.services.mozilla.com/D166608
dothq · Jan 16, 2023 · 9d6bb19 · 9d6bb19
1 parent 852d02e
commit 9d6bb19
Show file tree

Hide file tree

Showing 60 changed files with 97 additions and 102 deletions.
diff --git a/dom/base/ImageEncoder.cpp b/dom/base/ImageEncoder.cpp
@@ -52,7 +52,7 @@ class SurfaceHelper : public Runnable {
   }
 
   already_AddRefed<gfx::DataSourceSurface> GetDataSurfaceSafe() {
-    nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
+    nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
     MOZ_ASSERT(mainTarget);
     SyncRunnable::DispatchToThread(mainTarget, this, false);
 
@@ -90,7 +90,7 @@ class EncodingCompleteEvent final : public DiscardableRunnable {
     if (!NS_IsMainThread() && IsCurrentThreadRunningWorker()) {
       mCreationEventTarget = GetCurrentSerialEventTarget();
     } else {
-      mCreationEventTarget = GetMainThreadEventTarget();
+      mCreationEventTarget = GetMainThreadSerialEventTarget();
     }
   }
 

diff --git a/dom/base/InProcessBrowserChildMessageManager.cpp b/dom/base/InProcessBrowserChildMessageManager.cpp
@@ -183,7 +183,7 @@ Nullable<WindowProxyHolder> InProcessBrowserChildMessageManager::GetContent(
 
 already_AddRefed<nsIEventTarget>
 InProcessBrowserChildMessageManager::GetTabEventTarget() {
-  nsCOMPtr<nsIEventTarget> target = GetMainThreadEventTarget();
+  nsCOMPtr<nsIEventTarget> target = GetMainThreadSerialEventTarget();
   return target.forget();
 }
 

diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp
@@ -1977,7 +1977,7 @@ static bool DispatchToEventLoop(void* closure,
   // simply NS_DispatchToMainThread. Failure during shutdown is expected and
   // properly handled by the JS engine.
 
-  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
+  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
   if (!mainTarget) {
     return false;
   }

diff --git a/dom/fetch/FetchService.cpp b/dom/fetch/FetchService.cpp
@@ -161,13 +161,13 @@ RefPtr<FetchServicePromises> FetchService::FetchInstance::Fetch() {
 
   // Create a FetchDriver instance
   mFetchDriver = MakeRefPtr<FetchDriver>(
-      mRequest.clonePtr(),         // Fetch Request
-      mPrincipal,                  // Principal
-      mLoadGroup,                  // LoadGroup
-      GetMainThreadEventTarget(),  // MainThreadEventTarget
-      mCookieJarSettings,          // CookieJarSettings
-      mPerformanceStorage,         // PerformanceStorage
-      false                        // IsTrackingFetch
+      mRequest.clonePtr(),               // Fetch Request
+      mPrincipal,                        // Principal
+      mLoadGroup,                        // LoadGroup
+      GetMainThreadSerialEventTarget(),  // MainThreadEventTarget
+      mCookieJarSettings,                // CookieJarSettings
+      mPerformanceStorage,               // PerformanceStorage
+      false                              // IsTrackingFetch
   );
 
   // Call FetchDriver::Fetch to start fetching.

diff --git a/dom/file/MutableBlobStorage.cpp b/dom/file/MutableBlobStorage.cpp
@@ -288,7 +288,7 @@ MutableBlobStorage::MutableBlobStorage(MutableBlobStorageType aType,
   MOZ_ASSERT(NS_IsMainThread());
 
   if (!mEventTarget) {
-    mEventTarget = GetMainThreadEventTarget();
+    mEventTarget = GetMainThreadSerialEventTarget();
   }
 
   if (aMaxMemory == 0 && aType == eCouldBeInTemporaryFile) {

diff --git a/dom/file/MutableBlobStreamListener.cpp b/dom/file/MutableBlobStreamListener.cpp
@@ -23,7 +23,7 @@ MutableBlobStreamListener::MutableBlobStreamListener(
   MOZ_ASSERT(aCallback);
 
   if (!mEventTarget) {
-    mEventTarget = GetMainThreadEventTarget();
+    mEventTarget = GetMainThreadSerialEventTarget();
   }
 
   MOZ_ASSERT(mEventTarget);

diff --git a/dom/geolocation/Geolocation.cpp b/dom/geolocation/Geolocation.cpp
@@ -1017,7 +1017,7 @@ void Geolocation::GetCurrentPosition(PositionCallback& aCallback,
 static nsIEventTarget* MainThreadTarget(Geolocation* geo) {
   nsCOMPtr<nsPIDOMWindowInner> window = do_QueryReferent(geo->GetOwner());
   if (!window) {
-    return GetMainThreadEventTarget();
+    return GetMainThreadSerialEventTarget();
   }
   return nsGlobalWindowInner::Cast(window)->EventTargetFor(
       mozilla::TaskCategory::Other);

diff --git a/dom/media/VideoUtils.cpp b/dom/media/VideoUtils.cpp
@@ -827,7 +827,7 @@ nsresult SimpleTimer::Init(nsIRunnable* aTask, uint32_t aTimeoutMs,
   if (aTarget) {
     target = aTarget;
   } else {
-    target = GetMainThreadEventTarget();
+    target = GetMainThreadSerialEventTarget();
     if (!target) {
       return NS_ERROR_NOT_AVAILABLE;
     }

diff --git a/dom/media/eme/MediaKeys.cpp b/dom/media/eme/MediaKeys.cpp
@@ -158,7 +158,7 @@ void MediaKeys::OnInnerWindowDestroy() {
   // Don't call shutdown directly because (at time of writing) mProxy can
   // spin the event loop when it's shutdown. This can change the world state
   // in the middle of window destruction, which we do not want.
-  GetMainThreadEventTarget()->Dispatch(
+  GetMainThreadSerialEventTarget()->Dispatch(
       NewRunnableMethod("MediaKeys::Shutdown", this, &MediaKeys::Shutdown));
 }
 

diff --git a/dom/media/gtest/TestCDMStorage.cpp b/dom/media/gtest/TestCDMStorage.cpp
@@ -406,7 +406,7 @@ class CDMStorageTest {
           nsCString failureReason;
           self->mCDM
               ->Init(self->mCallback.get(), false, true,
-                     GetMainThreadEventTarget())
+                     GetMainThreadSerialEventTarget())
               ->Then(
                   thread, __func__,
                   [self, updates = std::move(updates)] {

diff --git a/dom/media/mediacapabilities/DecoderBenchmark.cpp b/dom/media/mediacapabilities/DecoderBenchmark.cpp
@@ -233,7 +233,7 @@ void DecoderBenchmark::CheckVersion(const nsACString& aDecoderName) {
   }
 
   DebugOnly<nsresult> rv =
-      GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+      GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
           "DecoderBenchmark::CheckVersion", [name, version]() {
             BenchmarkStorageChild::Instance()->SendCheckVersion(name, version);
           }));

diff --git a/dom/media/platforms/PDMFactory.cpp b/dom/media/platforms/PDMFactory.cpp
@@ -334,7 +334,7 @@ void PDMFactory::EnsureInit() {
     initalization();
     return;
   }
-  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
+  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
   nsCOMPtr<nsIRunnable> runnable = NS_NewRunnableFunction(
       "PDMFactory::EnsureInit", std::move(initalization));
   SyncRunnable::DispatchToThread(mainTarget, runnable);

diff --git a/dom/media/platforms/wmf/WMFDecoderModule.cpp b/dom/media/platforms/wmf/WMFDecoderModule.cpp
@@ -253,7 +253,8 @@ bool WMFDecoderModule::CanCreateMFTDecoder(const WMFStreamType& aType) {
     } else {
       nsCOMPtr<nsIRunnable> runnable =
           NS_NewRunnableFunction("WMFDecoderModule::Init", [&]() { Init(); });
-      SyncRunnable::DispatchToThread(GetMainThreadEventTarget(), runnable);
+      SyncRunnable::DispatchToThread(GetMainThreadSerialEventTarget(),
+                                     runnable);
     }
   }
 

diff --git a/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp b/dom/media/webaudio/blink/HRTFDatabaseLoader.cpp
@@ -123,7 +123,7 @@ class HRTFDatabaseLoader::ProxyReleaseEvent final : public Runnable {
 };
 
 void HRTFDatabaseLoader::ProxyRelease() {
-  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
+  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
   if (MOZ_LIKELY(mainTarget)) {
     RefPtr<ProxyReleaseEvent> event = new ProxyReleaseEvent(this);
     DebugOnly<nsresult> rv = mainTarget->Dispatch(event, NS_DISPATCH_NORMAL);

diff --git a/dom/media/webrtc/jsapi/MediaTransportHandler.cpp b/dom/media/webrtc/jsapi/MediaTransportHandler.cpp
@@ -695,7 +695,7 @@ void MediaTransportHandlerSTS::Destroy() {
   CSFLogDebug(LOGTAG, "%s %p", __func__, this);
   // Our "destruction tour" starts on main, because we need to deregister.
   if (!NS_IsMainThread()) {
-    GetMainThreadEventTarget()->Dispatch(NewNonOwningRunnableMethod(
+    GetMainThreadSerialEventTarget()->Dispatch(NewNonOwningRunnableMethod(
         __func__, this, &MediaTransportHandlerSTS::Destroy));
     return;
   }

diff --git a/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp b/dom/media/webrtc/jsapi/PeerConnectionCtx.cpp
@@ -532,8 +532,8 @@ static void GMPReady_m() {
 };
 
 static void GMPReady() {
-  GetMainThreadEventTarget()->Dispatch(WrapRunnableNM(&GMPReady_m),
-                                       NS_DISPATCH_NORMAL);
+  GetMainThreadSerialEventTarget()->Dispatch(WrapRunnableNM(&GMPReady_m),
+                                             NS_DISPATCH_NORMAL);
 };
 
 void PeerConnectionCtx::initGMP() {

diff --git a/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp b/dom/media/webrtc/jsapi/PeerConnectionImpl.cpp
@@ -1406,7 +1406,7 @@ void PeerConnectionImpl::UpdateNegotiationNeeded() {
   }
 
   // Queue a task to run the following steps:
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__, [this, self = RefPtr<PeerConnectionImpl>(this)] {
         // If connection.[[IsClosed]] is true, abort these steps.
         if (IsClosed()) {
@@ -1530,7 +1530,7 @@ PeerConnectionImpl::CreateOffer(const JsepOfferOptions& aOptions) {
 
   STAMP_TIMECARD(mTimeCard, "Create Offer");
 
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__, [this, self = RefPtr<PeerConnectionImpl>(this), aOptions] {
         std::string offer;
 
@@ -1570,7 +1570,7 @@ PeerConnectionImpl::CreateAnswer() {
   // add it as a param to CreateAnswer, and convert it here.
   JsepAnswerOptions options;
 
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__, [this, self = RefPtr<PeerConnectionImpl>(this), options] {
         std::string answer;
         SyncToJsep();
@@ -1889,7 +1889,7 @@ PeerConnectionImpl::AddIceCandidate(
       mRawTrickledCandidates.push_back(aCandidate);
     }
     // Spec says we queue a task for these updates
-    GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+    GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
         __func__, [this, self = RefPtr<PeerConnectionImpl>(this)] {
           if (IsClosed()) {
             return;
@@ -1910,7 +1910,7 @@ PeerConnectionImpl::AddIceCandidate(
                 static_cast<unsigned>(*result.mError), aCandidate,
                 level.valueOr(-1), errorString.c_str());
 
-    GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+    GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
         __func__,
         [this, self = RefPtr<PeerConnectionImpl>(this), errorString, result] {
           if (IsClosed()) {
@@ -2577,7 +2577,7 @@ already_AddRefed<dom::Promise> PeerConnectionImpl::OnSetDescriptionSuccess(
 void PeerConnectionImpl::DoSetDescriptionSuccessPostProcessing(
     dom::RTCSdpType aSdpType, bool aRemote, const RefPtr<dom::Promise>& aP) {
   // Spec says we queue a task for all the stuff that ends up back in JS
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__,
       [this, self = RefPtr<PeerConnectionImpl>(this), aSdpType, aRemote, aP] {
         if (IsClosed()) {
@@ -3829,7 +3829,7 @@ void PeerConnectionImpl::AddIceCandidate(const std::string& aCandidate,
           cand.mUfrag = aUfrag;
           mQueriedMDNSHostnames[addr].push_back(cand);
 
-          GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+          GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
               "PeerConnectionImpl::SendQueryMDNSHostname",
               [self = RefPtr<PeerConnectionImpl>(this), addr]() mutable {
                 if (self->mStunAddrsRequest) {
@@ -4033,7 +4033,7 @@ void PeerConnectionImpl::SignalHandler::IceGatheringStateChange_s(
     dom::RTCIceGatheringState aState) {
   ASSERT_ON_THREAD(mSTSThread);
 
-  GetMainThreadEventTarget()->Dispatch(
+  GetMainThreadSerialEventTarget()->Dispatch(
       NS_NewRunnableFunction(__func__,
                              [handle = mHandle, aState] {
                                PeerConnectionWrapper wrapper(handle);
@@ -4049,7 +4049,7 @@ void PeerConnectionImpl::SignalHandler::IceConnectionStateChange_s(
     dom::RTCIceConnectionState aState) {
   ASSERT_ON_THREAD(mSTSThread);
 
-  GetMainThreadEventTarget()->Dispatch(
+  GetMainThreadSerialEventTarget()->Dispatch(
       NS_NewRunnableFunction(__func__,
                              [handle = mHandle, aState] {
                                PeerConnectionWrapper wrapper(handle);
@@ -4068,7 +4068,7 @@ void PeerConnectionImpl::SignalHandler::OnCandidateFound_s(
 
   MOZ_ASSERT(!aCandidateInfo.mUfrag.empty());
 
-  GetMainThreadEventTarget()->Dispatch(
+  GetMainThreadSerialEventTarget()->Dispatch(
       NS_NewRunnableFunction(__func__,
                              [handle = mHandle, aTransportId, aCandidateInfo] {
                                PeerConnectionWrapper wrapper(handle);
@@ -4083,7 +4083,7 @@ void PeerConnectionImpl::SignalHandler::OnCandidateFound_s(
 void PeerConnectionImpl::SignalHandler::AlpnNegotiated_s(
     const std::string& aAlpn, bool aPrivacyRequested) {
   MOZ_DIAGNOSTIC_ASSERT((aAlpn == "c-webrtc") == aPrivacyRequested);
-  GetMainThreadEventTarget()->Dispatch(
+  GetMainThreadSerialEventTarget()->Dispatch(
       NS_NewRunnableFunction(__func__,
                              [handle = mHandle, aPrivacyRequested] {
                                PeerConnectionWrapper wrapper(handle);

diff --git a/dom/media/webrtc/jsapi/RTCRtpSender.cpp b/dom/media/webrtc/jsapi/RTCRtpSender.cpp
@@ -686,7 +686,7 @@ already_AddRefed<Promise> RTCRtpSender::SetParameters(
 
   // If the media stack is successfully configured with parameters,
   // queue a task to run the following steps:
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__,
       [this, self = RefPtr<RTCRtpSender>(this), p, paramsCopy, serialNumber] {
         // Set sender.[[LastReturnedParameters]] to null.
@@ -853,7 +853,7 @@ void RTCRtpSender::GetParameters(RTCRtpSendParameters& aParameters) {
   mLastReturnedParameters = Some(aParameters);
 
   // Queue a task that sets sender.[[LastReturnedParameters]] to null.
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__, [this, self = RefPtr<RTCRtpSender>(this)] {
         mLastReturnedParameters = Nothing();
       }));
@@ -1068,7 +1068,7 @@ RefPtr<dom::Promise> ReplaceTrackOperation::CallImpl(ErrorResult& aError) {
   }
 
   // Queue a task that runs the following steps:
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       __func__, [p, sender, track = mNewTrack]() MOZ_CAN_RUN_SCRIPT_BOUNDARY {
         // If connection.[[IsClosed]] is true, abort these steps.
         // Set sender.[[SenderTrack]] to withTrack.

diff --git a/dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp b/dom/media/webrtc/jsapi/RTCRtpTransceiver.cpp
@@ -254,8 +254,8 @@ void RTCRtpTransceiver::RollbackToStableDtlsTransport() {
 
 void RTCRtpTransceiver::UpdateDtlsTransportState(
     const std::string& aTransportId, TransportLayer::State aState) {
-  if (!GetMainThreadEventTarget()->IsOnCurrentThread()) {
-    GetMainThreadEventTarget()->Dispatch(
+  if (!GetMainThreadSerialEventTarget()->IsOnCurrentThread()) {
+    GetMainThreadSerialEventTarget()->Dispatch(
         WrapRunnable(this, &RTCRtpTransceiver::UpdateDtlsTransportState,
                      aTransportId, aState),
         NS_DISPATCH_NORMAL);

diff --git a/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp b/dom/media/webrtc/transport/WebrtcTCPSocketWrapper.cpp
@@ -24,7 +24,7 @@ WebrtcTCPSocketWrapper::WebrtcTCPSocketWrapper(
       mWebrtcTCPSocket(nullptr),
       mMainThread(nullptr),
       mSocketThread(nullptr) {
-  mMainThread = GetMainThreadEventTarget();
+  mMainThread = GetMainThreadSerialEventTarget();
   mSocketThread = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID);
   MOZ_RELEASE_ASSERT(mMainThread, "no main thread");
   MOZ_RELEASE_ASSERT(mSocketThread, "no socket thread");

diff --git a/dom/media/webrtc/transport/ipc/WebrtcTCPSocket.cpp b/dom/media/webrtc/transport/ipc/WebrtcTCPSocket.cpp
@@ -58,7 +58,7 @@ WebrtcTCPSocket::WebrtcTCPSocket(WebrtcTCPSocketCallback* aCallbacks)
       mSocketIn(nullptr),
       mSocketOut(nullptr) {
   LOG(("WebrtcTCPSocket::WebrtcTCPSocket %p\n", this));
-  mMainThread = GetMainThreadEventTarget();
+  mMainThread = GetMainThreadSerialEventTarget();
   mSocketThread = do_GetService(NS_SOCKETTRANSPORTSERVICE_CONTRACTID);
   MOZ_RELEASE_ASSERT(mMainThread, "no main thread");
   MOZ_RELEASE_ASSERT(mSocketThread, "no socket thread");

diff --git a/dom/media/webrtc/transportbridge/MediaPipeline.cpp b/dom/media/webrtc/transportbridge/MediaPipeline.cpp
@@ -1201,7 +1201,7 @@ class GenericReceiveListener : public MediaTrackListener {
   void OnRtpReceived() {
     if (mMaybeTrackNeedsUnmute) {
       mMaybeTrackNeedsUnmute = false;
-      GetMainThreadEventTarget()->Dispatch(
+      GetMainThreadSerialEventTarget()->Dispatch(
           NewRunnableMethod("GenericReceiveListener::OnRtpReceived_m", this,
                             &GenericReceiveListener::OnRtpReceived_m));
     }
@@ -1224,7 +1224,7 @@ class GenericReceiveListener : public MediaTrackListener {
       mSource->Destroy();
     }
 
-    GetMainThreadEventTarget()->Dispatch(
+    GetMainThreadSerialEventTarget()->Dispatch(
         NewRunnableMethod("RemoteTrackSource::ForceEnded", mTrackSource.get(),
                           &RemoteTrackSource::ForceEnded));
   }
@@ -1288,7 +1288,7 @@ class MediaPipelineReceiveAudio::PipelineListener
   void MakePrincipalPrivate_s() {
     mForceSilence = true;
 
-    GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+    GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
         "MediaPipelineReceiveAudio::PipelineListener::MakePrincipalPrivate_s",
         [self = RefPtr<PipelineListener>(this), this] {
           class Message : public ControlMessage {
@@ -1494,7 +1494,7 @@ class MediaPipelineReceiveVideo::PipelineListener
       mForceDropFrames = true;
     }
 
-    GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+    GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
         __func__, [self = RefPtr<PipelineListener>(this), this] {
           RefPtr<nsIPrincipal> privatePrincipal =
               NullPrincipal::CreateWithInheritedAttributes(

diff --git a/dom/media/webvtt/TextTrackList.cpp b/dom/media/webvtt/TextTrackList.cpp
@@ -139,7 +139,7 @@ void TextTrackList::CreateAndDispatchChangeEvent() {
 void TextTrackList::CreateAndDispatchTrackEventRunner(
     TextTrack* aTrack, const nsAString& aEventName) {
   DebugOnly<nsresult> rv;
-  nsCOMPtr<nsIEventTarget> target = GetMainThreadEventTarget();
+  nsCOMPtr<nsIEventTarget> target = GetMainThreadSerialEventTarget();
   if (!target) {
     // If we are not able to get the main-thread object we are shutting down.
     return;

diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp
@@ -2322,7 +2322,7 @@ nsresult Notification::DispatchToMainThread(
                               nsIEventTarget::DISPATCH_NORMAL);
     }
   }
-  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadEventTarget();
+  nsCOMPtr<nsIEventTarget> mainTarget = GetMainThreadSerialEventTarget();
   MOZ_ASSERT(mainTarget);
   return mainTarget->Dispatch(std::move(aRunnable),
                               nsIEventTarget::DISPATCH_NORMAL);

diff --git a/dom/webauthn/AndroidWebAuthnTokenManager.cpp b/dom/webauthn/AndroidWebAuthnTokenManager.cpp
@@ -93,7 +93,7 @@ RefPtr<U2FRegisterPromise> AndroidWebAuthnTokenManager::Register(
 
   ClearPromises();
 
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       "java::WebAuthnTokenManager::WebAuthnMakeCredential",
       [self = RefPtr{this}, aInfo, aForceNoneAttestation]() {
         AssertIsOnMainThread();
@@ -282,7 +282,7 @@ RefPtr<U2FSignPromise> AndroidWebAuthnTokenManager::Sign(
 
   ClearPromises();
 
-  GetMainThreadEventTarget()->Dispatch(NS_NewRunnableFunction(
+  GetMainThreadSerialEventTarget()->Dispatch(NS_NewRunnableFunction(
       "java::WebAuthnTokenManager::WebAuthnGetAssertion",
       [self = RefPtr{this}, aInfo]() {
         AssertIsOnMainThread();