Bug 1367025 - Don't start throttling delay timers while suspended. r=bkelly
authorAndreas Farre <farre@mozilla.com>
Tue, 23 May 2017 15:36:08 +0200
changeset 360276 826ecf00de0a224c459e980ad17dc84510c577e6
parent 360275 7f28c1084c47d771be342692f37a8b0d575d3264
child 360277 67c6447687930061e35dd64eb9eddcdcd8e2654c
push id31872
push userryanvm@gmail.com
push dateTue, 23 May 2017 22:11:58 +0000
treeherdermozilla-central@96e18bec9fc8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbkelly
bugs1367025
milestone55.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 1367025 - Don't start throttling delay timers while suspended. r=bkelly From c350a6db4069d1a33a21546a287714bfe07e0590 Mon Sep 17 00:00:00 2001 --- dom/base/TimeoutManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
dom/base/TimeoutManager.cpp
--- a/dom/base/TimeoutManager.cpp
+++ b/dom/base/TimeoutManager.cpp
@@ -1574,17 +1574,17 @@ TimeoutManager::OnDocumentLoaded()
 {
   MaybeStartThrottleTrackingTimout();
 }
 
 void
 TimeoutManager::MaybeStartThrottleTrackingTimout()
 {
   if (gTrackingTimeoutThrottlingDelay <= 0 ||
-      mWindow.AsInner()->InnerObjectsFreed()) {
+      mWindow.AsInner()->InnerObjectsFreed() || mWindow.IsSuspended()) {
     return;
   }
 
   MOZ_DIAGNOSTIC_ASSERT(!mThrottleTrackingTimeouts);
 
   MOZ_LOG(gLog, LogLevel::Debug,
           ("TimeoutManager %p delaying tracking timeout throttling by %dms\n",
            this, gTrackingTimeoutThrottlingDelay));