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 e54b1627835fd2d978387368a59ddcc7338a32c2..b843a5b0a7035586178465898649ab36553b254f 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"
@@ -231,6 +233,8 @@ WebMediaPlayerImpl::~WebMediaPlayerImpl() {
       base::Bind(&base::WaitableEvent::Signal, base::Unretained(&waiter)));
   waiter.Wait();
 
+  scheduler_runner_->DeleteSoon(FROM_HERE, scheduler_);
+
   // Let V8 know we are not using extra resources anymore.
   if (incremented_externally_allocated_memory_) {
     v8::Isolate::GetCurrent()->AdjustAmountOfExternalAllocatedMemory(
@@ -1204,13 +1208,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));
+  scheduler_runner_ =
+      RenderThreadImpl::current()->compositor_message_loop_proxy()
+          ? RenderThreadImpl::current()->compositor_message_loop_proxy()
+          : base::MessageLoopProxy::current();
+  scheduler_ = new media::VideoFrameSchedulerImpl(
+      scheduler_runner_,
+      base::Bind(&WebMediaPlayerImpl::FrameReady, base::Unretained(this)));
+
+  scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererImpl(
+      media_loop_,
+      scoped_ptr<media::VideoFrameScheduler>(
+          new media::VideoFrameSchedulerProxy(
+              media_loop_, scheduler_runner_, scheduler_)),
+      video_decoders.Pass(),
+      set_decryptor_ready_cb));
   filter_collection->SetVideoRenderer(video_renderer.Pass());
 
   if (cmd_line->HasSwitch(switches::kEnableInbandTextTracks)) {