Changeset 192702 in webkit

Timestamp:

Nov 20, 2015 3:10:02 PM (8 years ago)

Author:

ggaren@apple.com

Message:

A hung webpage pretends to be responsive if you scroll
​https://bugs.webkit.org/show_bug.cgi?id=151518

Reviewed by Sam Weinig.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::sendWheelEvent):
(WebKit::WebPageProxy::didReceiveEvent): Don't treat wheel events as
starting or stopping the responsiveness timer. Wheel events usually
process on the event dispatch thread, which responds even if the main
thread is hung.

Instead, send an out-of-band ping to the main thread to verify that
it is still responsive and we'll be able to paint and respond to clicks
after scrolling.

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::sendMainThreadPing):
(WebKit::WebProcessProxy::didReceiveMainThreadPing):

• UIProcess/WebProcessProxy.h:
• UIProcess/WebProcessProxy.messages.in: UI process support for pinging

the main thread in the web process.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::mainThreadPing):

• WebProcess/WebProcess.h:
• WebProcess/WebProcess.messages.in: Web process support for responding

to pings.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-11-20  Geoffrey Garen  <ggaren@apple.com>
+
+        A hung webpage pretends to be responsive if you scroll
+        https://bugs.webkit.org/show_bug.cgi?id=151518
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::sendWheelEvent):
+        (WebKit::WebPageProxy::didReceiveEvent): Don't treat wheel events as
+        starting or stopping the responsiveness timer. Wheel events usually
+        process on the event dispatch thread, which responds even if the main
+        thread is hung.
+
+        Instead, send an out-of-band ping to the main thread to verify that
+        it is still responsive and we'll be able to paint and respond to clicks
+        after scrolling.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::sendMainThreadPing):
+        (WebKit::WebProcessProxy::didReceiveMainThreadPing):
+        * UIProcess/WebProcessProxy.h:
+        * UIProcess/WebProcessProxy.messages.in: UI process support for pinging
+        the main thread in the web process.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::mainThreadPing):
+        * WebProcess/WebProcess.h:
+        * WebProcess/WebProcess.messages.in: Web process support for responding
+        to pings.
+
 2015-11-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -1798 +1798 @@
 void WebPageProxy::sendWheelEvent(const WebWheelEvent& event)
 {
-    m_process->responsivenessTimer().start();
-
     m_process->send(
         Messages::EventDispatcher::WheelEvent(
@@ -1809 +1807 @@
             rubberBandsAtBottom()
         ), 0);
+
+    m_process->sendMainThreadPing();
 }
 
@@ -4501 +4501 @@
     case WebEvent::NoType:
     case WebEvent::MouseMove:
+    case WebEvent::Wheel:
         break;
 
@@ -4508 +4509 @@
     case WebEvent::MouseForceDown:
     case WebEvent::MouseForceUp:
-    case WebEvent::Wheel:
     case WebEvent::KeyDown:
     case WebEvent::KeyUp:

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -1003 +1003 @@
 }
 
+void WebProcessProxy::sendMainThreadPing()
+{
+    responsivenessTimer().start();
+    send(Messages::WebProcess::MainThreadPing(), 0);
+}
+
+void WebProcessProxy::didReceiveMainThreadPing()
+{
+    responsivenessTimer().stop();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -155 +155 @@
     void reinstateNetworkProcessAssertionState(NetworkProcessProxy&);
 
+    void sendMainThreadPing();
+    void didReceiveMainThreadPing();
+
 private:
     explicit WebProcessProxy(WebProcessPool&);

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

@@ -50 +50 @@
     RetainIconForPageURL(String pageURL)
     ReleaseIconForPageURL(String pageURL)
+
+    DidReceiveMainThreadPing()
 }

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -981 +981 @@
 }
 
+void WebProcess::mainThreadPing()
+{
+    parentProcessConnection()->send(Messages::WebProcessProxy::DidReceiveMainThreadPing(), 0);
+}
+
 void WebProcess::setJavaScriptGarbageCollectorTimerEnabled(bool flag)
 {

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -269 +269 @@
     void setJavaScriptGarbageCollectorTimerEnabled(bool flag);
 
+    void mainThreadPing();
+
     void releasePageCache();
 

trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

@@ -106 +106 @@
     CancelPrepareToSuspend()
     ProcessDidResume()
+
+    MainThreadPing()
 }