Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore.

content/port/browser/render_widget_host_view_port.h

 // 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.
 
 #ifndef CONTENT_PORT_BROWSER_RENDER_WIDGET_HOST_VIEW_PORT_H_
 #define CONTENT_PORT_BROWSER_RENDER_WIDGET_HOST_VIEW_PORT_H_
 #pragma once
 
 #include "base/callback.h"
 #include "base/process_util.h"
@@ skipping 122 matching lines @@
 
   // Notifies the View that the renderer selection bounds has changed.
   // |start_rect| and |end_rect| are the bounds end of the selection in the
   // coordinate system of the render view.
   virtual void SelectionBoundsChanged(const gfx::Rect& start_rect,
                                       const gfx::Rect& end_rect) {}
 
   // Allocate a backing store for this view.
   virtual BackingStore* AllocBackingStore(const gfx::Size& size) = 0;
 
-  // DEPRECATED: Synchronous version of AsyncCopyFromCompositingSurface.
-  // This will be removed once all the caller have been chagned to use the
-  // asynchronous version.
-  virtual bool CopyFromCompositingSurface(const gfx::Size& size,
-                                          skia::PlatformCanvas* output) = 0;
-
-  // Asynchrnously copies the contents of the compositing surface into the given
+  // Copies the contents of the compositing surface into the given
   // (uninitialized) PlatformCanvas if any.
   // |callback| is invoked with true on success, false otherwise. |output| can
   // be initialized even on failure.
-  virtual void AsyncCopyFromCompositingSurface(
+  // NOTE: |callback| is called asynchronously on Aura and synchronously on the
+  // other platforms.
+  virtual void CopyFromCompositingSurface(
       const gfx::Size& size,
       skia::PlatformCanvas* output,
       base::Callback<void(bool)> callback) = 0;
 
   // Called when accelerated compositing state changes.
   virtual void OnAcceleratedCompositingStateChange() = 0;
   // |params.window| and |params.surface_id| indicate which accelerated
   // surface's buffers swapped. |params.renderer_id| and |params.route_id|
   // are used to formulate a reply to the GPU process to prevent it from getting
   // too far ahead. They may all be zero, in which case no flow control is
@@ skipping 100 matching lines @@
   virtual BrowserAccessibilityManager*
       GetBrowserAccessibilityManager() const = 0;
   virtual void OnAccessibilityNotifications(
       const std::vector<AccessibilityHostMsg_NotificationParams>& params) {
   }
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PORT_BROWSER_RENDER_WIDGET_HOST_VIEW_PORT_H_