Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

1 files changed, 0 insertions, 37 deletions

diff --git a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
index 3fe4d0b6c..fdb7e5e1f 100644
--- a/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
+++ b/Source/WebKit2/WebProcess/Plugins/PluginProcessConnection.cpp
@@ -41,37 +41,6 @@ using namespace WebCore;
 
 namespace WebKit {
 
-// The timeout, in seconds, when sending sync messages to the plug-in.
-static const double syncMessageTimeout = 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.
-    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;
-
-    // We don't want a message timeout for the BankID plug-in since it can spin a nested
-    // run loop when it's waiting for a reply to an AppleEvent.
-    if (pathGetFileName(pluginPath) == "PersonalPlugin.bundle")
-        return CoreIPC::Connection::NoTimeout;
-
-    if (WebProcess::shared().disablePluginProcessMessageTimeout())
-        return CoreIPC::Connection::NoTimeout;
-
-    return syncMessageTimeout;
-}
-
 PluginProcessConnection::PluginProcessConnection(PluginProcessConnectionManager* pluginProcessConnectionManager, const String& pluginPath, CoreIPC::Connection::Identifier connectionIdentifier, bool supportsAsynchronousPluginInitialization)
     : m_pluginProcessConnectionManager(pluginProcessConnectionManager)
     , m_pluginPath(pluginPath)
@@ -79,7 +48,6 @@ PluginProcessConnection::PluginProcessConnection(PluginProcessConnectionManager*
 {
     m_connection = CoreIPC::Connection::createClientConnection(connectionIdentifier, this, WebProcess::shared().runLoop());
 
-    m_connection->setDefaultSyncMessageTimeout(defaultSyncMessageTimeout(m_pluginPath));
     m_npRemoteObjectMap = NPRemoteObjectMap::create(m_connection.get());
 
     m_connection->open();
@@ -165,11 +133,6 @@ void PluginProcessConnection::didReceiveInvalidMessage(CoreIPC::Connection*, Cor
 {
 }
 
-void PluginProcessConnection::syncMessageSendTimedOut(CoreIPC::Connection*)
-{
-    WebProcess::shared().connection()->send(Messages::WebProcessProxy::PluginSyncMessageSendTimedOut(m_pluginPath), 0);
-}
-
 void PluginProcessConnection::setException(const String& exceptionString)
 {
     NPRuntimeObjectMap::setGlobalException(exceptionString);