android: Migrate old content readback to use async readback (and delegated renderer)

content/public/browser/android/content_view_core.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_ANDROID_CONTENT_VIEW_CORE_H_
 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 
 #include <jni.h>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_controller.h"
 
+class SkBitmap;
+
 namespace cc {
 class Layer;
 }
 
 namespace gfx {
 class Rect;
 class Size;
 class SizeF;
 class Vector2dF;
 }
@@ skipping 16 matching lines @@
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
   virtual WebContents* GetWebContents() const = 0;
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
   virtual ui::ViewAndroid* GetViewAndroid() const = 0;
   virtual ui::WindowAndroid* GetWindowAndroid() const = 0;
   virtual scoped_refptr<cc::Layer> GetLayer() const = 0;
   virtual void LoadUrl(NavigationController::LoadURLParams& params) = 0;
   virtual jint GetCurrentRenderProcessId(JNIEnv* env, jobject obj) = 0;
   virtual void ShowPastePopup(int x, int y) = 0;
-  virtual unsigned int GetScaledContentTexture(
+
+  // Called with the result of a content readback.  The boolean parameter
+  // indicates whether the content reaback was successful or not.  If the
+  // readback was successful, an SkBitmap of the content is passed as the second
+  // parameter.
+  typedef base::Callback<void(bool, const SkBitmap&)> ContentBitmapCallback;

[aelias_OOO_until_Jul13, 2014/02/01 02:09:20]

Hmm, sorry for changing my mind, but it looks like this callback is a
pre-existing pattern in a lot of places.  I guess we should keep using
base::Callback<void(bool, const SkBitmap&)> for now and rename it in a future
cleanup patch.  I also think "PixelReadbackCallback" would be a better name.

[powei, 2014/02/03 10:06:52]

Done.

+
+  // Request a scaled content readback.  The result is passed through the
+  // callback.  |out_size| is returned with the size of the content.
+  virtual void GetScaledContentBitmap(
       float scale,
-      gfx::Size* out_size) = 0;
+      gfx::Size* out_size,
+      const ContentBitmapCallback& result_callback) = 0;
   virtual float GetDpiScale() const = 0;
   virtual void RequestContentClipping(const gfx::Rect& clipping,
                                       const gfx::Size& content_size) = 0;
   virtual void PauseVideo() = 0;
   virtual void ResumeVideo() = 0;
   virtual void PauseOrResumeGeolocation(bool should_pause) = 0;
 
   // Observer callback for frame metadata updates.
   typedef base::Callback<void(
       const gfx::SizeF& content_size,
       const gfx::Vector2dF& scroll_offset,
       float page_scale_factor)> UpdateFrameInfoCallback;
 
  protected:
   virtual ~ContentViewCore() {};
 };
 
 };  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_