Title: [201749] trunk/Source/WebKit2
- Revision
- 201749
- Author
- mcatanz...@igalia.com
- Date
- 2016-06-07 07:12:54 -0700 (Tue, 07 Jun 2016)
Log Message
[GTK] Hide GTK+ 2 plugins if GTK+ 2 plugin process was built but is not installed
https://bugs.webkit.org/show_bug.cgi?id=158419
Reviewed by Carlos Garcia Campos.
* UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
(WebKit::PluginInfoStore::getPluginInfo):
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::scanPlugin):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (201748 => 201749)
--- trunk/Source/WebKit2/ChangeLog 2016-06-07 12:43:21 UTC (rev 201748)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-07 14:12:54 UTC (rev 201749)
@@ -1,3 +1,17 @@
+2016-06-07 Michael Catanzaro <mcatanz...@igalia.com>
+
+ [GTK] Hide GTK+ 2 plugins if GTK+ 2 plugin process was built but is not installed
+ https://bugs.webkit.org/show_bug.cgi?id=158419
+
+ Reviewed by Carlos Garcia Campos.
+
+ Patch by Alberto Garcia <be...@igalia.com>
+
+ * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
+ (WebKit::PluginInfoStore::getPluginInfo):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+
2016-06-06 Antoine Quint <grao...@apple.com>
Position of WebGL <canvas> on iOS is incorrect with CSS borders
Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (201748 => 201749)
--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2016-06-07 12:43:21 UTC (rev 201748)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2016-06-07 14:12:54 UTC (rev 201749)
@@ -33,6 +33,7 @@
#include "NetscapePluginModule.h"
#include "PluginSearchPath.h"
+#include "ProcessExecutablePath.h"
#include <WebCore/FileSystem.h>
#if PLATFORM(GTK)
@@ -69,8 +70,17 @@
bool PluginInfoStore::getPluginInfo(const String& pluginPath, PluginModuleInfo& plugin)
{
#if PLATFORM(GTK)
- if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin))
+ if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) {
+#if ENABLE(PLUGIN_PROCESS_GTK2)
+ if (plugin.requiresGtk2) {
+ String pluginProcessPath = executablePathOfPluginProcess();
+ pluginProcessPath.append('2');
+ if (!fileExists(pluginProcessPath))
+ return false;
+ }
+#endif
return true;
+ }
if (NetscapePluginModule::getPluginInfo(pluginPath, plugin)) {
PluginInfoCache::singleton().updatePluginInfo(pluginPath, plugin);
Modified: trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (201748 => 201749)
--- trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2016-06-07 12:43:21 UTC (rev 201748)
+++ trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2016-06-07 14:12:54 UTC (rev 201749)
@@ -83,12 +83,15 @@
#if PLATFORM(GTK)
bool requiresGtk2 = pluginRequiresGtk2(pluginPath);
- if (requiresGtk2)
+ if (requiresGtk2) {
#if ENABLE(PLUGIN_PROCESS_GTK2)
pluginProcessPath.append('2');
+ if (!fileExists(pluginProcessPath))
+ return false;
#else
return false;
#endif
+ }
#endif
CString binaryPath = fileSystemRepresentation(pluginProcessPath);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
