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 081f774ff31d576fe5b9fff5809112df081d0d49..c32eb6e315ecd64e6af8647956f02d9a0dd7e03d 100644 |
--- a/content/renderer/media/renderer_webmediaplayer_delegate.cc |
+++ b/content/renderer/media/renderer_webmediaplayer_delegate.cc |
@@ -19,18 +19,25 @@ RendererWebMediaPlayerDelegate::~RendererWebMediaPlayerDelegate() {} |
void RendererWebMediaPlayerDelegate::DidPlay(blink::WebMediaPlayer* player) { |
has_played_media_ = true; |
+ players_.insert(player); |
Send(new FrameHostMsg_MediaPlayingNotification( |
routing_id(), reinterpret_cast<int64_t>(player), player->hasVideo(), |
- player->hasAudio(), player->isRemote())); |
+ player->hasAudio(), player->isRemote(), |
+ base::TimeDelta::FromSecondsD(player->duration()))); |
} |
void RendererWebMediaPlayerDelegate::DidPause(blink::WebMediaPlayer* player) { |
+ DCHECK_EQ(players_.count(player), 1u); |
Send(new FrameHostMsg_MediaPausedNotification( |
- routing_id(), reinterpret_cast<int64_t>(player))); |
+ routing_id(), reinterpret_cast<int64_t>(player), |
+ player->currentTime() >= player->duration())); |
} |
void RendererWebMediaPlayerDelegate::PlayerGone(blink::WebMediaPlayer* player) { |
- DidPause(player); |
+ // No player may exist, so this might be a no-op. |
+ players_.erase(player); |
+ Send(new FrameHostMsg_MediaDestroyedNotification( |
+ routing_id(), reinterpret_cast<int64_t>(player))); |
} |
void RendererWebMediaPlayerDelegate::AddObserver(Observer* observer) { |
@@ -49,4 +56,37 @@ void RendererWebMediaPlayerDelegate::WasShown() { |
FOR_EACH_OBSERVER(Observer, observer_list_, OnShown()); |
} |
+bool RendererWebMediaPlayerDelegate::OnMessageReceived( |
+ const IPC::Message& msg) { |
+ bool handled = true; |
+ IPC_BEGIN_MESSAGE_MAP(RendererWebMediaPlayerDelegate, msg) |
+ IPC_MESSAGE_HANDLER(FrameMsg_MediaDelegatePause, OnMediaDelegatePause) |
+ IPC_MESSAGE_HANDLER(FrameMsg_MediaDelegatePlay, OnMediaDelegatePlay) |
+ IPC_MESSAGE_UNHANDLED(handled = false) |
+ IPC_END_MESSAGE_MAP() |
+ return handled; |
+} |
+ |
+void RendererWebMediaPlayerDelegate::OnMediaDelegatePause( |
+ int64_t player_cookie) { |
+ // Translate the player cookie back to a WebMediaPlayer instance and make sure |
+ // it's still a valid instance. |
+ blink::WebMediaPlayer* player = |
+ reinterpret_cast<blink::WebMediaPlayer*>(player_cookie); |
+ if (players_.find(player) == players_.end()) |
+ return; |
+ player->pause(); |
+} |
+ |
+void RendererWebMediaPlayerDelegate::OnMediaDelegatePlay( |
+ int64_t player_cookie) { |
+ // Translate the player cookie back to a WebMediaPlayer instance and make sure |
+ // it's still a valid instance. |
+ blink::WebMediaPlayer* player = |
+ reinterpret_cast<blink::WebMediaPlayer*>(player_cookie); |
+ if (players_.find(player) == players_.end()) |
+ return; |
+ player->play(); |
+} |
+ |
} // namespace media |