Title: [131717] trunk/Source/WebKit2
- Revision
- 131717
- Author
- [email protected]
- Date
- 2012-10-18 01:51:19 -0700 (Thu, 18 Oct 2012)
Log Message
Add PluginProcessProxy::platformInitializeLaunchOptions
https://bugs.webkit.org/show_bug.cgi?id=99583
Patch by Jussi Kukkonen <[email protected]> on 2012-10-18
Reviewed by Sam Weinig.
Add a platform specific launch options initializer. This enables
fixing bug 99297 "[EFL] Make plugin process debugging easier
(PLUGIN_PROCESS_COMMAND_PREFIX)".
* UIProcess/Plugins/PluginProcessProxy.cpp:
(WebKit::PluginProcessProxy::PluginProcessProxy):
* UIProcess/Plugins/PluginProcessProxy.h:
(PluginProcessProxy):
* UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
(WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
(WebKit):
* UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
(WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
(WebKit):
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
(WebKit):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (131716 => 131717)
--- trunk/Source/WebKit2/ChangeLog 2012-10-18 08:38:19 UTC (rev 131716)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-18 08:51:19 UTC (rev 131717)
@@ -1,3 +1,28 @@
+2012-10-18 Jussi Kukkonen <[email protected]>
+
+ Add PluginProcessProxy::platformInitializeLaunchOptions
+ https://bugs.webkit.org/show_bug.cgi?id=99583
+
+ Reviewed by Sam Weinig.
+
+ Add a platform specific launch options initializer. This enables
+ fixing bug 99297 "[EFL] Make plugin process debugging easier
+ (PLUGIN_PROCESS_COMMAND_PREFIX)".
+
+ * UIProcess/Plugins/PluginProcessProxy.cpp:
+ (WebKit::PluginProcessProxy::PluginProcessProxy):
+ * UIProcess/Plugins/PluginProcessProxy.h:
+ (PluginProcessProxy):
+ * UIProcess/Plugins/mac/PluginProcessProxyMac.mm:
+ (WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
+ (WebKit):
+ * UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
+ (WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
+ (WebKit):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
+ (WebKit):
+
2012-10-18 Byungwoo Lee <[email protected]>
[WK2] Update test expectation for the python message test after r131700
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp (131716 => 131717)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2012-10-18 08:38:19 UTC (rev 131716)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.cpp 2012-10-18 08:51:19 UTC (rev 131717)
@@ -67,14 +67,9 @@
{
ProcessLauncher::LaunchOptions launchOptions;
launchOptions.processType = ProcessLauncher::PluginProcess;
-#if PLATFORM(MAC)
- launchOptions.architecture = pluginInfo.pluginArchitecture;
- launchOptions.executableHeap = PluginProcessProxy::pluginNeedsExecutableHeap(pluginInfo);
-#if HAVE(XPC)
- launchOptions.useXPC = false;
-#endif
-#endif
+ platformInitializeLaunchOptions(launchOptions, pluginInfo);
+
m_processLauncher = ProcessLauncher::create(this, launchOptions);
}
Modified: trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h (131716 => 131717)
--- trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2012-10-18 08:38:19 UTC (rev 131716)
+++ trunk/Source/WebKit2/UIProcess/Plugins/PluginProcessProxy.h 2012-10-18 08:51:19 UTC (rev 131717)
@@ -127,6 +127,7 @@
void applicationDidBecomeActive();
#endif
+ static void platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions&, const PluginModuleInfo& pluginInfo);
void platformInitializePluginProcess(PluginProcessCreationParameters& parameters);
// The plug-in host process manager.
Modified: trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm (131716 => 131717)
--- trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2012-10-18 08:38:19 UTC (rev 131716)
+++ trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginProcessProxyMac.mm 2012-10-18 08:51:19 UTC (rev 131717)
@@ -118,6 +118,15 @@
return true;
}
+void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
+{
+ launchOptions.architecture = pluginInfo.pluginArchitecture;
+ launchOptions.executableHeap = PluginProcessProxy::pluginNeedsExecutableHeap(pluginInfo);
+#if HAVE(XPC)
+ launchOptions.useXPC = false;
+#endif
+}
+
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters& parameters)
{
// For know only Flash is known to behave with asynchronous plug-in initialization.
Modified: trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp (131716 => 131717)
--- trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp 2012-10-18 08:38:19 UTC (rev 131716)
+++ trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp 2012-10-18 08:51:19 UTC (rev 131717)
@@ -51,6 +51,10 @@
class PluginProcessCreationParameters;
+void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
+{
+}
+
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters&)
{
}
Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (131716 => 131717)
--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2012-10-18 08:38:19 UTC (rev 131716)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2012-10-18 08:51:19 UTC (rev 131717)
@@ -43,6 +43,10 @@
namespace WebKit {
+void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
+{
+}
+
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters&)
{
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
