Diff
Modified: trunk/LayoutTests/ChangeLog (141274 => 141275)
--- trunk/LayoutTests/ChangeLog 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/LayoutTests/ChangeLog 2013-01-30 16:58:10 UTC (rev 141275)
@@ -1,3 +1,15 @@
+2013-01-30 Thiago Marcos P. Santos <[email protected]>
+
+ REGRESSION (r141051): Broke plugin support on non-Mac WebKit2 Ports
+ https://bugs.webkit.org/show_bug.cgi?id=108182
+
+ Reviewed by Sam Weinig.
+
+ Unskip failing tests.
+
+ * platform/efl-wk2/TestExpectations:
+ * platform/qt-5.0-wk2/TestExpectations:
+
2013-01-30 Jussi Kukkonen <[email protected]>
[EFL] Unreviewed gardening
Modified: trunk/LayoutTests/platform/efl-wk2/TestExpectations (141274 => 141275)
--- trunk/LayoutTests/platform/efl-wk2/TestExpectations 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/LayoutTests/platform/efl-wk2/TestExpectations 2013-01-30 16:58:10 UTC (rev 141275)
@@ -425,26 +425,5 @@
webkit.org/b/107286 fast/css/sticky/sticky-side-margins.html [ ImageOnlyFailure ]
webkit.org/b/107286 fast/css/sticky/replaced-sticky.html [ ImageOnlyFailure ]
-# Broken after r141051.
-webkit.org/b/108182 fast/frames/sandboxed-iframe-about-blank.html [ Skip ]
-webkit.org/b/108182 fast/frames/sandboxed-iframe-navigation-allowed.html [ Skip ]
-webkit.org/b/108182 fast/js/regress/integer-modulo.html [ Skip ]
-webkit.org/b/108182 fast/replaced/invalid-object-with-fallback.html [ Skip ]
-webkit.org/b/108182 http/tests/plugins [ Skip ]
-webkit.org/b/108182 http/tests/security/contentSecurityPolicy/object-src-none-allowed.html [ Skip ]
-webkit.org/b/108182 http/tests/security/cross-origin-plugin-allowed.html [ Skip ]
-webkit.org/b/108182 http/tests/security/cross-origin-plugin-private-browsing-toggled-allowed.html [ Skip ]
-webkit.org/b/108182 http/tests/security/storage-blocking-loosened-plugin.html [ Skip ]
-webkit.org/b/108182 http/tests/security/storage-blocking-loosened-private-browsing-plugin.html [ Skip ]
-webkit.org/b/108182 plugins [ Skip ]
-webkit.org/b/108182 fast/loader/reload-zero-byte-plugin.html [ Skip ]
-webkit.org/b/108182 fast/frames/iframe-plugin-load-remove-document-crash.html [ Skip ]
-webkit.org/b/108182 fast/replaced/no-focus-ring-object.html [ Skip ]
-webkit.org/b/108182 fast/replaced/object-with-embed-url-param.html [ Skip ]
-webkit.org/b/108182 fast/replaced/no-focus-ring-embed.html [ Skip ]
-webkit.org/b/108182 http/tests/plugins/post-url-file.html [ Skip ]
-webkit.org/b/108182 http/tests/plugins/plugin-document-has-focus.html [ Skip ]
-webkit.org/b/108182 compositing/plugins/small-to-large-composited-plugin.html [ Skip ]
-
# New ruby selection test (in r140613) fails to render correctly, not generating an expected result
webkit.org/b/108315 fast/ruby/select-ruby.html [ Missing ]
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations (141274 => 141275)
--- trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations 2013-01-30 16:58:10 UTC (rev 141275)
@@ -776,9 +776,3 @@
svg/text/select-textLength-spacing-stretch-1.svg
svg/text/select-x-list-with-tspans-1.svg
svg/text/select-x-list-1.svg
-
-# [WK2] REGRESSION (r141051): Broke plugin support on non-Mac WebKit2 Ports
-webkit.org/b/108182 plugins [ Skip ]
-webkit.org/b/108182 fast/frames/sandboxed-iframe-about-blank.html [ Skip ]
-webkit.org/b/108182 fast/frames/sandboxed-iframe-navigation-allowed.html [ Skip ]
-webkit.org/b/108182 fast/replaced/invalid-object-with-fallback.html [ Skip ]
Modified: trunk/Source/WebKit2/ChangeLog (141274 => 141275)
--- trunk/Source/WebKit2/ChangeLog 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-30 16:58:10 UTC (rev 141275)
@@ -1,3 +1,27 @@
+2013-01-30 Thiago Marcos P. Santos <[email protected]>
+
+ REGRESSION (r141051): Broke plugin support on non-Mac WebKit2 Ports
+ https://bugs.webkit.org/show_bug.cgi?id=108182
+
+ Reviewed by Sam Weinig.
+
+ Send the plugin path to the PluginProcess as a parameter.
+
+ * PluginProcess/qt/PluginProcessMainQt.cpp:
+ (WebKit::PluginProcessMain):
+ * PluginProcess/unix/PluginProcessMainUnix.cpp:
+ (WebKit::PluginProcessMainUnix):
+ * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/Plugins/qt/PluginProcessProxyQt.cpp:
+ (WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::platformInitializeLaunchOptions):
+
2013-01-30 Christophe Dumez <[email protected]>
[EFL][WK2] Use C API inside ewk_window_features
Modified: trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp (141274 => 141275)
--- trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -103,6 +103,7 @@
WebKit::ChildProcessInitializationParameters parameters;
parameters.connectionIdentifier = identifier;
+ parameters.extraInitializationData.add("plugin-path", app.arguments().at(2));
WebKit::PluginProcess::shared().initialize(parameters);
Modified: trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp (141274 => 141275)
--- trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -73,9 +73,8 @@
WK_EXPORT int PluginProcessMainUnix(int argc, char* argv[])
{
- ASSERT_UNUSED(argc, argc == 2 || argc == 3);
bool scanPlugin = !strcmp(argv[1], "-scanPlugin");
- ASSERT_UNUSED(argc, argc == 2 || (argc == 3 && scanPlugin));
+ ASSERT_UNUSED(argc, argc == 3);
#if PLATFORM(GTK)
gtk_init(&argc, &argv);
@@ -109,6 +108,7 @@
WebKit::ChildProcessInitializationParameters parameters;
parameters.connectionIdentifier = socket;
+ parameters.extraInitializationData.add("plugin-path", argv[2]);
WebKit::PluginProcess::shared().initialize(parameters);
Modified: trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (141274 => 141275)
--- trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -42,7 +42,7 @@
return;
}
- CString executablePath;
+ CString executablePath, pluginPath;
switch (m_launchOptions.processType) {
case WebProcess:
executablePath = executablePathOfWebProcess().utf8();
@@ -50,6 +50,7 @@
#if ENABLE(PLUGIN_PROCESS)
case PluginProcess:
executablePath = executablePathOfPluginProcess().utf8();
+ pluginPath = m_launchOptions.extraInitializationData.get("plugin-path").utf8();
break;
#endif
default:
@@ -63,7 +64,8 @@
#ifndef NDEBUG
CString prefixedExecutablePath;
if (!m_launchOptions.processCmdPrefix.isEmpty()) {
- String prefixedExecutablePathStr = m_launchOptions.processCmdPrefix + ' ' + String::fromUTF8(executablePath.data()) + ' ' + socket;
+ String prefixedExecutablePathStr = m_launchOptions.processCmdPrefix + ' ' +
+ String::fromUTF8(executablePath.data()) + ' ' + socket + ' ' + String::fromUTF8(pluginPath.data());
prefixedExecutablePath = prefixedExecutablePathStr.utf8();
}
#endif
@@ -86,7 +88,7 @@
exit(EXIT_SUCCESS);
}
#endif
- execl(executablePath.data(), executablePath.data(), socket, static_cast<char*>(0));
+ execl(executablePath.data(), executablePath.data(), socket, pluginPath.data(), static_cast<char*>(0));
} else if (pid > 0) { // parent process;
close(sockets[0]);
m_processIdentifier = pid;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (141274 => 141275)
--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -83,14 +83,23 @@
return;
}
- String executablePath = m_launchOptions.processType == WebProcess ?
- executablePathOfWebProcess() : executablePathOfPluginProcess();
- CString binaryPath = fileSystemRepresentation(executablePath);
+ String executablePath, pluginPath;
+ CString realExecutablePath, realPluginPath;
+ if (m_launchOptions.processType == WebProcess)
+ executablePath = executablePathOfWebProcess();
+ else {
+ executablePath = executablePathOfPluginProcess();
+ pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
+ realPluginPath = fileSystemRepresentation(pluginPath);
+ }
+
+ realExecutablePath = fileSystemRepresentation(executablePath);
GOwnPtr<gchar> socket(g_strdup_printf("%d", sockets[0]));
- char* argv[3];
- argv[0] = const_cast<char*>(binaryPath.data());
+ char* argv[4];
+ argv[0] = const_cast<char*>(realExecutablePath.data());
argv[1] = socket.get();
- argv[2] = 0;
+ argv[2] = const_cast<char*>(realPluginPath.data());
+ argv[3] = 0;
GOwnPtr<GError> error;
int spawnFlags = G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_DO_NOT_REAP_CHILD;
Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (141274 => 141275)
--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -112,12 +112,14 @@
void ProcessLauncher::launchProcess()
{
- QString commandLine = QLatin1String("%1 %2 %3");
+ QString commandLine;
if (m_launchOptions.processType == WebProcess) {
+ commandLine = QLatin1String("%1 %2 %3");
QByteArray webProcessPrefix = qgetenv("QT_WEBKIT2_WP_CMD_PREFIX");
commandLine = commandLine.arg(QLatin1String(webProcessPrefix.constData())).arg(QString(executablePathOfWebProcess()));
#if ENABLE(PLUGIN_PROCESS)
} else if (m_launchOptions.processType == PluginProcess) {
+ commandLine = QLatin1String("%1 %2 %3 %4");
QByteArray pluginProcessPrefix = qgetenv("QT_WEBKIT2_PP_CMD_PREFIX");
commandLine = commandLine.arg(QLatin1String(pluginProcessPrefix.constData())).arg(QString(executablePathOfPluginProcess()));
#endif
@@ -170,6 +172,11 @@
commandLine = commandLine.arg(sockets[0]);
#endif
+#if ENABLE(PLUGIN_PROCESS)
+ if (m_launchOptions.processType == PluginProcess)
+ commandLine = commandLine.arg(QString(m_launchOptions.extraInitializationData.get("plugin-path")));
+#endif
+
QProcess* webProcessOrSUIDHelper = new QtWebProcess();
webProcessOrSUIDHelper->setProcessChannelMode(QProcess::ForwardedChannels);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp (141274 => 141275)
--- trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -53,6 +53,7 @@
void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
{
+ launchOptions.extraInitializationData.add("plugin-path", pluginInfo.path);
}
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters&)
Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (141274 => 141275)
--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2013-01-30 16:52:41 UTC (rev 141274)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2013-01-30 16:58:10 UTC (rev 141275)
@@ -43,15 +43,15 @@
namespace WebKit {
-void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo&)
+void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
{
#if PLATFORM(EFL) && !defined(NDEBUG)
const char* commandPrefix = getenv("PLUGIN_PROCESS_COMMAND_PREFIX");
if (commandPrefix && *commandPrefix)
launchOptions.processCmdPrefix = String::fromUTF8(commandPrefix);
-#else
- UNUSED_PARAM(launchOptions);
#endif
+
+ launchOptions.extraInitializationData.add("plugin-path", pluginInfo.path);
}
void PluginProcessProxy::platformInitializePluginProcess(PluginProcessCreationParameters&)