diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 00:46:09 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-28 00:46:09 +0000 |
| commit | 6e1bb5bb9eeb62408eb2a1abb0aaff46762c1482 (patch) | |
| tree | 2b693bff6ad04c16f23c20e28afe7de996bb0e58 /content/utility | |
| parent | c5a70cfb661fdd26f3907ed5ac225584a1f406e8 (diff) | |
| download | chromium_src-6e1bb5bb9eeb62408eb2a1abb0aaff46762c1482.zip chromium_src-6e1bb5bb9eeb62408eb2a1abb0aaff46762c1482.tar.gz chromium_src-6e1bb5bb9eeb62408eb2a1abb0aaff46762c1482.tar.bz2 | |
revert 128949 (and dependent 129252)
Speculative, it might have caused a Morejs regression.
BUG=120273
TEST=none
TBR=bauerb
Review URL: http://codereview.chromium.org/9874001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/utility')
| -rw-r--r-- | content/utility/utility_thread_impl.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc index f1f7cc8..6b841aa 100644 --- a/content/utility/utility_thread_impl.cc +++ b/content/utility/utility_thread_impl.cc @@ -143,16 +143,19 @@ void UtilityThreadImpl::OnLoadPlugins( } #endif - ScopedVector<webkit::npapi::PluginGroup> plugin_groups; - // TODO(bauerb): If we restart loading plug-ins, we might mess up the logic in - // PluginList::ShouldLoadPlugin due to missing the previously loaded plug-ins - // in |plugin_groups|. for (size_t i = 0; i < plugin_paths.size(); ++i) { - webkit::WebPluginInfo plugin; - if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin)) + ScopedVector<webkit::npapi::PluginGroup> plugin_groups; + plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups); + + if (plugin_groups.empty()) { Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i])); - else - Send(new UtilityHostMsg_LoadedPlugin(i, plugin)); + continue; + } + + const webkit::npapi::PluginGroup* group = plugin_groups[0]; + DCHECK_EQ(group->web_plugin_infos().size(), 1u); + + Send(new UtilityHostMsg_LoadedPlugin(i, group->web_plugin_infos().front())); } ReleaseProcessIfNeeded(); |