Bug 1376981 - Label nsBindingManager::PostProcessAttachedQueueEvent (…

…r=smaug) MozReview-Commit-ID: G0xxNwtXsex
mozilla-spidermonkey · Jul 3, 2017 · 882897a · 882897a
1 parent 1278473
commit 882897a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/dom/xbl/nsBindingManager.cpp b/dom/xbl/nsBindingManager.cpp
@@ -351,11 +351,15 @@ nsBindingManager::AddToAttachedQueue(nsXBLBinding* aBinding)
 void
 nsBindingManager::PostProcessAttachedQueueEvent()
 {
+  MOZ_ASSERT(NS_IsMainThread());
+  if (!mDocument) {
+    return;
+  }
   mProcessAttachedQueueEvent =
     NewRunnableMethod("nsBindingManager::DoProcessAttachedQueue",
                       this, &nsBindingManager::DoProcessAttachedQueue);
-  nsresult rv = NS_DispatchToCurrentThread(mProcessAttachedQueueEvent);
-  if (NS_SUCCEEDED(rv) && mDocument) {
+  nsresult rv = mDocument->EventTargetFor(TaskCategory::Other)->Dispatch(do_AddRef(mProcessAttachedQueueEvent));
+  if (NS_SUCCEEDED(rv)) {
     mDocument->BlockOnload();
   }
 }