Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/media/capture/web_contents_video_capture_device.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 "content/browser/media/capture/web_contents_video_capture_device.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 178 matching lines @@
                      const media::VideoCaptureParams& params);
   void InternalSuspend();
   void InternalResume();
   void InternalStop(const base::Closure& callback);
   void InternalMaybeCaptureForRefresh();
   bool IsStarted() const;
 
   // Computes the preferred size of the target RenderWidget for optimal capture.
   gfx::Size ComputeOptimalViewSize() const;
 
-  // Response callback for RWHVP::CopyFromCompositingSurfaceToVideoFrame().
+  // Response callback for RWHV::CopyFromSurfaceToVideoFrame().
   void DidCopyToVideoFrame(
       const base::TimeTicks& start_time,
       const RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback&
           deliver_frame_cb,
       const gfx::Rect& region_in_frame,
       bool success);
 
   // Remove the old subscription, and attempt to start a new one. If
   // |is_still_tracking| is false, emit an error rather than attempt to start a
   // new subscription.
@@ skipping 328 matching lines @@
     subscription_->MaybeCaptureForRefresh();
 }
 
 void WebContentsCaptureMachine::Capture(
     base::TimeTicks start_time,
     scoped_refptr<media::VideoFrame> target,
     const RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback&
         deliver_frame_cb) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  auto* const view =
-      static_cast<RenderWidgetHostViewBase*>(tracker_->GetTargetView());
-  if (!view || !view->CanCopyToVideoFrame()) {
-    deliver_frame_cb.Run(base::TimeTicks(), gfx::Rect(), false);
+  RenderWidgetHostView* const view = tracker_->GetTargetView();
+  if (!view)
     return;
-  }
-
-  const gfx::Size view_size = view->GetViewBounds().size();
-  view->CopyFromCompositingSurfaceToVideoFrame(
-      gfx::Rect(view_size), std::move(target),
+  view->CopyFromSurfaceToVideoFrame(
+      gfx::Rect(), std::move(target),
       base::Bind(&WebContentsCaptureMachine::DidCopyToVideoFrame,
                  weak_ptr_factory_.GetWeakPtr(), start_time, deliver_frame_cb));
 }
 
 gfx::Size WebContentsCaptureMachine::ComputeOptimalViewSize() const {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // TODO(miu): Propagate capture frame size changes as new "preferred size"
   // updates, rather than just using the max frame size.
   // http://crbug.com/350491
@@ skipping 57 matching lines @@
 
 void WebContentsCaptureMachine::DidCopyToVideoFrame(
     const base::TimeTicks& start_time,
     const RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback&
         deliver_frame_cb,
     const gfx::Rect& region_in_frame,
     bool success) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Capture can fail due to transient issues, so just skip this frame.
-  DVLOG_IF(1, !success) << "CopyFromCompositingSurface failed; skipping frame.";
+  DVLOG_IF(1, !success)
+      << "CopyFromSurfaceToVideoFrame() failed; skipping frame.";
   deliver_frame_cb.Run(start_time, region_in_frame, success);
 }
 
 void WebContentsCaptureMachine::RenewFrameSubscription(bool is_still_tracking) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // Always destroy the old subscription before creating a new one.
   if (subscription_) {
     DVLOG(1) << "Cancelling existing subscription.";
     subscription_.reset();
@@ skipping 106 matching lines @@
 void WebContentsVideoCaptureDevice::StopAndDeAllocate() {
   core_->StopAndDeAllocate();
 }
 
 void WebContentsVideoCaptureDevice::OnUtilizationReport(int frame_feedback_id,
                                                         double utilization) {
   core_->OnConsumerReportingUtilization(frame_feedback_id, utilization);
 }
 
 }  // namespace content