Index: webkit/glue/plugins/plugin_list_mac.mm |
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm |
index e7a23375859904c12fdb211195ce98770048a24c..564897c8d8416b53f174c355d833c1f224aba8b7 100644 |
--- a/webkit/glue/plugins/plugin_list_mac.mm |
+++ b/webkit/glue/plugins/plugin_list_mac.mm |
@@ -97,9 +97,12 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info, |
// Hierarchy check |
// (we're loading plugins hierarchically from Library folders, so plugins we |
// encounter earlier must override plugins we encounter later) |
- for (size_t i = 0; i < plugins->size(); ++i) { |
- if ((*plugins)[i].path.BaseName() == info.path.BaseName()) { |
- return false; // We already have a loaded plugin higher in the hierarchy. |
+ for (std::vector<WebPluginInfo>::iterator it = plugins->begin(); |
jam
2010/12/17 19:14:45
please leave as before
pastarmovj
2010/12/20 19:57:37
Done.
|
+ it != plugins->end(); |
+ ++it) { |
+ if (it->path.BaseName() == info.path.BaseName()) { |
+ // We already have a loaded plugin higher in the hierarchy. |
+ return false; |
} |
} |