Chromium Code Reviews| 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 652964a00604aafb88677dfbc6a98e532f58d084..37b26adab85af8cd1ba79929b1595061d4be3be5 100644 |
| --- a/content/renderer/media/webmediaplayer_proxy_impl_android.cc |
| +++ b/content/renderer/media/webmediaplayer_proxy_impl_android.cc |
| @@ -10,6 +10,10 @@ |
| #include "webkit/media/android/webmediaplayer_android.h" |
| #include "webkit/media/android/webmediaplayer_manager_android.h" |
| +#if defined(GOOGLE_TV) |
| +#include "webkit/media/android/webmediaplayer_tv.h" |
| +#endif |
| + |
| namespace content { |
| WebMediaPlayerProxyImplAndroid::WebMediaPlayerProxyImplAndroid( |
| @@ -53,11 +57,12 @@ bool WebMediaPlayerProxyImplAndroid::OnMessageReceived( |
| } |
| void WebMediaPlayerProxyImplAndroid::Initialize( |
| - int player_id, const GURL& url, |
| - bool is_media_source, |
| + int player_id, |
| + const GURL& url, |
| + media::MediaPlayerBridge::MediaType media_type, |
| const GURL& first_party_for_cookies) { |
| Send(new MediaPlayerHostMsg_MediaPlayerInitialize( |
| - routing_id(), player_id, url, is_media_source, first_party_for_cookies)); |
| + routing_id(), player_id, url, media_type, first_party_for_cookies)); |
| } |
| void WebMediaPlayerProxyImplAndroid::Start(int player_id) { |
| @@ -204,9 +209,12 @@ void WebMediaPlayerProxyImplAndroid::ReadFromDemuxerAck( |
| routing_id(), player_id, params)); |
| } |
| + |
| void WebMediaPlayerProxyImplAndroid::OnReadFromDemuxer( |
| int player_id, media::DemuxerStream::Type type, bool seek_done) { |
| - webkit_media::WebMediaPlayerAndroid* player = GetWebMediaPlayer(player_id); |
| + webkit_media::WebMediaPlayerTv* player = |
| + static_cast<webkit_media::WebMediaPlayerTv*>( |
|
ycheo (away)
2013/05/02 02:45:21
dynamic_cast?
wonsik
2013/05/02 15:22:00
Not permitted (-fno-rtti), and not applicable afte
|
| + manager_->GetMediaPlayer(player_id)); |
| if (player) |
| player->OnReadFromDemuxer(type, seek_done); |
| } |