Index: webkit/media/webmediaplayer_proxy.h |
diff --git a/webkit/media/webmediaplayer_proxy.h b/webkit/media/webmediaplayer_proxy.h |
index 7d9f5a235482f736f005cebd7b10b9e723837d8e..b731b1287ad1f538a44063b0d8df2d6e0948e872 100644 |
--- a/webkit/media/webmediaplayer_proxy.h |
+++ b/webkit/media/webmediaplayer_proxy.h |
@@ -44,20 +44,14 @@ class WebMediaPlayerProxy |
data_source_ = data_source; |
} |
- // TODO(scherkus): remove this once VideoRendererBase::PaintCB passes |
- // ownership of the VideoFrame http://crbug.com/108435 |
- void set_frame_provider(media::VideoRendererBase* frame_provider) { |
- frame_provider_ = frame_provider; |
- } |
- |
- // Methods for Filter -> WebMediaPlayerImpl communication. |
- void Repaint(); |
+ // Called by VideoRendererBase on its internal thread with the new frame to be |
+ // painted. |
+ void FrameReady(const scoped_refptr<media::VideoFrame>& frame); |
// Methods for WebMediaPlayerImpl -> Filter communication. |
void Paint(SkCanvas* canvas, const gfx::Rect& dest_rect, uint8_t alpha); |
void Detach(); |
void GetCurrentFrame(scoped_refptr<media::VideoFrame>* frame_out); |
- void PutCurrentFrame(scoped_refptr<media::VideoFrame> frame); |
bool HasSingleOrigin(); |
bool DidPassCORSAccessCheck() const; |
@@ -79,6 +73,7 @@ class WebMediaPlayerProxy |
media::SkCanvasVideoRenderer video_renderer_; |
base::Lock lock_; |
+ scoped_refptr<media::VideoFrame> current_frame_; |
int outstanding_repaints_; |
DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy); |