Support stream textures with the synchronous compositor

content/renderer/render_view_impl.cc

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..e9f63581588c287dbffaefe794c925a017707043 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,10 @@ WebMediaPlayer* RenderViewImpl::createMediaPlayer(
 
   scoped_ptr<StreamTextureFactory> stream_texture_factory;
   if (UsingSynchronousRendererCompositor()) {
-    stream_texture_factory.reset(new StreamTextureFactorySynchronousImpl);
+    if (SynchronousCompositorFactory* factory =

[boliu, 2013/08/20 21:33:49]

This is a redundant check. UsingSynchronousRendererCompositor() checks exactly
that the factory is not null. But factory is android only code, so need
OS_ANDROID guards. :(

[no sievers, 2013/08/20 21:59:58]

Done. The whole section here is already ifdef ANDROID.

+            SynchronousCompositorFactory::GetInstance()) {
+      stream_texture_factory = factory->CreateStreamTextureFactory(routing_id_);
+    }
   } else {
     stream_texture_factory.reset(new StreamTextureFactoryImpl(
         context_provider->Context3d(), gpu_channel_host, routing_id_));