Revert r180578, r180591, and r180604 from 1410 branch.

webkit/media/webmediaplayer_proxy.h

Index: webkit/media/webmediaplayer_proxy.h
===================================================================
--- webkit/media/webmediaplayer_proxy.h	(revision 182591)
+++ webkit/media/webmediaplayer_proxy.h	(working copy)
@@ -44,14 +44,20 @@
     data_source_ = data_source;
   }
 
-  // Called by VideoRendererBase on its internal thread with the new frame to be
-  // painted.
-  void FrameReady(const scoped_refptr<media::VideoFrame>& frame);
+  // 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();
+
   // 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;
 
@@ -69,10 +75,10 @@
   WebMediaPlayerImpl* webmediaplayer_;
 
   scoped_refptr<BufferedDataSource> data_source_;
+  scoped_refptr<media::VideoRendererBase> frame_provider_;
   media::SkCanvasVideoRenderer video_renderer_;
 
   base::Lock lock_;
-  scoped_refptr<media::VideoFrame> current_frame_;
   int outstanding_repaints_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxy);