Changeset 251627 in webkit

Timestamp:

Oct 25, 2019, 9:53:33 PM (7 years ago)

Author:

Chris Dumez

Message:

REGRESSION(r251599): Crash in MobileSafari tests (ASSERTION FAILED: m_pendingRequestToSuspendID)
​https://bugs.webkit.org/show_bug.cgi?id=203437
<rdar://problem/56633399>

Reviewed by Geoffrey Garen.

• UIProcess/ProcessThrottler.cpp:

(WebKit::ProcessThrottler::updateAssertionIfNeeded):
Start the timer before sending the PrepareToSuspend IPC. The reason is that if the process has been
terminated, the completion handler may run synchronously and cancel the request to suspend / stop
the timer. Therefore, re-starting the timer after would be a mistake.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ProcessThrottler.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-25  Chris Dumez  <cdumez@apple.com>
+
+        REGRESSION(r251599): Crash in MobileSafari tests (ASSERTION FAILED: m_pendingRequestToSuspendID)
+        https://bugs.webkit.org/show_bug.cgi?id=203437
+        <rdar://problem/56633399>
+
+        Reviewed by Geoffrey Garen.
+
+        * UIProcess/ProcessThrottler.cpp:
+        (WebKit::ProcessThrottler::updateAssertionIfNeeded):
+        Start the timer before sending the PrepareToSuspend IPC. The reason is that if the process has been
+        terminated, the completion handler may run synchronously and cancel the request to suspend / stop
+        the timer. Therefore, re-starting the timer after would be a mistake.
+
 2019-10-25  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit/UIProcess/ProcessThrottler.cpp

@@ -93 +93 @@
         // in the background for too long.
         if (m_assertion->state() != AssertionState::Suspended) {
+            m_prepareToSuspendTimeoutTimer.startOneShot(processSuspensionTimeout);
             sendPrepareToSuspendIPC(IsSuspensionImminent::No);
-            m_prepareToSuspendTimeoutTimer.startOneShot(processSuspensionTimeout);
             return;
         }