Changeset 84318 in webkit

Timestamp:

Apr 19, 2011 5:00:34 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-04-19 Anders Carlsson <​andersca@apple.com>

Reviewed by Sam Weinig.

UI process thinks the page is unresponsive when a plug-in is showing a context menu
​https://bugs.webkit.org/show_bug.cgi?id=58943
<rdar://problem/9299901>

Change the HandleMouseEvent message to have a delayed reply and make the PluginControllerProxy
respond to it immediately, before even passing the event to the plug-in. Since it doesn't matter
for mouse events whether the plug-in handled them or not we can do this.

Another solution could have been to make handleMouseEvent an asynchronous message, but that could
mess up the message ordering so this seemed like the least intrusive change.

• PluginProcess/PluginControllerProxy.cpp: (WebKit::PluginControllerProxy::handleMouseEvent):
• PluginProcess/PluginControllerProxy.h:
• PluginProcess/PluginControllerProxy.messages.in:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PluginProcess/PluginControllerProxy.cpp (modified) (1 diff)
• PluginProcess/PluginControllerProxy.h (modified) (2 diffs)
• PluginProcess/PluginControllerProxy.messages.in (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-19  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        UI process thinks the page is unresponsive when a plug-in is showing a context menu
+        https://bugs.webkit.org/show_bug.cgi?id=58943
+        <rdar://problem/9299901>
+
+        Change the HandleMouseEvent message to have a delayed reply and make the PluginControllerProxy
+        respond to it immediately, before even passing the event to the plug-in. Since it doesn't matter
+        for mouse events whether the plug-in handled them or not we can do this.
+
+        Another solution could have been to make handleMouseEvent an asynchronous message, but that could
+        mess up the message ordering so this seemed like the least intrusive change.
+
+        * PluginProcess/PluginControllerProxy.cpp:
+        (WebKit::PluginControllerProxy::handleMouseEvent):
+        * PluginProcess/PluginControllerProxy.h:
+        * PluginProcess/PluginControllerProxy.messages.in:
+
 2011-04-19  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.cpp

@@ -437 +437 @@
 }
     
-void PluginControllerProxy::handleMouseEvent(const WebMouseEvent& mouseEvent, bool& handled)
-{
-    handled = m_plugin->handleMouseEvent(mouseEvent);
+void PluginControllerProxy::handleMouseEvent(const WebMouseEvent& mouseEvent, PassRefPtr<Messages::PluginControllerProxy::HandleMouseEvent::DelayedReply> reply)
+{
+    // Always let the web process think that we've handled this mouse event, even before passing it along to the plug-in.
+    // This is a workaround for 
+    // <rdar://problem/9299901> UI process thinks the page is unresponsive when a plug-in is showing a context menu.
+    // The web process sends a synchronous HandleMouseEvent message and the plug-in process spawns a nested
+    // run loop when showing the context menu, so eventually the unresponsiveness timer kicks in in the UI process.
+    // FIXME: We should come up with a better way to do this.
+    reply->send(true);
+
+    m_plugin->handleMouseEvent(mouseEvent);
 }
 

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.h

@@ -32 +32 @@
 #include "Plugin.h"
 #include "PluginController.h"
+#include "PluginControllerProxyMessages.h"
 #include "RunLoop.h"
 #include "ShareableBitmap.h"
@@ -116 +117 @@
     void manualStreamDidFinishLoading();
     void manualStreamDidFail(bool wasCancelled);
-    void handleMouseEvent(const WebMouseEvent&, bool& handled);
+    void handleMouseEvent(const WebMouseEvent&, PassRefPtr<Messages::PluginControllerProxy::HandleMouseEvent::DelayedReply>);
     void handleWheelEvent(const WebWheelEvent&, bool& handled);
     void handleMouseEnterEvent(const WebMouseEvent&, bool& handled);

trunk/Source/WebKit2/PluginProcess/PluginControllerProxy.messages.in

@@ -61 +61 @@
 
     # Sent when a mouse event (that isn't a mouse enter/leave event or a wheel event) should be processed.
-    HandleMouseEvent(WebKit::WebMouseEvent mouseEvent) -> (bool handled)
+    HandleMouseEvent(WebKit::WebMouseEvent mouseEvent) -> (bool handled) Delayed
     
     # Sent when a mouse wheel event should be processed.