Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore.

content/browser/renderer_host/render_widget_host_view_aura.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/browser/renderer_host/render_widget_host_view_aura.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 406 matching lines @@
   selection_end_rect_ = end_rect;
 
   GetInputMethod()->OnCaretBoundsChanged(this);
 }
 
 BackingStore* RenderWidgetHostViewAura::AllocBackingStore(
     const gfx::Size& size) {
   return new BackingStoreSkia(host_, size);
 }
 
-bool RenderWidgetHostViewAura::CopyFromCompositingSurface(
-    const gfx::Size& size,
-    skia::PlatformCanvas* output) {
-  ui::Compositor* compositor = GetCompositor();
-  if (!compositor)
-    return false;
-
-  ImageTransportClient* container = image_transport_clients_[current_surface_];
-  if (!container)
-    return false;
-
-  if (!output->initialize(size.width(), size.height(), true))
-    return false;
-
-  ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
-  content::GLHelper* gl_helper = factory->GetGLHelper(compositor);
-  if (!gl_helper)
-    return false;
-
-  unsigned char* addr = static_cast<unsigned char*>(
-      output->getTopDevice()->accessBitmap(true).getPixels());
-  return gl_helper->CopyTextureTo(container->texture_id(),
-                                  container->size(),
-                                  size,
-                                  addr);
-}
-
-void RenderWidgetHostViewAura::AsyncCopyFromCompositingSurface(
+void RenderWidgetHostViewAura::CopyFromCompositingSurface(
     const gfx::Size& size,
     skia::PlatformCanvas* output,
     base::Callback<void(bool)> callback) {
   base::ScopedClosureRunner scoped_callback_runner(base::Bind(callback, false));
   ui::Compositor* compositor = GetCompositor();
   if (!compositor)
     return;
 
   ImageTransportClient* container = image_transport_clients_[current_surface_];
   if (!container)
     return;
 
   if (!output->initialize(size.width(), size.height(), true))
     return;
 
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   content::GLHelper* gl_helper = factory->GetGLHelper(compositor);
   if (!gl_helper)
     return;
 
-  scoped_callback_runner.Release();
   unsigned char* addr = static_cast<unsigned char*>(
       output->getTopDevice()->accessBitmap(true).getPixels());
+  scoped_callback_runner.Release();
   gl_helper->AsyncCopyTextureTo(container->texture_id(),
                                 container->size(),
                                 size,
                                 addr,
                                 callback);
 }
 
 void RenderWidgetHostViewAura::OnAcceleratedCompositingStateChange() {
   // Delay UpdateExternalTexture until we actually got a software frame.
   // Sometimes (e.g. on a page load) the renderer will spuriously disable then
@@ skipping 813 matching lines @@
 RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
     RenderWidgetHost* widget) {
   return new RenderWidgetHostViewAura(widget);
 }
 
 // static
 void content::RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }