diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 17:38:44 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-29 17:38:44 +0000 |
| commit | 480c7ccfaea656537cab2d7277d6b2368bc6ae33 (patch) | |
| tree | d6db3186fc44b6561ae86039c51bfcc10b9bcbeb /content/browser/plugin_service_impl.cc | |
| parent | 3f5d4a172849a480b253f3beac4c2dc241da443b (diff) | |
| download | chromium_src-480c7ccfaea656537cab2d7277d6b2368bc6ae33.zip chromium_src-480c7ccfaea656537cab2d7277d6b2368bc6ae33.tar.gz chromium_src-480c7ccfaea656537cab2d7277d6b2368bc6ae33.tar.bz2 | |
Change PluginList::GetPluginsIfNoRefreshNeeded() to GetPluginsNoRefresh().
This fixes a race condition in PluginServiceImpl, where we would get an empty plug-in list if it was stale (instead of simply using the stale version).
BUG=124780
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10700032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144925 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_service_impl.cc')
| -rw-r--r-- | content/browser/plugin_service_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/plugin_service_impl.cc b/content/browser/plugin_service_impl.cc index 9523b33..5a35037 100644 --- a/content/browser/plugin_service_impl.cc +++ b/content/browser/plugin_service_impl.cc @@ -486,7 +486,7 @@ bool PluginServiceImpl::GetPluginInfo(int render_process_id, bool PluginServiceImpl::GetPluginInfoByPath(const FilePath& plugin_path, webkit::WebPluginInfo* info) { std::vector<webkit::WebPluginInfo> plugins; - plugin_list_->GetPluginsIfNoRefreshNeeded(&plugins); + plugin_list_->GetPluginsNoRefresh(&plugins); for (std::vector<webkit::WebPluginInfo>::iterator it = plugins.begin(); it != plugins.end(); @@ -530,7 +530,7 @@ void PluginServiceImpl::GetPlugins(const GetPluginsCallback& callback) { base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); #elif defined(OS_POSIX) std::vector<webkit::WebPluginInfo> cached_plugins; - if (plugin_list_->GetPluginsIfNoRefreshNeeded(&cached_plugins)) { + if (plugin_list_->GetPluginsNoRefresh(&cached_plugins)) { // Can't assume the caller is reentrant. target_loop->PostTask(FROM_HERE, base::Bind(callback, cached_plugins)); |