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 440695 d3226ea42a55a13c550e6253b9032b7b401f700b
parent 440694 c43128ccf21b0e70874b076c91de27c5e7abba17
child 440696 e043e1f8997c15bb4793cb48c2e4236623f51833
push id36297
push userbmo:wmccloskey@mozilla.com
push dateFri, 18 Nov 2016 00:53:48 +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
@@ -5081,19 +5081,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)
 {