Consolidate RenderWidgetHost::CopyFromBackingStore and RenderWidgetHost::AsyncCopyFromBackingStore.

content/public/browser/render_widget_host.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_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_
 #define CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_
 #pragma once
 
 #include "base/callback.h"
 #include "content/common/content_export.h"
@@ skipping 145 matching lines @@
   // Once we cancel updating the text direction, we have to ignore all
   // succeeding UpdateTextDirection() requests until calling
   // NotifyTextDirection(). (We may receive keydown events even after we
   // canceled updating the text direction because of auto-repeat.)
   // Note: we cannot undo this change for compatibility with Firefox and IE.
   virtual void UpdateTextDirection(WebKit::WebTextDirection direction) = 0;
   virtual void NotifyTextDirection() = 0;
 
   virtual void Blur() = 0;
 
-  // DEPRECATED: Synchronous version of AsyncCopyFromBackingSurface.
-  // This will be removed once all the caller have been changed to use the
-  // asynchronous version.
-  virtual bool CopyFromBackingStore(const gfx::Rect& src_rect,
-                                    const gfx::Size& accelerated_dest_size,
-                                    skia::PlatformCanvas* output) = 0;
-
   // Copies the given subset of the backing store into the given (uninitialized)
   // PlatformCanvas. If |src_rect| is empty, the whole contents is copied.
-  // |callback| is invoked with true on success, false otherwise. |output| can
-  // be initialized even on failure.
-  // When accelerated compositing is active, the contents is copied
-  // asynchronously from the compositing surface, but when the backing store is
-  // available, the contents is copied synchronously because it's fast enough.
+  // NOTE: |src_rect| is not supported yet when accelerated compositing is
+  // active (http://crbug.com/118571) and the whole content is always copied
+  // regardless of |src_rect|.
   // If non empty |accelerated_dest_size| is given and accelerated compositing
   // is active, the content is shrinked so that it fits in
   // |accelerated_dest_size|. If |accelerated_dest_size| is larger than the
   // contens size, the content is not resized. If |accelerated_dest_size| is
   // empty, the size copied from the source contents is used.
-  // NOTE: |src_rect| is not supported yet when accelerated compositing is
-  // active (http://crbug.com/118571) and the whole content is always copied
-  // regardless of |src_rect|.
-  virtual void AsyncCopyFromBackingStore(
-      const gfx::Rect& src_rect,
-      const gfx::Size& accelerated_dest_size,
-      skia::PlatformCanvas* output,
-      base::Callback<void(bool)> callback) = 0;
+  // |callback| is invoked with true on success, false otherwise. |output| can
+  // be initialized even on failure.
+  // NOTE: |callback| is called synchronously if the backing store is available.
+  // When accelerated compositing is active, it is called asynchronously on Aura
+  // and synchronously on the other platforms.
+  virtual void CopyFromBackingStore(const gfx::Rect& src_rect,
+                                    const gfx::Size& accelerated_dest_size,
+                                    skia::PlatformCanvas* output,
+                                    base::Callback<void(bool)> callback) = 0;
 #if defined(TOOLKIT_GTK)
   // Paint the backing store into the target's |dest_rect|.
   virtual bool CopyFromBackingStoreToGtkWindow(const gfx::Rect& dest_rect,
                                                GdkWindow* target) = 0;
 #elif defined(OS_MACOSX)
   virtual gfx::Size GetBackingStoreSize() = 0;
   virtual bool CopyFromBackingStoreToCGContext(const CGRect& dest_rect,
                                                CGContextRef target) = 0;
 #endif
 
@@ skipping 82 matching lines @@
   // within content/.  This method is necessary because
   // RenderWidgetHost is the root of a diamond inheritance pattern, so
   // subclasses inherit it virtually, which removes our ability to
   // static_cast to the subclass.
   virtual RenderWidgetHostImpl* AsRenderWidgetHostImpl() = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_WIDGET_HOST_H_