Bug 1318506 - Label DispatchContentLoaded events with a DocGroup (r?ehsan) draft
authorBill McCloskey <billm@mozilla.com>
Thu, 10 Nov 2016 11:39:22 -0800
changeset 444816 867f1d2e445b4cc2a0154d0be1db02733d16e07d
parent 444815 2e2fb38cf701ebeac354b1038c4ba7e9e20fd14e
child 444817 f80cf57ce5f3c63c3ed3a2e2b0a81f803abd633c
push id37376
push userbmo:wmccloskey@mozilla.com
push dateMon, 28 Nov 2016 21:43:46 +0000
reviewersehsan
bugs1318506
milestone53.0a1
Bug 1318506 - Label DispatchContentLoaded events with a DocGroup (r?ehsan) MozReview-Commit-ID: 8vx2Vzvvxhu
dom/base/nsDocument.cpp
--- a/dom/base/nsDocument.cpp
+++ b/dom/base/nsDocument.cpp
@@ -5075,19 +5075,20 @@ nsDocument::UnblockDOMContentLoaded()
   MOZ_ASSERT(mBlockDOMContentLoaded);
   if (--mBlockDOMContentLoaded != 0 || mDidFireDOMContentLoaded) {
     return;
   }
   mDidFireDOMContentLoaded = true;
 
   MOZ_ASSERT(mReadyState == READYSTATE_INTERACTIVE);
   if (!mSynchronousDOMContentLoaded) {
+    MOZ_RELEASE_ASSERT(NS_IsMainThread());
     nsCOMPtr<nsIRunnable> ev =
       NewRunnableMethod(this, &nsDocument::DispatchContentLoadedEvents);
-    NS_DispatchToCurrentThread(ev);
+    Dispatch("DispatchContentLoadedEvents", TaskCategory::Other, ev.forget());
   } else {
     DispatchContentLoadedEvents();
   }
 }
 
 void
 nsDocument::ContentStateChanged(nsIContent* aContent, EventStates aStateMask)
 {