Changeset 128774 in webkit
- Timestamp:
- Sep 17, 2012 10:53:38 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r128735 r128774 1 2012-09-17 Anders Carlsson <andersca@apple.com> 2 3 Don't load a blocked plug-in if a non-blocked version of the same plug-in exists 4 https://bugs.webkit.org/show_bug.cgi?id=96933 5 <rdar://problem/12206720> 6 7 Reviewed by Andreas Kling. 8 9 If a plug-in with the same bundle identifier already exists and it's blocked, remove it and replace it 10 with the other version. 11 12 * UIProcess/Plugins/mac/PluginInfoStoreMac.mm: 13 (WebKit::PluginInfoStore::shouldUsePlugin): 14 1 15 2012-09-17 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 16 -
trunk/Source/WebKit2/UIProcess/Plugins/mac/PluginInfoStoreMac.mm
r124799 r128774 116 116 117 117 // If a plug-in with the same bundle identifier already exists, we don't want to load it. 118 if (loadedPlugin.bundleIdentifier == plugin.bundleIdentifier) 119 return false; 118 // However, if the already existing plug-in is blocked we want to replace it with the new plug-in. 119 if (loadedPlugin.bundleIdentifier == plugin.bundleIdentifier) { 120 if (!shouldBlockPlugin(loadedPlugin)) 121 return false; 122 123 alreadyLoadedPlugins.remove(i); 124 break; 125 } 120 126 } 121 127
Note: See TracChangeset
for help on using the changeset viewer.