Title: [184384] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 184384
- Author
- [email protected]
- Date
- 2015-05-15 05:38:28 -0700 (Fri, 15 May 2015)
Log Message
Merge r184334 - [GTK] Add missing ENABLE(NETSCAPE_PLUGIN_API) build guards
https://bugs.webkit.org/show_bug.cgi?id=144994
Reviewed by Carlos Garcia Campos.
This fixes the build when configured with Netscape plugin API
support disabled.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkit_web_context_set_additional_plugins_directory):
(webkitWebContextGetPluginThread):
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (184383 => 184384)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-15 12:37:09 UTC (rev 184383)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-05-15 12:38:28 UTC (rev 184384)
@@ -1,3 +1,19 @@
+2015-05-14 Zan Dobersek <[email protected]>
+
+ [GTK] Add missing ENABLE(NETSCAPE_PLUGIN_API) build guards
+ https://bugs.webkit.org/show_bug.cgi?id=144994
+
+ Reviewed by Carlos Garcia Campos.
+
+ This fixes the build when configured with Netscape plugin API
+ support disabled.
+
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkit_web_context_set_additional_plugins_directory):
+ (webkitWebContextGetPluginThread):
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+
2015-05-12 Carlos Garcia Campos <[email protected]>
Unreviewed. Update OptionsGTK.cmake and NEWS for 2.8.2 release.
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (184383 => 184384)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-15 12:37:09 UTC (rev 184383)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-15 12:38:28 UTC (rev 184384)
@@ -671,7 +671,9 @@
g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
g_return_if_fail(directory);
+#if ENABLE(NETSCAPE_PLUGIN_API)
context->priv->context->setAdditionalPluginsDirectory(WebCore::filenameToString(directory));
+#endif
}
static void destroyPluginList(GList* plugins)
@@ -681,10 +683,12 @@
static void webkitWebContextGetPluginThread(GTask* task, gpointer object, gpointer /* taskData */, GCancellable*)
{
+ GList* returnValue = 0;
+#if ENABLE(NETSCAPE_PLUGIN_API)
Vector<PluginModuleInfo> plugins = WEBKIT_WEB_CONTEXT(object)->priv->context->pluginInfoStore().plugins();
- GList* returnValue = 0;
for (size_t i = 0; i < plugins.size(); ++i)
returnValue = g_list_prepend(returnValue, webkitPluginCreate(plugins[i]));
+#endif
g_task_return_pointer(task, returnValue, reinterpret_cast<GDestroyNotify>(destroyPluginList));
}
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (184383 => 184384)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2015-05-15 12:37:09 UTC (rev 184383)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2015-05-15 12:38:28 UTC (rev 184384)
@@ -65,6 +65,7 @@
case WebProcess:
executablePath = executablePathOfWebProcess();
break;
+#if ENABLE(NETSCAPE_PLUGIN_API)
case PluginProcess:
executablePath = executablePathOfPluginProcess();
#if ENABLE(PLUGIN_PROCESS_GTK2)
@@ -74,6 +75,7 @@
pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
realPluginPath = fileSystemRepresentation(pluginPath);
break;
+#endif
#if ENABLE(NETWORK_PROCESS)
case NetworkProcess:
executablePath = executablePathOfNetworkProcess();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
