Remove RenderWidgetHost::GetSnapshotFromRenderer.

content/browser/media/capture/web_contents_video_capture_device.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.
 //
 // Implementation notes: This needs to work on a variety of hardware
 // configurations where the speed of the CPU and GPU greatly affect overall
 // performance. Spanning several threads, the process of capturing has been
 // split up into four conceptual stages:
 //
 //   1. Reserve Buffer: Before a frame can be captured, a slot in the client's
@@ skipping 637 matching lines @@
   if (view_size != last_view_size_) {
     last_view_size_ = view_size;
 
     // Measure the number of kilopixels.
     UMA_HISTOGRAM_COUNTS_10000(
         "TabCapture.ViewChangeKiloPixels",
         view_size.width() * view_size.height() / 1024);
   }
 
   if (!view->IsSurfaceAvailableForCopy()) {
-    // Fallback to the more expensive renderer-side copy if the surface and
-    // backing store are not accessible.
-    rwh->GetSnapshotFromRenderer(
-        gfx::Rect(),
-        base::Bind(&WebContentsCaptureMachine::DidCopyFromBackingStore,
-                   weak_ptr_factory_.GetWeakPtr(),
-                   start_time, target, deliver_frame_cb));
+    bool success = false;
+    SkBitmap empty_bitmap;
+    DidCopyFromBackingStore(

[piman, 2014/04/24 23:17:06]

Is reentrancy ok?

[danakj, 2014/04/24 23:22:33]

Ya, I believe so. There's no state change in this method except
last_view_size/UMA recording, and nothing happens after.

To make this cleaner I just removed this case, and let CopyFromBackingStore fail
and call the bound fallback with false if it fails.

+        start_time, target, deliver_frame_cb, success, empty_bitmap);
   } else if (view->CanCopyToVideoFrame()) {
     view->CopyFromCompositingSurfaceToVideoFrame(
         gfx::Rect(view_size),
         target,
         base::Bind(&WebContentsCaptureMachine::
                         DidCopyFromCompositingSurfaceToVideoFrame,
                    weak_ptr_factory_.GetWeakPtr(),
                    start_time, deliver_frame_cb));
   } else {
     rwh->CopyFromBackingStore(
@@ skipping 151 matching lines @@
     scoped_ptr<Client> client) {
   DVLOG(1) << "Allocating " << params.requested_format.frame_size.ToString();
   core_->AllocateAndStart(params, client.Pass());
 }
 
 void WebContentsVideoCaptureDevice::StopAndDeAllocate() {
   core_->StopAndDeAllocate();
 }
 
 }  // namespace content