Title: [88289] branches/safari-534-branch/Source/WebKit2
Diff
Modified: branches/safari-534-branch/Source/WebKit2/ChangeLog (88288 => 88289)
--- branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-07 23:59:14 UTC (rev 88288)
+++ branches/safari-534-branch/Source/WebKit2/ChangeLog 2011-06-08 00:02:52 UTC (rev 88289)
@@ -1,3 +1,18 @@
+2011-06-07 Lucas Forschler <[email protected]>
+
+ Merged 88048.
+
+ 2011-06-03 Anders Carlsson <[email protected]>
+
+ 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 Lucas Forschler <[email protected]>
Merged 87839.
Modified: branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp (88288 => 88289)
--- branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-06-07 23:59:14 UTC (rev 88288)
+++ branches/safari-534-branch/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp 2011-06-08 00:02:52 UTC (rev 88289)
@@ -44,11 +44,21 @@
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;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
