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 d64150c58ab800f2acbe30bff3c22a6fcf0af657..6a7568b86208b5d0d01dd6cb0960274483b2499b 100644 |
| --- a/content/renderer/render_view_impl.cc |
| +++ b/content/renderer/render_view_impl.cc |
| @@ -217,9 +217,9 @@ |
| #include "content/renderer/android/content_detector.h" |
| #include "content/renderer/android/email_detector.h" |
| #include "content/renderer/android/phone_number_detector.h" |
| +#include "content/renderer/android/synchronous_compositor_factory.h" |
| #include "content/renderer/media/android/renderer_media_player_manager.h" |
| #include "content/renderer/media/android/stream_texture_factory_android_impl.h" |
| -#include "content/renderer/media/android/stream_texture_factory_android_synchronous_impl.h" |
| #include "content/renderer/media/android/webmediaplayer_android.h" |
| #include "content/renderer/media/android/webmediaplayer_proxy_android.h" |
| #include "skia/ext/platform_canvas.h" |
| @@ -3028,7 +3028,9 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| scoped_ptr<StreamTextureFactory> stream_texture_factory; |
| if (UsingSynchronousRendererCompositor()) { |
| - stream_texture_factory.reset(new StreamTextureFactorySynchronousImpl); |
| + SynchronousCompositorFactory* factory = |
| + SynchronousCompositorFactory::GetInstance(); |
| + stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_); |
|
boliu
2013/08/20 22:14:33
nit: indent
no sievers
2013/08/20 22:24:58
Done.
|
| } else { |
| stream_texture_factory.reset(new StreamTextureFactoryImpl( |
| context_provider->Context3d(), gpu_channel_host, routing_id_)); |