Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(813)

Unified Diff: webkit/plugins/npapi/plugin_list_win.cc

Issue 17543004: Allow the same version plugin to be loaded multiple times on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/plugin_list_win.cc
diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc
index e8b7b03979142cebb25529867ffc241bff648a8a..fc40d862a5aabb845ef83e9151fc2ff1304eaeca 100644
--- a/webkit/plugins/npapi/plugin_list_win.cc
+++ b/webkit/plugins/npapi/plugin_list_win.cc
@@ -390,8 +390,8 @@ bool PluginList::ShouldLoadPluginUsingPluginList(
if ((plugin1 == plugin2 && HaveSharedMimeType((*plugins)[j], info)) ||
(plugin1 == kJavaDeploy1 && plugin2 == kJavaDeploy2) ||
(plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
- if (!IsNewerVersion((*plugins)[j].version, info.version))
- return false; // We have loaded a plugin whose version is newer.
+ if (IsNewerVersion(info.version, (*plugins)[j].version))
+ return false; // We have already loaded a plugin with newer version.
Bernhard Bauer 2013/06/21 09:34:12 Tried to get this into 80 columns, didn'tcha? It's
pastarmovj 2013/06/21 11:20:20 Darn! Reverted that change :)
plugins->erase(plugins->begin() + j);
break;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698