Consistent CopyFromSurface() API, consolidated to RWHV

content/test/test_render_view_host.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/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 99 matching lines @@
 }
 
 ui::TextInputClient* TestRenderWidgetHostView::GetTextInputClient() {
   return &text_input_client_;
 }
 
 bool TestRenderWidgetHostView::HasFocus() const {
   return true;
 }
 
-bool TestRenderWidgetHostView::IsSurfaceAvailableForCopy() const {
-  return true;
-}
-
 void TestRenderWidgetHostView::Show() {
   is_showing_ = true;
   is_occluded_ = false;
 }
 
 void TestRenderWidgetHostView::Hide() {
   is_showing_ = false;
 }
 
 bool TestRenderWidgetHostView::IsShowing() {
@@ skipping 11 matching lines @@
 void TestRenderWidgetHostView::RenderProcessGone(base::TerminationStatus status,
                                                  int error_code) {
   delete this;
 }
 
 void TestRenderWidgetHostView::Destroy() { delete this; }
 
 gfx::Rect TestRenderWidgetHostView::GetViewBounds() const {
   return gfx::Rect();
 }
 

[ncarter (slow), 2017/03/01 18:34:26]

with the removal of the overrides, TestRenderWidgetHostView just now uses the
versions from RenderWidgetHostViewBase, is that right? And those have a
NOTIMPLEMENTED().

Was it the case that these are not actually called in any unittest?

[miu, 2017/03/01 22:18:24]

Yes...Only the WCVideoCaptureDevice unit tests would call them, *except* those
tests override CopyFromSurfaceToVideoFrame() with their own impl (and do not use
CopyFromSurface()).

Otherwise, tests that use this API are running as browser tests, and are using
the normal platform impls instead of a TestRenderWidgetHostView.

-void TestRenderWidgetHostView::CopyFromCompositingSurface(
-    const gfx::Rect& src_subrect,
-    const gfx::Size& dst_size,
-    const ReadbackRequestCallback& callback,
-    const SkColorType preferred_color_type) {
-  callback.Run(SkBitmap(), content::READBACK_FAILED);
-}
-
-void TestRenderWidgetHostView::CopyFromCompositingSurfaceToVideoFrame(
-    const gfx::Rect& src_subrect,
-    const scoped_refptr<media::VideoFrame>& target,
-    const base::Callback<void(const gfx::Rect&, bool)>& callback) {
-  callback.Run(gfx::Rect(), false);
-}
-
-bool TestRenderWidgetHostView::CanCopyToVideoFrame() const {
-  return false;
-}
-
 bool TestRenderWidgetHostView::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
   return false;
 }
 
 #if defined(OS_MACOSX)
 
 ui::AcceleratedWidgetMac* TestRenderWidgetHostView::GetAcceleratedWidgetMac()
     const {
   return nullptr;
@@ skipping 155 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content