Changeset 85908 in webkit

Timestamp:

May 5, 2011 6:00:22 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-05-05 Sam Weinig <​sam@webkit.org>

Reviewed by Anders Carlsson.

REGRESSION (r85689): Unresponsive timer firing when closing background tabs
<rdar://problem/9385988>
​https://bugs.webkit.org/show_bug.cgi?id=60325

When calling WKPageTryClose(), if the page close succeeded, the notification to stop
the responsiveness timer would be dropped because the page was closed by the time it
got to the UIProcess.

• UIProcess/WebPageProxy.cpp: (WebKit::WebPageProxy::closePage):
• UIProcess/WebPageProxy.h:
• UIProcess/WebPageProxy.messages.in: Add parameter to closePage stipulating whether or not to stop the responsiveness timer.

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::tryClose): (WebKit::WebPage::sendClose): Instead of sending a StopResponsivenessTimer message after sending the ClosePage message, add a bit to the ClosePage message.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-05-05  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        REGRESSION (r85689): Unresponsive timer firing when closing background tabs
+        <rdar://problem/9385988>
+        https://bugs.webkit.org/show_bug.cgi?id=60325
+
+        When calling WKPageTryClose(), if the page close succeeded, the notification to stop
+        the responsiveness timer would be dropped because the page was closed by the time it
+        got to the UIProcess.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::closePage):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/WebPageProxy.messages.in:
+        Add parameter to closePage stipulating whether or not to stop the responsiveness timer.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::tryClose):
+        (WebKit::WebPage::sendClose):
+        Instead of sending a StopResponsivenessTimer message after sending the ClosePage message,
+        add a bit to the ClosePage message.
+
 2011-05-05  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1933 +1933 @@
 }
 
-void WebPageProxy::closePage()
-{
+void WebPageProxy::closePage(bool stopResponsivenessTimer)
+{
+    if (stopResponsivenessTimer)
+        process()->responsivenessTimer()->stop();
+
     m_uiClient.close(this);
 }

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -572 +572 @@
     void createNewPage(const WebCore::WindowFeatures&, uint32_t modifiers, int32_t mouseButton, uint64_t& newPageID, WebPageCreationParameters&);
     void showPage();
-    void closePage();
+    void closePage(bool stopResponsivenessTimer);
     void runJavaScriptAlert(uint64_t frameID, const String&);
     void runJavaScriptConfirm(uint64_t frameID, const String&, bool& result);

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -25 +25 @@
     CreateNewPage(WebCore::WindowFeatures windowFeatures, uint32_t modifiers, int32_t mouseButton) -> (uint64_t newPageID, WebKit::WebPageCreationParameters newPageParameters)
     ShowPage()
-    ClosePage()
+    ClosePage(bool stopResponsivenessTimer)
     RunJavaScriptAlert(uint64_t frameID, WTF::String message) -> ()
     RunJavaScriptConfirm(uint64_t frameID, WTF::String message) -> (bool result)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -444 +444 @@
     SendStopResponsivenessTimer stopper(this);
 
-    if (!m_mainFrame->coreFrame()->loader()->shouldClose())
-        return;
-
-    sendClose();
+    if (!m_mainFrame->coreFrame()->loader()->shouldClose()) {
+        send(Messages::WebPageProxy::StopResponsivenessTimer());
+        return;
+    }
+
+    send(Messages::WebPageProxy::ClosePage(true));
 }
 
 void WebPage::sendClose()
 {
-    send(Messages::WebPageProxy::ClosePage());
+    send(Messages::WebPageProxy::ClosePage(false));
 }