Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/frame_host/render_widget_host_view_child_frame.cc

Index: content/browser/frame_host/render_widget_host_view_child_frame.cc
diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc
index eeaac95753fdf487fbebbd36a1a28fe3f22e65ab..83782da36188dd0d6a92cd99d959a4adf34ba117 100644
--- a/content/browser/frame_host/render_widget_host_view_child_frame.cc
+++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc
@@ -603,8 +603,8 @@ void RenderWidgetHostViewChildFrame::RegisterFrameSwappedCallback(
   frame_swapped_callbacks_.push_back(std::move(callback));
 }
 
-void RenderWidgetHostViewChildFrame::CopyFromCompositingSurface(
-    const gfx::Rect& src_subrect,
+void RenderWidgetHostViewChildFrame::CopyFromSurface(
+    const gfx::Rect& src_rect,
     const gfx::Size& output_size,
     const ReadbackRequestCallback& callback,
     const SkColorType preferred_color_type) {
@@ -613,11 +613,11 @@ void RenderWidgetHostViewChildFrame::CopyFromCompositingSurface(
     // point we should be guaranteed that the surface is available.
     RegisterFrameSwappedCallback(base::MakeUnique<base::Closure>(base::Bind(
         &RenderWidgetHostViewChildFrame::SubmitSurfaceCopyRequest, AsWeakPtr(),
-        src_subrect, output_size, callback, preferred_color_type)));
+        src_rect, output_size, callback, preferred_color_type)));
     return;
   }
 
-  SubmitSurfaceCopyRequest(src_subrect, output_size, callback,
+  SubmitSurfaceCopyRequest(src_rect, output_size, callback,
                            preferred_color_type);
 }
 
@@ -638,18 +638,6 @@ void RenderWidgetHostViewChildFrame::SubmitSurfaceCopyRequest(
   surface_factory_->RequestCopyOfSurface(std::move(request));
 }
 
-void RenderWidgetHostViewChildFrame::CopyFromCompositingSurfaceToVideoFrame(
-    const gfx::Rect& src_subrect,
-    const scoped_refptr<media::VideoFrame>& target,
-    const base::Callback<void(const gfx::Rect&, bool)>& callback) {
-  NOTIMPLEMENTED();
-  callback.Run(gfx::Rect(), false);
-}
-
-bool RenderWidgetHostViewChildFrame::CanCopyToVideoFrame() const {
-  return false;
-}
-
 bool RenderWidgetHostViewChildFrame::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
   return false;