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 c129995950a185d35dc692be3f5914b51e19cdda..3c8a7d3ac274b2c69ab28e9c5bf744e50a979957 100644 |
--- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc |
+++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc |
@@ -53,11 +53,15 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived( |
} |
void WebMediaPlayerProxyImplAndroid::Initialize( |
- int player_id, const GURL& url, |
- bool is_media_source, |
+ int player_id, |
+ const GURL& url, |
+ media::MediaPlayerAndroid::SourceType media_source_type, |
const GURL& first_party_for_cookies) { |
- Send(new MediaPlayerHostMsg_MediaPlayerInitialize( |
- routing_id(), player_id, url, is_media_source, first_party_for_cookies)); |
+ Send(new MediaPlayerHostMsg_MediaPlayerInitialize(routing_id(), |
+ player_id, |
+ url, |
+ media_source_type, |
+ first_party_for_cookies)); |
} |
void WebMediaPlayerProxyImplAndroid::Start(int player_id) { |
@@ -205,8 +209,11 @@ void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( |
routing_id(), player_id, params)); |
} |
+ |
void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( |
- int player_id, media::DemuxerStream::Type type, bool seek_done) { |
+ int player_id, |
+ media::DemuxerStream::Type type, |
+ bool seek_done) { |
webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); |
if (player) |
player->OnReadFromDemuxer(type, seek_done); |