Changeset 92713 in webkit

Timestamp:

Aug 9, 2011, 2:52:55 PM (15 years ago)

Author:

andersca@apple.com

Message:

Add a user default to disable the plug-in process message timeout
​https://bugs.webkit.org/show_bug.cgi?id=65945

Reviewed by Adam Roben.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:

Add a disablePluginProcessMessageTimeout member variable.

• UIProcess/mac/WebContextMac.mm:

(WebKit::WebContext::platformInitializeWebProcess):
Initialize the disablePluginProcessMessageTimeout member variable from the
"DisablePluginProcessMessageTimeout" user default.

• WebProcess/Plugins/PluginProcessConnection.cpp:

(WebKit::defaultSyncMessageTimeout):
Return NoTimeout if WebProcess::disablePluginProcessMessageTimeout returns true.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeWebProcess):
Initialize m_disablePluginProcessMessageTimeout.

• WebProcess/WebProcess.h:

(WebKit::WebProcess::disablePluginProcessMessageTimeout):
Add getter.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/mac/WebContextMac.mm (modified) (1 diff)
• WebProcess/Plugins/PluginProcessConnection.cpp (modified) (1 diff)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-08-09  Anders Carlsson  <andersca@apple.com>
+
+        Add a user default to disable the plug-in process message timeout
+        https://bugs.webkit.org/show_bug.cgi?id=65945
+
+        Reviewed by Adam Roben.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        Add a disablePluginProcessMessageTimeout member variable.
+
+        * UIProcess/mac/WebContextMac.mm:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        Initialize the disablePluginProcessMessageTimeout member variable from the 
+        "DisablePluginProcessMessageTimeout" user default.
+
+        * WebProcess/Plugins/PluginProcessConnection.cpp:
+        (WebKit::defaultSyncMessageTimeout):
+        Return NoTimeout if WebProcess::disablePluginProcessMessageTimeout returns true.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        (WebKit::WebProcess::initializeWebProcess):
+        Initialize m_disablePluginProcessMessageTimeout.
+        
+        * WebProcess/WebProcess.h:
+        (WebKit::WebProcess::disablePluginProcessMessageTimeout):
+        Add getter.
+
 2011-08-09  Mark Hahnenberg  <mhahnenberg@apple.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -62 +62 @@
     encoder->encode(shouldAlwaysUseComplexTextCodePath);
     encoder->encode(iconDatabaseEnabled);
+#if ENABLE(PLUGIN_PROCESS)
+    encoder->encode(disablePluginProcessMessageTimeout);
+#endif
     encoder->encode(languageCode);
     encoder->encode(textCheckerState);
@@ -119 +122 @@
     if (!decoder->decode(parameters.iconDatabaseEnabled))
         return false;
+#if ENABLE(PLUGIN_PROCESS)
+    if (!decoder->decode(parameters.disablePluginProcessMessageTimeout))
+        return false;
+#endif
+
     if (!decoder->decode(parameters.languageCode))
         return false;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -71 +71 @@
     bool iconDatabaseEnabled;
 
+#if ENABLE(PLUGIN_PROCESS)
+    bool disablePluginProcessMessageTimeout;
+#endif
+
     String languageCode;
 

trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm

@@ -87 +87 @@
     ASSERT(!parameters.nsURLCachePath.isEmpty());
 
+#if ENABLE(PLUGIN_PROCESS)
+    parameters.disablePluginProcessMessageTimeout = [[NSUserDefaults standardUserDefaults] boolForKey:@"DisablePluginProcessMessageTimeout"];
+#endif
+
 #if USE(ACCELERATED_COMPOSITING) && HAVE(HOSTED_CORE_ANIMATION)
     mach_port_t renderServerPort = WKInitializeRenderServer();

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

@@ -63 +63 @@
     // 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;
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -135 +135 @@
     , m_geolocationManager(this)
     , m_iconDatabaseProxy(this)
+#if ENABLE(PLUGIN_PROCESS)
+    , m_disablePluginProcessMessageTimeout(false)
+#endif
 {
 #if USE(PLATFORM_STRATEGIES)
@@ -233 +236 @@
 #if USE(CFURLSTORAGESESSIONS)
     WebCore::ResourceHandle::setPrivateBrowsingStorageSessionIdentifierBase(parameters.uiProcessBundleIdentifier);
+#endif
+
+#if ENABLE(PLUGIN_PROCESS)
+    m_disablePluginProcessMessageTimeout = parameters.disablePluginProcessMessageTimeout;
 #endif
 }

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -127 +127 @@
 #if ENABLE(PLUGIN_PROCESS)
     PluginProcessConnectionManager& pluginProcessConnectionManager() { return m_pluginProcessConnectionManager; }
+    bool disablePluginProcessMessageTimeout() const { return m_disablePluginProcessMessageTimeout; }
 #endif
 
@@ -241 +242 @@
 #if ENABLE(PLUGIN_PROCESS)
     PluginProcessConnectionManager m_pluginProcessConnectionManager;
-#endif
+    bool m_disablePluginProcessMessageTimeout;
+#endif
+
 };