Changeset 83772 in webkit
- Timestamp:
- Apr 13, 2011 3:11:30 PM (13 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r83770 r83772 1 2011-04-13 Steve Falkenburg <sfalken@apple.com> 2 3 Reviewed by Adam Roben. 4 5 Follow-up to: WebKit2 will load two copies of the same plugin, but should not 6 https://bugs.webkit.org/show_bug.cgi?id=49075 7 8 Use pathGetFileName instead of Win32 PathFindFileNameW. 9 10 * UIProcess/Plugins/win/PluginInfoStoreWin.cpp: 11 (WebKit::PluginInfoStore::shouldUsePlugin): 12 1 13 2011-04-13 Sam Weinig <sam@webkit.org> 2 14 -
trunk/Source/WebKit2/UIProcess/Plugins/win/PluginInfoStoreWin.cpp
r83769 r83772 28 28 29 29 #include "NetscapePluginModule.h" 30 #include <WebCore/FileSystem.h> 30 31 #include <WebCore/PathWalker.h> 31 32 #include <shlwapi.h> … … 393 394 // FIXME: We should prefer a newer version of a plugin to an older version, rather than loading 394 395 // only the first. <http://webkit.org/b/58469> 395 String pluginPath = plugin.path; 396 String pluginFileName(::PathFindFileNameW(pluginPath.charactersWithNullTermination())); 396 String pluginFileName = pathGetFileName(plugin.path); 397 397 for (size_t i = 0; i < m_plugins.size(); ++i) { 398 398 Plugin& loadedPlugin = m_plugins[i]; 399 399 400 400 // If a plug-in with the same filename already exists, we don't want to load it. 401 String loadedPluginFileName(::PathFindFileNameW(loadedPlugin.path.charactersWithNullTermination())); 402 if (equalIgnoringCase(pluginFileName, loadedPluginFileName)) 401 if (equalIgnoringCase(pluginFileName, pathGetFileName(loadedPlugin.path))) 403 402 return false; 404 403 }
Note: See TracChangeset
for help on using the changeset viewer.