Implement webview.captureVisibleRegion()

content/browser/compositor/delegated_frame_host.cc

Index: content/browser/compositor/delegated_frame_host.cc
diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc
index f381da0eaddfc8f190cda971b0cfb1afac5abd6b..940cf6de2bbd8400b420a75c53a2bbef63120740 100644
--- a/content/browser/compositor/delegated_frame_host.cc
+++ b/content/browser/compositor/delegated_frame_host.cc
@@ -592,6 +592,7 @@ void DelegatedFrameHost::EvictDelegatedFrame() {
   delegated_frame_evictor_->DiscardedFrame();
 }
 
+// TODO(wjmaclean): Remove this and get from readback_request_helpers.h instead.

[Charlie Reis, 2016/01/19 22:45:36]

Normally I'd be fine with keeping this CL small and following up, but this
leaves around duplicated code that could quickly get out of sync.  Is there a
reason we can't share the code now?

[wjmaclean, 2016/01/20 15:32:36]

I was mostly hoping to limit the damage if something went wrong (and the size of
the subsequent revert), but I've removed these now.

That being said, there are also a set of similar, but independent, functions for
video that likely should also be moved at some point, but I'd rather not get
into that in this CL as the codepath is distinct.

Done.

 // static
 void DelegatedFrameHost::CopyFromCompositingSurfaceHasResult(
     const gfx::Size& dst_size_in_pixel,
@@ -622,6 +623,7 @@ void DelegatedFrameHost::CopyFromCompositingSurfaceHasResult(
                                 std::move(result));
 }
 
+// TODO(wjmaclean): Remove this and get from readback_request_helpers.h instead.
 static void CopyFromCompositingSurfaceFinished(
     const ReadbackRequestCallback& callback,
     scoped_ptr<cc::SingleReleaseCallback> release_callback,
@@ -643,6 +645,7 @@ static void CopyFromCompositingSurfaceFinished(
                result ? content::READBACK_SUCCESS : content::READBACK_FAILED);
 }
 
+// TODO(wjmaclean): Remove this and get from readback_request_helpers.h instead.
 // static
 void DelegatedFrameHost::PrepareTextureCopyOutputResult(
     const gfx::Size& dst_size_in_pixel,
@@ -690,6 +693,7 @@ void DelegatedFrameHost::PrepareTextureCopyOutputResult(
       GLHelper::SCALER_QUALITY_GOOD);
 }
 
+// TODO(wjmaclean): Remove this and get from readback_request_helpers.h instead.
 // static
 void DelegatedFrameHost::PrepareBitmapCopyOutputResult(
     const gfx::Size& dst_size_in_pixel,
@@ -1049,9 +1053,10 @@ void DelegatedFrameHost::RequestCopyOfOutput(
     scoped_ptr<cc::CopyOutputRequest> request) {
   if (!request_copy_of_output_callback_for_testing_.is_null())
     request_copy_of_output_callback_for_testing_.Run(std::move(request));
-  else
+  else {
     client_->DelegatedFrameHostGetLayer()->RequestCopyOfOutput(
         std::move(request));
+  }
 }
 
 void DelegatedFrameHost::UnlockResources() {