Changeset 201749 in webkit
- Timestamp:
- Jun 7, 2016 7:12:54 AM (8 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r201727 r201749 1 2016-06-07 Michael Catanzaro <mcatanzaro@igalia.com> 2 3 [GTK] Hide GTK+ 2 plugins if GTK+ 2 plugin process was built but is not installed 4 https://bugs.webkit.org/show_bug.cgi?id=158419 5 6 Reviewed by Carlos Garcia Campos. 7 8 Patch by Alberto Garcia <berto@igalia.com> 9 10 * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp: 11 (WebKit::PluginInfoStore::getPluginInfo): 12 * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp: 13 (WebKit::PluginProcessProxy::scanPlugin): 14 1 15 2016-06-06 Antoine Quint <graouts@apple.com> 2 16 -
trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp
r186810 r201749 34 34 #include "NetscapePluginModule.h" 35 35 #include "PluginSearchPath.h" 36 #include "ProcessExecutablePath.h" 36 37 #include <WebCore/FileSystem.h> 37 38 … … 70 71 { 71 72 #if PLATFORM(GTK) 72 if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) 73 if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) { 74 #if ENABLE(PLUGIN_PROCESS_GTK2) 75 if (plugin.requiresGtk2) { 76 String pluginProcessPath = executablePathOfPluginProcess(); 77 pluginProcessPath.append('2'); 78 if (!fileExists(pluginProcessPath)) 79 return false; 80 } 81 #endif 73 82 return true; 83 } 74 84 75 85 if (NetscapePluginModule::getPluginInfo(pluginPath, plugin)) { -
trunk/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp
r199002 r201749 84 84 #if PLATFORM(GTK) 85 85 bool requiresGtk2 = pluginRequiresGtk2(pluginPath); 86 if (requiresGtk2) 86 if (requiresGtk2) { 87 87 #if ENABLE(PLUGIN_PROCESS_GTK2) 88 88 pluginProcessPath.append('2'); 89 if (!fileExists(pluginProcessPath)) 90 return false; 89 91 #else 90 92 return false; 91 93 #endif 94 } 92 95 #endif 93 96
Note: See TracChangeset
for help on using the changeset viewer.