merge mozilla-inbound to mozilla-central a=merge

2017-06-27 10:56:41 +02:00
parent 3bcaafc624 3894400fb0
commit 372571d466
680 changed files with 7080 additions and 3945 deletions
--- a/parser/html/nsHtml5StreamParser.cpp
+++ b/parser/html/nsHtml5StreamParser.cpp
@@ -1132,12 +1132,12 @@ nsHtml5StreamParser::DoDataAvailable(const uint8_t* aBuffer, uint32_t aLength)

  {
    mozilla::MutexAutoLock flushTimerLock(mFlushTimerMutex);
-    mFlushTimer->InitWithFuncCallback(nsHtml5StreamParser::TimerCallback,
-                                      static_cast<void*> (this),
-                                      mFlushTimerEverFired ?
-                                          sTimerInitialDelay :
-                                          sTimerSubsequentDelay,
-                                      nsITimer::TYPE_ONE_SHOT);
+    mFlushTimer->InitWithNamedFuncCallback(
+      nsHtml5StreamParser::TimerCallback,
+      static_cast<void*>(this),
+      mFlushTimerEverFired ? sTimerInitialDelay : sTimerSubsequentDelay,
+      nsITimer::TYPE_ONE_SHOT,
+      "nsHtml5StreamParser::DoDataAvailable");
  }
  mFlushTimerArmed = true;
 }