Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore.

This CL depends on http://codereview.chromium.org/10348007/.

BUG=120003
TEST=Manual

Review URL: https://chromiumcodereview.appspot.com/10352016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135839 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 8 deletions

diff --git a/content/port/browser/render_widget_host_view_port.h b/content/port/browser/render_widget_host_view_port.h
index e30fc3f..8ff0c5d 100644
--- a/content/port/browser/render_widget_host_view_port.h
+++ b/content/port/browser/render_widget_host_view_port.h
@@ -140,17 +140,13 @@ class CONTENT_EXPORT RenderWidgetHostViewPort : public RenderWidgetHostView {
   // 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;