| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/media/android/renderer_media_player_manager.h" | 5 #include "content/renderer/media/android/renderer_media_player_manager.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "content/common/media/media_player_messages_android.h" | 9 #include "content/common/media/media_player_messages_android.h" |
| 10 #include "content/renderer/media/android/proxy_media_keys.h" | 10 #include "content/renderer/media/android/proxy_media_keys.h" |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError) | 44 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaError, OnMediaError) |
| 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged, | 45 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaVideoSizeChanged, |
| 46 OnVideoSizeChanged) | 46 OnVideoSizeChanged) |
| 47 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) | 47 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaTimeUpdate, OnTimeUpdate) |
| 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, | 48 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaPlayerReleased, |
| 49 OnMediaPlayerReleased) | 49 OnMediaPlayerReleased) |
| 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice, | 50 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ConnectedToRemoteDevice, |
| 51 OnConnectedToRemoteDevice) | 51 OnConnectedToRemoteDevice) |
| 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice, | 52 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DisconnectedFromRemoteDevice, |
| 53 OnDisconnectedFromRemoteDevice) | 53 OnDisconnectedFromRemoteDevice) |
| 54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_RequestFullscreen, |
| 55 OnRequestFullscreen) |
| 54 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) | 56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidEnterFullscreen, OnDidEnterFullscreen) |
| 55 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) | 57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidExitFullscreen, OnDidExitFullscreen) |
| 56 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) | 58 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPlay, OnPlayerPlay) |
| 57 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) | 59 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause) |
| 58 IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyAdded, OnKeyAdded) | 60 IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyAdded, OnKeyAdded) |
| 59 IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyError, OnKeyError) | 61 IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyError, OnKeyError) |
| 60 IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyMessage, OnKeyMessage) | 62 IPC_MESSAGE_HANDLER(MediaKeysMsg_KeyMessage, OnKeyMessage) |
| 61 IPC_MESSAGE_UNHANDLED(handled = false) | 63 IPC_MESSAGE_UNHANDLED(handled = false) |
| 62 IPC_END_MESSAGE_MAP() | 64 IPC_END_MESSAGE_MAP() |
| 63 return handled; | 65 return handled; |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 if (player) | 201 if (player) |
| 200 player->OnMediaPlayerPlay(); | 202 player->OnMediaPlayerPlay(); |
| 201 } | 203 } |
| 202 | 204 |
| 203 void RendererMediaPlayerManager::OnPlayerPause(int player_id) { | 205 void RendererMediaPlayerManager::OnPlayerPause(int player_id) { |
| 204 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); | 206 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); |
| 205 if (player) | 207 if (player) |
| 206 player->OnMediaPlayerPause(); | 208 player->OnMediaPlayerPause(); |
| 207 } | 209 } |
| 208 | 210 |
| 211 void RendererMediaPlayerManager::OnRequestFullscreen(int player_id) { |
| 212 WebMediaPlayerAndroid* player = GetMediaPlayer(player_id); |
| 213 if (player) |
| 214 player->OnRequestFullscreen(); |
| 215 } |
| 216 |
| 209 void RendererMediaPlayerManager::EnterFullscreen(int player_id) { | 217 void RendererMediaPlayerManager::EnterFullscreen(int player_id) { |
| 210 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); | 218 Send(new MediaPlayerHostMsg_EnterFullscreen(routing_id(), player_id)); |
| 211 } | 219 } |
| 212 | 220 |
| 213 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { | 221 void RendererMediaPlayerManager::ExitFullscreen(int player_id) { |
| 214 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); | 222 Send(new MediaPlayerHostMsg_ExitFullscreen(routing_id(), player_id)); |
| 215 } | 223 } |
| 216 | 224 |
| 217 void RendererMediaPlayerManager::InitializeCDM(int media_keys_id, | 225 void RendererMediaPlayerManager::InitializeCDM(int media_keys_id, |
| 218 ProxyMediaKeys* media_keys, | 226 ProxyMediaKeys* media_keys, |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 gfx::RectF rect; | 380 gfx::RectF rect; |
| 373 if (player->RetrieveGeometryChange(&rect)) { | 381 if (player->RetrieveGeometryChange(&rect)) { |
| 374 (*changes)[player_it->first] = rect; | 382 (*changes)[player_it->first] = rect; |
| 375 } | 383 } |
| 376 } | 384 } |
| 377 } | 385 } |
| 378 } | 386 } |
| 379 #endif | 387 #endif |
| 380 | 388 |
| 381 } // namespace content | 389 } // namespace content |
| OLD | NEW |