| Index: content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.cc b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| index f6f4e50debe72815235da85db8ddc8287be39fac..4207c1f58e1bdd2930d3261c5cf5e4d8f4180faf 100644
|
| --- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| +++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc
|
| @@ -46,6 +46,7 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived(
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_DidMediaPlayerPause, OnPlayerPause)
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer)
|
| IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaSeekRequest, OnMediaSeekRequest)
|
| + IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -219,13 +220,19 @@ webkit_media::WebMediaPlayerAndroid*
|
| }
|
|
|
| void WebMediaPlayerProxyImplAndroid::OnMediaSeekRequest(
|
| - int player_id, base::TimeDelta time_to_seek, bool request_texture_peer) {
|
| + int player_id, base::TimeDelta time_to_seek, unsigned seek_request_id) {
|
| webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
|
| if (player) {
|
| - Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id));
|
| - player->OnMediaSeekRequest(time_to_seek, request_texture_peer);
|
| + Send(new MediaPlayerHostMsg_MediaSeekRequestAck(routing_id(), player_id,
|
| + seek_request_id));
|
| + player->OnMediaSeekRequest(time_to_seek);
|
| }
|
| }
|
|
|
| +void WebMediaPlayerProxyImplAndroid::OnMediaConfigRequest(int player_id) {
|
| + webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id);
|
| + if (player)
|
| + player->OnMediaConfigRequest();
|
| +}
|
|
|
| } // namespace content
|
|
|