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 0f111646735a315208f6839f43baa15fb7f3bbc6..ca40d443fd3469fe624ea16f5981d3f345c22d6b 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"
@@ -1202,13 +1204,22 @@ 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_task_runner_,
+          base::Bind(&VideoFrameCompositor::UpdateCurrentFrame,
+                     base::Unretained(compositor_))));
+  scoped_ptr<media::VideoFrameScheduler> scheduler_proxy(
+      new media::VideoFrameSchedulerProxy(
+          media_loop_, compositor_task_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)) {
@@ -1304,15 +1315,6 @@ void WebMediaPlayerImpl::OnOpacityChanged(bool opaque) {
     video_weblayer_->setOpaque(opaque_);
 }
 
-void WebMediaPlayerImpl::FrameReady(
-    const scoped_refptr<media::VideoFrame>& frame) {
-  compositor_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&VideoFrameCompositor::UpdateCurrentFrame,
-                 base::Unretained(compositor_),
-                 frame));
-}
-
 void WebMediaPlayerImpl::SetDecryptorReadyCB(
      const media::DecryptorReadyCB& decryptor_ready_cb) {
   DCHECK(main_loop_->BelongsToCurrentThread());