Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/renderer_host/delegated_frame_host.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 #define CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 103 matching lines @@
   // DelegatedFrameEvictorClient implementation.
   void EvictDelegatedFrame() override;
 
   // cc::CompositorFrameSinkSupportClient implementation.
   void DidReceiveCompositorFrameAck() override;
   void OnBeginFrame(const cc::BeginFrameArgs& args) override;
   void ReclaimResources(const cc::ReturnedResourceArray& resources) override;
   void WillDrawSurface(const cc::LocalSurfaceId& id,
                        const gfx::Rect& damage_rect) override;
 
-  bool CanCopyToBitmap() const;
-
   // Public interface exposed to RenderWidgetHostView.
 
   void SwapDelegatedFrame(uint32_t compositor_frame_sink_id,
                           cc::CompositorFrame frame);
   void ClearDelegatedFrame();
   void WasHidden();
   void WasShown(const ui::LatencyInfo& latency_info);
   void WasResized();
   bool HasSavedFrame();
   gfx::Size GetRequestedRendererSize() const;
   void SetCompositor(ui::Compositor* compositor);
   void ResetCompositor();
-  // Note: |src_subset| is specified in DIP dimensions while |output_size|
-  // expects pixels.
+  // Note: |src_subrect| is specified in DIP dimensions while |output_size|
+  // expects pixels. If |src_subrect| is empty, the entire surface area is
+  // copied.
   void CopyFromCompositingSurface(const gfx::Rect& src_subrect,
                                   const gfx::Size& output_size,
                                   const ReadbackRequestCallback& callback,
                                   const SkColorType preferred_color_type);
   void 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);
-  bool CanCopyToVideoFrame() const;
+  bool CanCopyFromCompositingSurface() const;
   void BeginFrameSubscription(
       std::unique_ptr<RenderWidgetHostViewFrameSubscriber> subscriber);
   void EndFrameSubscription();
   bool HasFrameSubscriber() const { return !!frame_subscriber_; }
   cc::FrameSinkId GetFrameSinkId();
   // Returns a null SurfaceId if this DelegatedFrameHost has not yet created
   // a compositor Surface.
   cc::SurfaceId SurfaceIdAtPoint(cc::SurfaceHittestDelegate* delegate,
                                  const gfx::Point& point,
                                  gfx::Point* transformed_point);
@@ skipping 180 matching lines @@
   std::unique_ptr<cc::ExternalBeginFrameSource> begin_frame_source_;
 
   bool needs_begin_frame_ = false;
 
   std::unique_ptr<DelegatedFrameEvictor> delegated_frame_evictor_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_DELEGATED_FRAME_HOST_H_