diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 21:06:16 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-24 21:06:16 +0000 |
| commit | 95e9507072023e073c06b109a222ea7b1f0e4f3b (patch) | |
| tree | c9f6faaf249b71bff024d4836cdfdf0f83b4da8b /content/browser/plugin_loader_posix.cc | |
| parent | e7a51bf1cb4d6047a0d1971bfa7b17fb1055ac2d (diff) | |
| download | chromium_src-95e9507072023e073c06b109a222ea7b1f0e4f3b.zip chromium_src-95e9507072023e073c06b109a222ea7b1f0e4f3b.tar.gz chromium_src-95e9507072023e073c06b109a222ea7b1f0e4f3b.tar.bz2 | |
Revert 106962 - Broke plugin_tests - [Linux] Load plugins out-of-process.
This also fixes a bug in PluginLoaderPosix where if the last N plugins in the
canonical list crash, the callbacks are never run.
BUG=17863
TEST=On Linux, plugins work as before.
Review URL: http://codereview.chromium.org/8372015
TBR=rsesek@chromium.org
Review URL: http://codereview.chromium.org/8351014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/plugin_loader_posix.cc')
| -rw-r--r-- | content/browser/plugin_loader_posix.cc | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/content/browser/plugin_loader_posix.cc b/content/browser/plugin_loader_posix.cc index a68e9fe..e27e543 100644 --- a/content/browser/plugin_loader_posix.cc +++ b/content/browser/plugin_loader_posix.cc @@ -45,7 +45,6 @@ void PluginLoaderPosix::OnProcessCrashed(int exit_code) { canonical_list_.erase(canonical_list_.begin(), canonical_list_.begin() + next_load_index_ + 1); next_load_index_ = 0; - LoadPluginsInternal(); } @@ -83,11 +82,6 @@ void PluginLoaderPosix::GetPluginsToLoad() { void PluginLoaderPosix::LoadPluginsInternal() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - // Check if the list is empty or all plugins have already been loaded before - // forking. - if (MaybeRunPendingCallbacks()) - return; - if (load_start_time_.is_null()) load_start_time_ = base::TimeTicks::Now(); @@ -112,7 +106,7 @@ void PluginLoaderPosix::OnPluginLoaded(const webkit::WebPluginInfo& plugin) { ++next_load_index_; - MaybeRunPendingCallbacks(); + RunPendingCallbacks(); } void PluginLoaderPosix::OnPluginLoadFailed(const FilePath& plugin_path) { @@ -125,7 +119,7 @@ void PluginLoaderPosix::OnPluginLoadFailed(const FilePath& plugin_path) { ++next_load_index_; MaybeAddInternalPlugin(plugin_path); - MaybeRunPendingCallbacks(); + RunPendingCallbacks(); } bool PluginLoaderPosix::MaybeAddInternalPlugin(const FilePath& plugin_path) { @@ -142,9 +136,9 @@ bool PluginLoaderPosix::MaybeAddInternalPlugin(const FilePath& plugin_path) { return false; } -bool PluginLoaderPosix::MaybeRunPendingCallbacks() { +void PluginLoaderPosix::RunPendingCallbacks() { if (next_load_index_ < canonical_list_.size()) - return false; + return; PluginList::Singleton()->SetPlugins(loaded_plugins_); for (std::vector<PendingCallback>::iterator it = callbacks_.begin(); @@ -159,8 +153,6 @@ bool PluginLoaderPosix::MaybeRunPendingCallbacks() { (base::TimeTicks::Now() - load_start_time_) * base::Time::kMicrosecondsPerMillisecond); load_start_time_ = base::TimeTicks(); - - return true; } PluginLoaderPosix::PendingCallback::PendingCallback( |