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

Unified Diff: content/renderer/media/renderer_webmediaplayer_delegate.cc

Issue 2367253007: Prevent reentrant cleanup events for idle delegates. (Closed)
Patch Set: Comments. Created 4 years, 3 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 | content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/renderer_webmediaplayer_delegate.cc
diff --git a/content/renderer/media/renderer_webmediaplayer_delegate.cc b/content/renderer/media/renderer_webmediaplayer_delegate.cc
index 2ae2b8bd2838c03dae8e2d1218572e4947b200c1..9660d423724adbd6f0294160d30c869a40ab6399 100644
--- a/content/renderer/media/renderer_webmediaplayer_delegate.cc
+++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc
@@ -220,9 +220,16 @@ void RendererWebMediaPlayerDelegate::RemoveIdleDelegate(int delegate_id) {
void RendererWebMediaPlayerDelegate::CleanupIdleDelegates(
base::TimeDelta timeout) {
+ // Drop reentrant cleanups which can occur during forced suspension when the
+ // number of idle delegates is too high for a given device.
+ if (idle_cleanup_running_)
+ return;
+
// Iterate over the delegates and suspend the idle ones. Note: The call to
- // OnHidden() can trigger calls into RemoveIdleDelegate(), so for iterator
- // validity we set |idle_cleanup_running_| to true and defer deletions.
+ // OnSuspendRequested() can trigger calls into RemoveIdleDelegate(), so for
+ // iterator validity we set |idle_cleanup_running_| to true and defer
+ // deletions.
+ DCHECK(!idle_cleanup_running_);
base::AutoReset<bool> scoper(&idle_cleanup_running_, true);
const base::TimeTicks now = tick_clock_->NowTicks();
for (auto& idle_delegate_entry : idle_delegate_map_) {
« no previous file with comments | « no previous file | content/renderer/media/renderer_webmediaplayer_delegate_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698