Changeset 88048 in webkit

Timestamp:

Jun 3, 2011 1:53:47 PM (13 years ago)

Author:

andersca@apple.com

Message:

2011-06-03 Anders Carlsson <​andersca@apple.com>

Reviewed by Brady Eidson.

Disable the sync message timeout for the Microsoft SharePoint plug-in
​https://bugs.webkit.org/show_bug.cgi?id=62043
<rdar://problem/9536303>

• WebProcess/Plugins/PluginProcessConnection.cpp: (WebKit::defaultSyncMessageTimeout):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnection.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-03  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Brady Eidson.
+
+        Disable the sync message timeout for the Microsoft SharePoint plug-in
+        https://bugs.webkit.org/show_bug.cgi?id=62043
+        <rdar://problem/9536303>
+
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::defaultSyncMessageTimeout):
+
 2011-06-03  Andreas Kling  <kling@webkit.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp

@@ -45 +45 @@
 static double defaultSyncMessageTimeout(const String& pluginPath)
 {
+    // FIXME: We should key this off something other than the path.
+
     // We don't want a message timeout for the AppleConnect plug-in.
-    // FIXME: We should key this off something other than the path.
     if (pathGetFileName(pluginPath) == "AppleConnect.plugin")
         return CoreIPC::Connection::NoTimeout;
 
+    // We don't want a message timeout for the Microsoft SharePoint plug-in
+    // since it can spin a nested run loop in response to an NPN_Invoke, making it seem like
+    // the plug-in process is hung. See <rdar://problem/9536303>.
+    // FIXME: Instead of changing the default sync message timeout, CoreIPC could send an
+    // asynchronous message which the other process would have to reply to on the main thread.
+    // This way we could check if the plug-in process is actually hung or not.
+    if (pathGetFileName(pluginPath) == "SharePointBrowserPlugin.plugin")
+        return CoreIPC::Connection::NoTimeout;
+    
     return syncMessageTimeout;
 }