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

content/browser/android/content_view_core_impl.cc

 // Copyright 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/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
+#include "base/callback_helpers.h"
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "content/browser/android/content_video_view.h"
 #include "content/browser/android/interstitial_page_delegate_android.h"
@@ skipping 563 matching lines @@
 void ContentViewCoreImpl::ShowPastePopup(int x_dip, int y_dip) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_ContentViewCore_showPastePopup(env, obj.obj(),
                                       static_cast<jint>(x_dip),
                                       static_cast<jint>(y_dip));
 }
 
-unsigned int ContentViewCoreImpl::GetScaledContentTexture(
+void ContentViewCoreImpl::OnFinishGetScaledContentBitmap(
+    const base::Callback<void(bool, const SkBitmap&)>& compositor_callback,
+    bool success,

[no sievers, 2014/01/29 21:13:48]

Looks like you don't need this method anymore but can use the original callback
below.

[powei, 2014/01/30 00:54:12]

Done.

+    const SkBitmap& bitmap) {
+  compositor_callback.Run(success, bitmap);
+}
+
+void ContentViewCoreImpl::GetScaledContentBitmap(
     float scale,
-    gfx::Size* out_size) {
+    gfx::Size* out_size,
+    const base::Callback<void(bool, const SkBitmap&)>& compositor_callback) {
   RenderWidgetHostViewAndroid* view = GetRenderWidgetHostViewAndroid();
-  if (!view)
-    return 0;
+  if (!view || !view->IsSurfaceAvailableForCopy()) {
+    compositor_callback.Run(false, SkBitmap());
+    return;
+  }
 
-  return view->GetScaledContentTexture(scale, out_size);
+  base::Callback<void(bool, const SkBitmap&)> callback =
+      base::Bind(&ContentViewCoreImpl::OnFinishGetScaledContentBitmap,
+                 compositor_callback);
+  view->GetScaledContentBitmap(scale, out_size, callback);
 }
 
 void ContentViewCoreImpl::StartContentIntent(const GURL& content_url) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
   ScopedJavaLocalRef<jstring> jcontent_url =
       ConvertUTF8ToJavaString(env, content_url.spec());
   Java_ContentViewCore_startContentIntent(env,
@@ skipping 1093 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content