Refactor VideoRendererImpl to use VideoFrameScheduler.

content/renderer/media/webmediaplayer_impl.cc

Index: content/renderer/media/webmediaplayer_impl.cc
diff --git a/content/renderer/media/webmediaplayer_impl.cc b/content/renderer/media/webmediaplayer_impl.cc
index ea68fc7348126590c586d2cc31718fbf749f7223..ca8e4b4ff15379348123f6a2c4fea4519f161174 100644
--- a/content/renderer/media/webmediaplayer_impl.cc
+++ b/content/renderer/media/webmediaplayer_impl.cc
@@ -57,6 +57,8 @@
 #include "media/filters/gpu_video_accelerator_factories.h"
 #include "media/filters/gpu_video_decoder.h"
 #include "media/filters/opus_audio_decoder.h"
+#include "media/filters/video_frame_scheduler_impl.h"
+#include "media/filters/video_frame_scheduler_proxy.h"
 #include "media/filters/video_renderer_impl.h"
 #include "media/filters/vpx_video_decoder.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModule.h"
@@ -171,10 +173,13 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       supports_save_(true),
       starting_(false),
       chunk_demuxer_(NULL),
-      compositor_(  // Threaded compositing isn't enabled universally yet.
-          (RenderThreadImpl::current()->compositor_message_loop_proxy()
-               ? RenderThreadImpl::current()->compositor_message_loop_proxy()
-               : base::MessageLoopProxy::current()),
+      // Threaded compositing isn't enabled universally yet.
+      compositor_runner_(
+          RenderThreadImpl::current()->compositor_message_loop_proxy()
+              ? RenderThreadImpl::current()->compositor_message_loop_proxy()
+              : base::MessageLoopProxy::current()),
+      compositor_(
+          compositor_runner_,
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged)),
       text_track_index_(0),
@@ -1205,13 +1210,21 @@ void WebMediaPlayerImpl::StartPipeline() {
 
   video_decoders.push_back(new media::FFmpegVideoDecoder(media_loop_));
 
-  scoped_ptr<media::VideoRenderer> video_renderer(
-      new media::VideoRendererImpl(
-          media_loop_,
-          video_decoders.Pass(),
-          set_decryptor_ready_cb,
-          base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)),
-          true));
+  // Use a proxy to deliver frames from the media thread to the real scheduler
+  // living on the compositor thread.
+  scoped_ptr<media::VideoFrameScheduler> scheduler_impl(
+      new media::VideoFrameSchedulerImpl(
+          compositor_runner_,
+          base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this))));
+  scoped_ptr<media::VideoFrameScheduler> scheduler_proxy(
+      new media::VideoFrameSchedulerProxy(
+          media_loop_, compositor_runner_, scheduler_impl.Pass()));
+
+  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
+      media_loop_,
+      scheduler_proxy.Pass(),
+      video_decoders.Pass(),
+      set_decryptor_ready_cb));
   filter_collection->SetVideoRenderer(video_renderer.Pass());
 
   if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) {