Revert r180578, r180591, and r180604 from 1410 branch.

webkit/media/webmediaplayer_proxy.h

 // 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.
 
 #ifndef WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 #define WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "media/base/pipeline.h"
@@ skipping 26 matching lines @@
  public:
   WebMediaPlayerProxy(const scoped_refptr<base::MessageLoopProxy>& render_loop,
                       WebMediaPlayerImpl* webmediaplayer);
   const scoped_refptr<BufferedDataSource>& data_source() {
     return data_source_;
   }
   void set_data_source(const scoped_refptr<BufferedDataSource>& data_source) {
     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;
 
   void AbortDataSource();
 
  private:
   friend class base::RefCountedThreadSafe<WebMediaPlayerProxy>;
   virtual ~WebMediaPlayerProxy();
 
   // Invoke |webmediaplayer_| to perform a repaint.
   void RepaintTask();
 
   // The render message loop where WebKit lives.
   scoped_refptr<base::MessageLoopProxy> render_loop_;
   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);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_WEBMEDIAPLAYER_PROXY_H_