Bug 1528336: Fix Timeout log assertion r=smaug
authorRandell Jesup <rjesup@jesup.org>
Fri, 15 Feb 2019 17:43:24 -0500
changeset 459663 b4ab57f9c0cb57f93a6ec6fd8a5bf45d54ebfffa
parent 459662 31252f85aa36b976c83946f9bdf5b6ca715860ae
child 459664 1c887a569595636763f17265af1e7c8cced30d50
push id35564
push userccoroiu@mozilla.com
push dateSat, 16 Feb 2019 09:37:16 +0000
treeherdermozilla-central@7ab4a0c9980f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs1528336
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1528336: Fix Timeout log assertion r=smaug
dom/base/TimeoutManager.cpp
--- a/dom/base/TimeoutManager.cpp
+++ b/dom/base/TimeoutManager.cpp
@@ -793,17 +793,18 @@ void TimeoutManager::RunTimeout(const Ti
         }
       }
     }
   }
   if (aProcessIdle) {
     MOZ_LOG(gTimeoutLog, LogLevel::Debug,
             ("Running %u deferred timeouts on idle (TimeoutManager=%p), "
              "nextDeadline = %gms from now",
-             numTimersToRun, this, (nextDeadline - now).ToMilliseconds()));
+             numTimersToRun, this,
+             nextDeadline.IsNull() ? 0.0 : (nextDeadline - now).ToMilliseconds()));
   }
 
   now = TimeStamp::Now();
 
   // Wherever we stopped in the timer list, schedule the executor to
   // run for the next unexpired deadline.  Note, this *must* be done
   // before we start executing any content script handlers.  If one
   // of them spins the event loop the executor must already be scheduled