Changeset 141275 in webkit

Timestamp:

Jan 30, 2013 8:58:10 AM (11 years ago)

Author:

thiago.santos@intel.com

Message:

REGRESSION (r141051): Broke plugin support on non-Mac WebKit2 Ports
​https://bugs.webkit.org/show_bug.cgi?id=108182

Reviewed by Sam Weinig.

Source/WebKit2:

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):

LayoutTests:

Unskip failing tests.

• platform/efl-wk2/TestExpectations:
• platform/qt-5.0-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk2/TestExpectations (modified) (1 diff)
• LayoutTests/platform/qt-5.0-wk2/TestExpectations (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp (modified) (1 diff)
• Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (modified) (4 diffs)
• Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-30  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        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  <jussi.kukkonen@intel.com>
 

trunk/LayoutTests/platform/efl-wk2/TestExpectations

@@ -426 +426 @@
 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 ]

trunk/LayoutTests/platform/qt-5.0-wk2/TestExpectations

@@ -777 +777 @@
 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 ]

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-01-30  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        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  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp

@@ -104 +104 @@
     WebKit::ChildProcessInitializationParameters parameters;
     parameters.connectionIdentifier = identifier;
+    parameters.extraInitializationData.add("plugin-path", app.arguments().at(2));
 
     WebKit::PluginProcess::shared().initialize(parameters);

trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp

@@ -74 +74 @@
 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)
@@ -110 +109 @@
     WebKit::ChildProcessInitializationParameters parameters;
     parameters.connectionIdentifier = socket;
+    parameters.extraInitializationData.add("plugin-path", argv[2]);
 
     WebKit::PluginProcess::shared().initialize(parameters);

trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp

@@ -43 +43 @@
     }
 
-    CString executablePath;
+    CString executablePath, pluginPath;
     switch (m_launchOptions.processType) {
     case WebProcess:
@@ -51 +51 @@
     case PluginProcess:
         executablePath = executablePathOfPluginProcess().utf8();
+        pluginPath = m_launchOptions.extraInitializationData.get("plugin-path").utf8();
         break;
 #endif
@@ -64 +65 @@
     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();
     }
@@ -87 +89 @@
         }
 #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]);

trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp

@@ -84 +84 @@
     }
 
-    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;

trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp

@@ -113 +113 @@
 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()));
@@ -171 +173 @@
 #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);

trunk/Source/WebKit2/UIProcess/Plugins/qt/PluginProcessProxyQt.cpp

@@ -54 +54 @@
 void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
 {
+    launchOptions.extraInitializationData.add("plugin-path", pluginInfo.path);
 }
 

trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp

@@ -44 +44 @@
 namespace WebKit {
 
-void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo&)
+void PluginProcessProxy::platformInitializeLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions, const PluginModuleInfo& pluginInfo)
 {
 #if PLATFORM(EFL) && !defined(NDEBUG)
@@ -50 +50 @@
     if (commandPrefix && *commandPrefix)
         launchOptions.processCmdPrefix = String::fromUTF8(commandPrefix);
-#else
-    UNUSED_PARAM(launchOptions);
 #endif
+
+    launchOptions.extraInitializationData.add("plugin-path", pluginInfo.path);
 }