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..93fce7a5f18789645541945e92402179223e8450 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,7 +603,7 @@ void RenderWidgetHostViewChildFrame::RegisterFrameSwappedCallback(
   frame_swapped_callbacks_.push_back(std::move(callback));
 }
 
-void RenderWidgetHostViewChildFrame::CopyFromCompositingSurface(
+void RenderWidgetHostViewChildFrame::CopyFromSurface(
     const gfx::Rect& src_subrect,

[alexmos, 2017/02/28 19:44:09]

nit: the header has this as src_rect, make them the same?

[miu, 2017/03/01 01:17:02]

Done.

     const gfx::Size& output_size,
     const ReadbackRequestCallback& callback,
@@ -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;