Index: content/browser/media/media_web_contents_observer.cc |
diff --git a/content/browser/media/media_web_contents_observer.cc b/content/browser/media/media_web_contents_observer.cc |
index 67ef0368680e8d6be542d65dd5b9f43a857ffd01..2dbe6cf0999af002be728ce61f58ff4a8b7fc8f1 100644 |
--- a/content/browser/media/media_web_contents_observer.cc |
+++ b/content/browser/media/media_web_contents_observer.cc |
@@ -64,6 +64,8 @@ bool MediaWebContentsObserver::OnMessageReceived( |
// TODO(dalecurtis): These should no longer be FrameHostMsg. |
IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(MediaWebContentsObserver, msg, |
render_frame_host) |
+ IPC_MESSAGE_HANDLER(FrameHostMsg_MediaDestroyedNotification, |
+ OnMediaDestroyedNotification) |
IPC_MESSAGE_HANDLER(FrameHostMsg_MediaPlayingNotification, |
OnMediaPlayingNotification) |
IPC_MESSAGE_HANDLER(FrameHostMsg_MediaPausedNotification, |
@@ -73,12 +75,32 @@ bool MediaWebContentsObserver::OnMessageReceived( |
return handled; |
} |
+void MediaWebContentsObserver::WasShown() { |
+ // Restore power save blocker if there are active video players running. |
+ if (!active_video_players_.empty() && !video_power_save_blocker_) |
+ CreateVideoPowerSaveBlocker(); |
+} |
+ |
+void MediaWebContentsObserver::WasHidden() { |
+ // If there are entities capturing screenshots or video (e.g., mirroring), |
+ // don't release the power save blocker. |
+ if (!web_contents()->GetCapturerCount()) |
+ video_power_save_blocker_.reset(); |
+} |
+ |
+void MediaWebContentsObserver::OnMediaDestroyedNotification( |
+ RenderFrameHost* render_frame_host, |
+ int64_t player_cookie) { |
+ OnMediaPausedNotification(render_frame_host, player_cookie, true); |
+} |
+ |
void MediaWebContentsObserver::OnMediaPlayingNotification( |
RenderFrameHost* render_frame_host, |
int64_t player_cookie, |
bool has_video, |
bool has_audio, |
- bool is_remote) { |
+ bool is_remote, |
+ base::TimeDelta duration) { |
// Ignore the videos playing remotely and don't hold the wake lock for the |
// screen. TODO(dalecurtis): Is this correct? It means observers will not |
// receive play and pause messages. |
@@ -114,7 +136,8 @@ void MediaWebContentsObserver::OnMediaPlayingNotification( |
void MediaWebContentsObserver::OnMediaPausedNotification( |
RenderFrameHost* render_frame_host, |
- int64_t player_cookie) { |
+ int64_t player_cookie, |
+ bool reached_end_of_stream) { |
const MediaPlayerId id(render_frame_host, player_cookie); |
const bool removed_audio = RemoveMediaPlayerEntry(id, &active_audio_players_); |
const bool removed_video = RemoveMediaPlayerEntry(id, &active_video_players_); |
@@ -161,19 +184,6 @@ void MediaWebContentsObserver::CreateVideoPowerSaveBlocker() { |
#endif |
} |
-void MediaWebContentsObserver::WasShown() { |
- // Restore power save blocker if there are active video players running. |
- if (!active_video_players_.empty() && !video_power_save_blocker_) |
- CreateVideoPowerSaveBlocker(); |
-} |
- |
-void MediaWebContentsObserver::WasHidden() { |
- // If there are entities capturing screenshots or video (e.g., mirroring), |
- // don't release the power save blocker. |
- if (!web_contents()->GetCapturerCount()) |
- video_power_save_blocker_.reset(); |
-} |
- |
void MediaWebContentsObserver::MaybeReleasePowerSaveBlockers() { |
// If there are no more audio players and we don't have audio stream |
// monitoring, release the audio power save blocker here instead of during |