Title: [217617] trunk/Source/WebKit2
Revision
217617
Author
[email protected]
Date
2017-05-31 12:17:28 -0700 (Wed, 31 May 2017)

Log Message

[WK2] Fix bad assertion in BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck()
https://bugs.webkit.org/show_bug.cgi?id=172763

Reviewed by Zalan Bujtas.

Fix bad assertion in BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck().
It gets hit when a process becomes unresponsive. The reason is that RunLoop::Timer::isActive()
still returns true while the timerFired() callback is called.

* UIProcess/BackgroundProcessResponsivenessTimer.cpp:
(WebKit::BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (217616 => 217617)


--- trunk/Source/WebKit2/ChangeLog	2017-05-31 19:11:24 UTC (rev 217616)
+++ trunk/Source/WebKit2/ChangeLog	2017-05-31 19:17:28 UTC (rev 217617)
@@ -1,3 +1,17 @@
+2017-05-31  Chris Dumez  <[email protected]>
+
+        [WK2] Fix bad assertion in BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck()
+        https://bugs.webkit.org/show_bug.cgi?id=172763
+
+        Reviewed by Zalan Bujtas.
+
+        Fix bad assertion in BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck().
+        It gets hit when a process becomes unresponsive. The reason is that RunLoop::Timer::isActive()
+        still returns true while the timerFired() callback is called.
+
+        * UIProcess/BackgroundProcessResponsivenessTimer.cpp:
+        (WebKit::BackgroundProcessResponsivenessTimer::scheduleNextResponsivenessCheck):
+
 2017-05-31  Youenn Fablet  <[email protected]>
 
         Make WebRTC legacy API switch an experimental feature

Modified: trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp (217616 => 217617)


--- trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp	2017-05-31 19:11:24 UTC (rev 217616)
+++ trunk/Source/WebKit2/UIProcess/BackgroundProcessResponsivenessTimer.cpp	2017-05-31 19:17:28 UTC (rev 217617)
@@ -148,7 +148,6 @@
 {
     // Exponential backoff to avoid waking up the process too often.
     ASSERT(!m_responsivenessCheckTimer.isActive());
-    ASSERT(!m_timeoutTimer.isActive());
     m_checkingInterval = std::min(m_checkingInterval * 2, maximumCheckingInterval);
     m_responsivenessCheckTimer.startOneShot(m_checkingInterval);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to