[webkit-changes] [131884] trunk/Source/WebKit2

Fri, 19 Oct 2012 03:08:57 -0700

Title: [131884] trunk/Source/WebKit2
Revision
131884
Author
[email protected]
Date
2012-10-19 03:10:13 -0700 (Fri, 19 Oct 2012)

Log Message

REGRESSION(r131844): It broke the build on !ENABLE(NETSCAPE_PLUGIN_API) platforms
https://bugs.webkit.org/show_bug.cgi?id=99820

Reviewed by Jocelyn Turcotte.

* UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
(WebKit::ProcessLauncher::launchProcess): Add missing ENABLE(PLUGIN_PROCESS) guard.
* UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: The whole file should be ENABLE(NETSCAPE_PLUGIN_API) guarded as the PluginInfoStore class.
(WebKit::PluginInfoStore::getPluginInfo):
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createPlugin): Eliminate the unused webPage variable (build fail with -Werror) if !(PLATFORM(MAC)||ENABLE(NETSCAPE_PLUGIN_API)).

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (131883 => 131884)


--- trunk/Source/WebKit2/ChangeLog	2012-10-19 10:09:09 UTC (rev 131883)
+++ trunk/Source/WebKit2/ChangeLog	2012-10-19 10:10:13 UTC (rev 131884)
@@ -1,3 +1,17 @@
+2012-10-19  Csaba Osztrogonác  <[email protected]>
+
+        REGRESSION(r131844): It broke the build on !ENABLE(NETSCAPE_PLUGIN_API) platforms
+        https://bugs.webkit.org/show_bug.cgi?id=99820
+
+        Reviewed by Jocelyn Turcotte.
+
+        * UIProcess/Launcher/qt/ProcessLauncherQt.cpp:
+        (WebKit::ProcessLauncher::launchProcess): Add missing ENABLE(PLUGIN_PROCESS) guard.
+        * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: The whole file should be ENABLE(NETSCAPE_PLUGIN_API) guarded as the PluginInfoStore class.
+        (WebKit::PluginInfoStore::getPluginInfo):
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::createPlugin): Eliminate the unused webPage variable (build fail with -Werror) if !(PLATFORM(MAC)||ENABLE(NETSCAPE_PLUGIN_API)).
+
 2012-10-19  Huang Dongsung  <[email protected]>
 
         Build fix after r131741 for !ENABLE(CSS_SHADERS) platforms.

Modified: trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp (131883 => 131884)


--- trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp	2012-10-19 10:09:09 UTC (rev 131883)
+++ trunk/Source/WebKit2/UIProcess/Launcher/qt/ProcessLauncherQt.cpp	2012-10-19 10:10:13 UTC (rev 131884)
@@ -113,9 +113,11 @@
     if (m_launchOptions.processType == WebProcess) {
         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) {
         QByteArray pluginProcessPrefix = qgetenv("QT_WEBKIT2_PP_CMD_PREFIX");
         commandLine = commandLine.arg(QLatin1String(pluginProcessPrefix.constData())).arg(QString(executablePathOfPluginProcess()));
+#endif
     } else
         ASSERT_NOT_REACHED();

Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (131883 => 131884)


--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp	2012-10-19 10:09:09 UTC (rev 131883)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp	2012-10-19 10:10:13 UTC (rev 131884)
@@ -26,6 +26,9 @@
 // Note: this file is only for UNIX. On other platforms we can reuse the native implementation.
 
 #include "config.h"
+
+#if ENABLE(NETSCAPE_PLUGIN_API)
+
 #include "PluginInfoStore.h"
 
 #include "NetscapePluginModule.h"
@@ -95,13 +98,7 @@
 
 bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
 {
-#if ENABLE(NETSCAPE_PLUGIN_API)
     return NetscapePluginModule::getPluginInfo(pluginPath, plugin);
-#else
-    UNUSED_PARAM(pluginPath);
-    UNUSED_PARAM(plugin);
-    return false;
-#endif
 }
 
 bool PluginInfoStore::shouldUsePlugin(Vector<PluginModuleInfo>& /*alreadyLoadedPlugins*/, const PluginModuleInfo& /*plugin*/)
@@ -111,3 +108,5 @@
 }
 
 } // namespace WebKit
+
+#endif // ENABLE(NETSCAPE_PLUGIN_API)

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (131883 => 131884)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2012-10-19 10:09:09 UTC (rev 131883)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp	2012-10-19 10:10:13 UTC (rev 131884)
@@ -1314,10 +1314,8 @@
 PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize&, HTMLPlugInElement* pluginElement, const KURL& url, const Vector<String>& paramNames, const Vector<String>& paramValues, const String& mimeType, bool loadManually)
 {
     ASSERT(paramNames.size() == paramValues.size());
-    
-    WebPage* webPage = m_frame->page();
-    ASSERT(webPage);
-    
+    ASSERT(m_frame->page());
+
     Plugin::Parameters parameters;
     parameters.url = ""
     parameters.names = paramNames;
@@ -1326,7 +1324,7 @@
     parameters.isFullFramePlugin = loadManually;
     parameters.shouldUseManualLoader = parameters.isFullFramePlugin && !m_frameCameFromPageCache;
 #if PLATFORM(MAC)
-    parameters.layerHostingMode = webPage->layerHostingMode();
+    parameters.layerHostingMode = m_frame->page()->layerHostingMode();
 #endif
 
 #if PLUGIN_ARCHITECTURE(X11)
@@ -1347,7 +1345,7 @@
 #endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
-    RefPtr<Plugin> plugin = webPage->createPlugin(m_frame, pluginElement, parameters);
+    RefPtr<Plugin> plugin = m_frame->page()->createPlugin(m_frame, pluginElement, parameters);
     if (!plugin)
         return 0;
 

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to