Replace VideoRendererBase Get/PutCurrentFrame() with a VideoFrame-containing callback.

webkit/media/webmediaplayer_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/media/webmediaplayer_impl.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
@@ skipping 173 matching lines @@
         new media::GpuVideoDecoder(
             media_thread_.message_loop_proxy(),
             params.gpu_factories()));
   }
 
   // Create default video renderer.
   scoped_refptr<media::VideoRendererBase> video_renderer =
       new media::VideoRendererBase(
           media_thread_.message_loop_proxy(),
           set_decryptor_ready_cb,
-          base::Bind(&WebMediaPlayerProxy::Repaint, proxy_),
+          base::Bind(&WebMediaPlayerProxy::FrameReady, proxy_),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::SetOpaque),
           true);
   filter_collection_->AddVideoRenderer(video_renderer);
-  proxy_->set_frame_provider(video_renderer);
 
   // Create default audio renderer using the null sink if no sink was provided.
   audio_source_provider_ = new WebAudioSourceProviderImpl(
       params.audio_renderer_sink() ? params.audio_renderer_sink() :
       new media::NullAudioSink());
   filter_collection_->AddAudioRenderer(new media::AudioRendererImpl(
       audio_source_provider_, set_decryptor_ready_cb));
 }
 
 WebMediaPlayerImpl::~WebMediaPlayerImpl() {
@@ skipping 427 matching lines @@
   return NULL;
 }
 
 void WebMediaPlayerImpl::putCurrentFrame(
     WebKit::WebVideoFrame* web_video_frame) {
   if (!accelerated_compositing_reported_) {
     accelerated_compositing_reported_ = true;
     DCHECK(frame_->view()->isAcceleratedCompositingActive());
     UMA_HISTOGRAM_BOOLEAN("Media.AcceleratedCompositingActive", true);
   }
-  if (web_video_frame) {
-    WebVideoFrameImpl* impl = static_cast<WebVideoFrameImpl*>(web_video_frame);
-    proxy_->PutCurrentFrame(impl->video_frame);
-    delete web_video_frame;
-  } else {
-    proxy_->PutCurrentFrame(NULL);
-  }
+  delete web_video_frame;

[scherkus (not reviewing), 2013/01/31 17:54:05]

this whole pCF() stuff seems ripe for review / deletion at some point

 }
 
 #define COMPILE_ASSERT_MATCHING_STATUS_ENUM(webkit_name, chromium_name) \
     COMPILE_ASSERT(static_cast<int>(WebMediaPlayer::webkit_name) == \
                    static_cast<int>(media::ChunkDemuxer::chromium_name), \
                    mismatching_status_enums)
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddIdStatusOk, kOk);
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddIdStatusNotSupported, kNotSupported);
 COMPILE_ASSERT_MATCHING_STATUS_ENUM(AddIdStatusReachedIdLimit, kReachedIdLimit);
 #undef COMPILE_ASSERT_MATCHING_ENUM
@@ skipping 600 matching lines @@
 }
 
 void WebMediaPlayerImpl::OnDurationChange() {
   if (ready_state_ == WebMediaPlayer::ReadyStateHaveNothing)
     return;
 
   GetClient()->durationChanged();
 }
 
 }  // namespace webkit_media