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

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 564943002: Fix incorrect WebMediaPlayerDelegate notifications. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@psb
Patch Set: Fix comments. Created 6 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 | « content/renderer/media/android/webmediaplayer_android.cc ('k') | 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 0c5f8598c32d8c892b3410e819555cf87271c980..4d3af9c60ec9bb8c364552d8aa2cddf58139d70e 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -197,7 +197,7 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {
media_log_->AddEvent(
media_log_->CreateEvent(MediaLogEvent::WEBMEDIAPLAYER_DESTROYED));
- if (delegate_.get())
+ if (delegate_)
delegate_->PlayerGone(this);
// Abort any pending IO so stopping the pipeline doesn't get blocked.
@@ -281,7 +281,7 @@ void WebMediaPlayerImpl::play() {
media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::PLAY));
- if (delegate_.get())
+ if (delegate_ && playback_rate_ > 0)
delegate_->DidPlay(this);
}
@@ -289,6 +289,7 @@ void WebMediaPlayerImpl::pause() {
DVLOG(1) << __FUNCTION__;
DCHECK(main_task_runner_->BelongsToCurrentThread());
+ const bool was_already_paused = paused_ || playback_rate_ == 0;
paused_ = true;
pipeline_.SetPlaybackRate(0.0f);
if (data_source_)
@@ -297,7 +298,7 @@ void WebMediaPlayerImpl::pause() {
media_log_->AddEvent(media_log_->CreateEvent(MediaLogEvent::PAUSE));
- if (delegate_.get())
+ if (!was_already_paused && delegate_)
delegate_->DidPause(this);
}
@@ -357,6 +358,10 @@ void WebMediaPlayerImpl::setRate(double rate) {
rate = kMinRate;
else if (rate > kMaxRate)
rate = kMaxRate;
+ if (playback_rate_ == 0 && delegate_)
+ delegate_->DidPlay(this);
+ } else if (playback_rate_ != 0 && delegate_) {
+ delegate_->DidPause(this);
}
playback_rate_ = rate;
« no previous file with comments | « content/renderer/media/android/webmediaplayer_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698