Revert r180578, r180591, and r180604 from 1410 branch.

webkit/media/webmediaplayer_proxy.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_proxy.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "media/base/pipeline_status.h"
@@ skipping 16 matching lines @@
       webmediaplayer_(webmediaplayer),
       outstanding_repaints_(0) {
   DCHECK(render_loop_);
   DCHECK(webmediaplayer_);
 }
 
 WebMediaPlayerProxy::~WebMediaPlayerProxy() {
   Detach();
 }
 
-void WebMediaPlayerProxy::FrameReady(
-    const scoped_refptr<media::VideoFrame>& frame) {
+void WebMediaPlayerProxy::Repaint() {
   base::AutoLock auto_lock(lock_);
-  current_frame_ = frame;
-
   if (outstanding_repaints_ < kMaxOutstandingRepaints) {
     ++outstanding_repaints_;
 
     render_loop_->PostTask(FROM_HERE, base::Bind(
         &WebMediaPlayerProxy::RepaintTask, this));
   }
 }
 
 void WebMediaPlayerProxy::Paint(SkCanvas* canvas,
                                 const gfx::Rect& dest_rect,
                                 uint8_t alpha) {
   DCHECK(render_loop_->BelongsToCurrentThread());
-
-  // Use GetCurrentFrame() to avoid locking while painting in software.
-  scoped_refptr<media::VideoFrame> video_frame;
-  GetCurrentFrame(&video_frame);
-  video_renderer_.Paint(video_frame, canvas, dest_rect, alpha);
+  if (frame_provider_) {
+    scoped_refptr<media::VideoFrame> video_frame;
+    frame_provider_->GetCurrentFrame(&video_frame);
+    video_renderer_.Paint(video_frame, canvas, dest_rect, alpha);
+    frame_provider_->PutCurrentFrame(video_frame);
+  }
 }
 
 bool WebMediaPlayerProxy::HasSingleOrigin() {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (data_source_)
     return data_source_->HasSingleOrigin();
   return true;
 }
 
 bool WebMediaPlayerProxy::DidPassCORSAccessCheck() const {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (data_source_)
     return data_source_->DidPassCORSAccessCheck();
   return false;
 }
 
 void WebMediaPlayerProxy::AbortDataSource() {
   DCHECK(render_loop_->BelongsToCurrentThread());
   if (data_source_)
     data_source_->Abort();
 }
 
 void WebMediaPlayerProxy::Detach() {
   DCHECK(render_loop_->BelongsToCurrentThread());
   webmediaplayer_ = NULL;
   data_source_ = NULL;
+  frame_provider_ = NULL;
 }
 
 void WebMediaPlayerProxy::RepaintTask() {
   DCHECK(render_loop_->BelongsToCurrentThread());
   {
     base::AutoLock auto_lock(lock_);
     --outstanding_repaints_;
     DCHECK_GE(outstanding_repaints_, 0);
   }
   if (webmediaplayer_) {
     webmediaplayer_->Repaint();
   }
 }
 
 void WebMediaPlayerProxy::GetCurrentFrame(
     scoped_refptr<media::VideoFrame>* frame_out) {
-  base::AutoLock auto_lock(lock_);
-  *frame_out = current_frame_;
+  if (frame_provider_)
+    frame_provider_->GetCurrentFrame(frame_out);
+}
+
+void WebMediaPlayerProxy::PutCurrentFrame(
+    scoped_refptr<media::VideoFrame> frame) {
+  if (frame_provider_)
+    frame_provider_->PutCurrentFrame(frame);
 }
 
 }  // namespace webkit_media