Chromium Code Reviews| Index: content/browser/android/media_player_manager_impl.cc |
| diff --git a/content/browser/android/media_player_manager_impl.cc b/content/browser/android/media_player_manager_impl.cc |
| index aedcd1eeea55039dd247be71aa91248fc1cd7dcf..d84ef21b40b1f3ac7e4ea42f405f3563d7dea3ac 100644 |
| --- a/content/browser/android/media_player_manager_impl.cc |
| +++ b/content/browser/android/media_player_manager_impl.cc |
| @@ -253,10 +253,11 @@ void MediaPlayerManagerImpl::OnReadFromDemuxerAck( |
| player->ReadFromDemuxerAck(params); |
| } |
| -void MediaPlayerManagerImpl::OnMediaSeekRequestAck(int player_id) { |
| +void MediaPlayerManagerImpl::OnMediaSeekRequestAck( |
| + int player_id, unsigned request_id) { |
|
acolwell GONE FROM CHROMIUM
2013/06/04 15:19:14
nit: ditto
qinmin
2013/06/04 19:03:23
Done.
|
| MediaPlayerAndroid* player = GetPlayer(player_id); |
| if (player) |
| - player->OnSeekRequestAck(); |
| + player->OnSeekRequestAck(request_id); |
| } |
| MediaPlayerAndroid* MediaPlayerManagerImpl::GetPlayer(int player_id) { |
| @@ -308,14 +309,13 @@ void MediaPlayerManagerImpl::OnSeekComplete(int player_id, |
| } |
| void MediaPlayerManagerImpl::OnMediaSeekRequest( |
| - int player_id, base::TimeDelta time_to_seek, bool request_surface) { |
| - bool request_texture_peer = request_surface; |
| - if (request_surface && player_id == fullscreen_player_id_) { |
| - video_view_.CreateContentVideoView(); |
| - request_texture_peer = false; |
| - } |
| + int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) { |
| Send(new MediaPlayerMsg_MediaSeekRequest( |
| - routing_id(), player_id, time_to_seek, request_texture_peer)); |
| + routing_id(), player_id, time_to_seek, seek_request_id)); |
| +} |
| + |
| +void MediaPlayerManagerImpl::OnMediaConfigRequest(int player_id) { |
| + Send(new MediaPlayerMsg_MediaConfigRequest(routing_id(), player_id)); |
| } |
| void MediaPlayerManagerImpl::OnError(int player_id, int error) { |