Changeset 253224 in webkit

Timestamp:

Dec 6, 2019 3:02:10 PM (4 years ago)

Author:

Chris Dumez

Message:

Reduce timeout for page to handle beforeunload events when trying to close a page
​https://bugs.webkit.org/show_bug.cgi?id=204950
<rdar://problem/57700419>

Reviewed by Ryosuke Niwa.

Reduce timeout for page to handle beforeunload events when trying to close a page. It would previously
take up to 3 seconds to actually close a tab after the user would click on the "X" to close it. This
is because we would wait for the page to fire and handle the beforeunload events and only give up after
3 seconds. This patch reduces this timeout to something more reasonable from a user standpoint (500ms).

• UIProcess/WebPageProxy.cpp:

(WebKit::m_tryCloseTimeoutTimer):
(WebKit::WebPageProxy::tryClose):
(WebKit::WebPageProxy::tryCloseTimedOut):
(WebKit::WebPageProxy::closePage):
(WebKit::m_resetRecentCrashCountTimer): Deleted.

• UIProcess/WebPageProxy.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (5 diffs)
• UIProcess/WebPageProxy.h (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-12-06  Chris Dumez  <cdumez@apple.com>
+
+        Reduce timeout for page to handle beforeunload events when trying to close a page
+        https://bugs.webkit.org/show_bug.cgi?id=204950
+        <rdar://problem/57700419>
+
+        Reviewed by Ryosuke Niwa.
+
+        Reduce timeout for page to handle beforeunload events when trying to close a page. It would previously
+        take up to 3 seconds to actually close a tab after the user would click on the "X" to close it. This
+        is because we would wait for the page to fire and handle the beforeunload events and only give up after
+        3 seconds. This patch reduces this timeout to something more reasonable from a user standpoint (500ms).
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::m_tryCloseTimeoutTimer):
+        (WebKit::WebPageProxy::tryClose):
+        (WebKit::WebPageProxy::tryCloseTimedOut):
+        (WebKit::WebPageProxy::closePage):
+        (WebKit::m_resetRecentCrashCountTimer): Deleted.
+        * UIProcess/WebPageProxy.h:
+
 2019-12-06  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -272 +272 @@
 static unsigned maximumWebProcessRelaunchAttempts = 1;
 static const Seconds audibleActivityClearDelay = 10_s;
+static const Seconds tryCloseTimeoutDelay = 500_ms;
 
 namespace WebKit {
@@ -450 +451 @@
 #endif
     , m_resetRecentCrashCountTimer(RunLoop::main(), this, &WebPageProxy::resetRecentCrashCount)
+    , m_tryCloseTimeoutTimer(RunLoop::main(), this, &WebPageProxy::tryCloseTimedOut)
 {
     RELEASE_LOG_IF_ALLOWED(Loading, "constructor:");
@@ -1075 +1077 @@
         return true;
 
-    RELEASE_LOG_IF_ALLOWED(Loading, "tryClose:");
+    RELEASE_LOG_IF_ALLOWED(Process, "tryClose:");
 
     // Close without delay if the process allows it. Our goal is to terminate
@@ -1082 +1084 @@
         return true;
 
-    m_process->responsivenessTimer().start();
+    m_tryCloseTimeoutTimer.startOneShot(tryCloseTimeoutDelay);
     sendWithAsyncReply(Messages::WebPage::TryClose(), [this, weakThis = makeWeakPtr(*this)](bool shouldClose) {
         if (!weakThis)
             return;
 
-        m_process->responsivenessTimer().stop();
+        m_tryCloseTimeoutTimer.stop();
         if (shouldClose)
             closePage();
     });
     return false;
+}
+
+void WebPageProxy::tryCloseTimedOut()
+{
+    RELEASE_LOG_ERROR_IF_ALLOWED(Process, "tryCloseTimedOut: Timed out waiting for the process to respond to the WebPage::TryClose IPC, closing the page now");
+    closePage();
 }
 
@@ -5322 +5330 @@
 void WebPageProxy::closePage()
 {
+    if (isClosed())
+        return;
+
+    RELEASE_LOG_IF_ALLOWED(Process, "closePage:");
     pageClient().clearAllEditCommands();
     m_uiClient->close(this);

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -2178 +2178 @@
 #endif
 
+    void tryCloseTimedOut();
     void makeStorageSpaceRequest(WebCore::FrameIdentifier, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, CompletionHandler<void(uint64_t)>&&);
 
@@ -2595 +2596 @@
     bool m_mayHaveUniversalFileReadSandboxExtension { false };
 
+    RunLoop::Timer<WebPageProxy> m_tryCloseTimeoutTimer;
+
     std::unique_ptr<ProvisionalPageProxy> m_provisionalPage;
     std::unique_ptr<SuspendedPageProxy> m_suspendedPageKeptToPreventFlashing;