| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index 6ad5ca1e595b157cb382471b471f4a20b1606916..7154dbca17f8e2b6b2901685b9c5e5d40bef1f18 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -3015,26 +3015,26 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
|
|
|
| scoped_refptr<cc::ContextProvider> context_provider =
|
| RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
|
| - if (!context_provider.get()) {
|
| - LOG(ERROR) << "Failed to get context3d for media player";
|
| - return NULL;
|
| - }
|
| -
|
| - if (!media_player_proxy_) {
|
| - media_player_proxy_ = new WebMediaPlayerProxyAndroid(
|
| - this, media_player_manager_.get());
|
| - }
|
| -
|
| scoped_ptr<StreamTextureFactory> stream_texture_factory;
|
| if (UsingSynchronousRendererCompositor()) {
|
| SynchronousCompositorFactory* factory =
|
| SynchronousCompositorFactory::GetInstance();
|
| stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_);
|
| } else {
|
| + if (!context_provider.get()) {
|
| + LOG(ERROR) << "Failed to get context3d for media player";
|
| + return NULL;
|
| + }
|
| +
|
| stream_texture_factory.reset(new StreamTextureFactoryImpl(
|
| context_provider->Context3d(), gpu_channel_host, routing_id_));
|
| }
|
|
|
| + if (!media_player_proxy_) {
|
| + media_player_proxy_ = new WebMediaPlayerProxyAndroid(
|
| + this, media_player_manager_.get());
|
| + }
|
| +
|
| scoped_ptr<WebMediaPlayerAndroid> web_media_player_android(
|
| new WebMediaPlayerAndroid(
|
| frame,
|
|
|