merge mozilla-inbound to mozilla-central a=merge

2017-01-25 13:47:25 +01:00
parent c4037b157b 3f580274a0
commit 36d34f5108
721 changed files with 4793 additions and 4210 deletions
--- a/parser/html/nsHtml5TreeOpExecutor.cpp
+++ b/parser/html/nsHtml5TreeOpExecutor.cpp
@@ -265,7 +265,7 @@ nsHtml5TreeOpExecutor::ContinueInterruptedParsingAsync()
 {
  if (!mDocument || !mDocument->IsInBackgroundWindow()) {
    nsCOMPtr<nsIRunnable> flusher = new nsHtml5ExecutorReflusher(this);  
-    if (NS_FAILED(mDocument->Dispatch("ContinueInterruptedParsingAsync",
+    if (NS_FAILED(mDocument->Dispatch("nsHtml5ExecutorReflusher",
                                      dom::TaskCategory::Other,
                                      flusher.forget()))) {
      NS_WARNING("failed to dispatch executor flush event");