Chromium Code Reviews| Index: content/renderer/render_view_impl.cc |
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
| index 29e7b65c5a472308c125ac0d385e1e516f1857eb..8620d2860fa1fefd6cf7efa9faadb5e996a294f1 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -189,6 +189,7 @@ |
| #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" |
| #if defined(OS_ANDROID) |
| +#include "content/renderer/media/stream_texture_factory_impl_android.h" |
| #include "webkit/media/android/webmediaplayer_android.h" |
| #include "webkit/media/android/webmediaplayer_manager_android.h" |
| #elif defined(OS_WIN) |
| @@ -2336,10 +2337,12 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); |
| #if defined(OS_ANDROID) |
| - // TODO(qinmin): upstream the implementation of StreamTextureFactoryImpl |
| - // to replace the NULL param here. |
| + // TODO(qinmin): upstream the implementation of getting WebGraphicsContext3D |
| + // and GpuChannelHost here to replace the NULL params. |
| return new webkit_media::WebMediaPlayerAndroid( |
| - frame, client, cookieJar(frame), media_player_manager_.get(), NULL); |
| + frame, client, cookieJar(frame), media_player_manager_.get(), |
| + new content::StreamTextureFactoryImpl( |
| + NULL, NULL, routing_id_)); |
|
jam
2012/07/12 20:22:24
nit: can fit on one line
qinmin
2012/07/12 20:53:30
Done.
|
| #endif |
| media::MessageLoopFactory* message_loop_factory = |