Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/renderer_host/browser_compositor_view_mac.mm

 // Copyright 2014 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/renderer_host/browser_compositor_view_mac.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/compositor/image_transport_factory.h"
 #include "content/browser/renderer_host/resize_lock.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/context_factory.h"
+#include "media/base/video_frame.h"
 #include "ui/accelerated_widget_mac/accelerated_widget_mac.h"
 #include "ui/accelerated_widget_mac/window_resize_helper_mac.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/geometry/dip_util.h"
 
 namespace content {
 
 namespace {
 
 // Set when no browser compositors should remain alive.
@@ skipping 219 matching lines @@
     bool result) {
   callback.Run(rect, result);
   if (browser_compositor) {
     browser_compositor->outstanding_copy_count_ -= 1;
     browser_compositor->UpdateState();
   }
 }
 
 void BrowserCompositorMac::CopyFromCompositingSurfaceToVideoFrame(
     const gfx::Rect& src_subrect,
-    const scoped_refptr<media::VideoFrame>& target,
+    scoped_refptr<media::VideoFrame> target,
     const base::Callback<void(const gfx::Rect&, bool)>& callback) {
   DCHECK(delegated_frame_host_);
   DCHECK(state_ == HasAttachedCompositor);
   outstanding_copy_count_ += 1;
 
   auto callback_with_decrement =
       base::Bind(&BrowserCompositorMac::CopyToVideoFrameCompleted,
                  weak_factory_.GetWeakPtr(), callback);
 
   delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame(
-      src_subrect, target, callback_with_decrement);
+      src_subrect, std::move(target), callback_with_decrement);
 }
 
 void BrowserCompositorMac::SwapCompositorFrame(
     uint32_t compositor_frame_sink_id,
     cc::CompositorFrame frame) {
   // Compute the frame size based on the root render pass rect size.
   cc::RenderPass* root_pass = frame.render_pass_list.back().get();
   float scale_factor = frame.metadata.device_scale_factor;
   gfx::Size pixel_size = root_pass->output_rect.size();
   gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
@@ skipping 189 matching lines @@
 
 const cc::BeginFrameArgs& BrowserCompositorMac::LastUsedBeginFrameArgs() const {
   return last_begin_frame_args_;
 }
 
 void BrowserCompositorMac::OnBeginFrameSourcePausedChanged(bool paused) {
   // Only used on Android WebView.
 }
 
 }  // namespace content