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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 1814413002: Fix incorrect merge due to drover choosing pre-conflict version :/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/webmediaplayer_impl.cc
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 985ded9d77a023d4934d3d2316432c1497fd5ef8..c48e4bd9ddb092e00eff75e01a4f459cad89fcf0 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -957,13 +957,11 @@ void WebMediaPlayerImpl::OnPipelineSuspended(PipelineStatus status) {
}
#endif
- if (delegate_)
- delegate_->PlayerGone(delegate_id_);
memory_usage_reporting_timer_.Stop();
ReportMemoryUsage();
- if (pending_suspend_resume_cycle_) {
- pending_resume_ = false;
+ if (pending_resume_ || pending_suspend_resume_cycle_) {
+ pending_resume_ = false;
pending_suspend_resume_cycle_ = false;
Resume();
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698