android: add Java-side support for browser compositor async readback

content/browser/android/content_readback_handler.h

 // Copyright 2014 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_BROWSER_ANDROID_CONTENT_READBACK_HANDLER_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_READBACK_HANDLER_H_
 
 #include <jni.h>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 
 class SkBitmap;
 
+namespace cc {
+class CopyOutputResult;
+}
+
 namespace content {
 
 // Native side of the ContentReadbackHandler.java, which issues content
 // readbacks from the Java side.
 class ContentReadbackHandler {
  public:
   // Registers the JNI methods for ContentViewRender.
   static bool RegisterContentReadbackHandler(JNIEnv* env);
 
   // Methods called from Java via JNI -----------------------------------------
   ContentReadbackHandler(JNIEnv* env, jobject obj);
   void Destroy(JNIEnv* env, jobject obj);
   void GetContentBitmap(JNIEnv* env,
                         jobject obj,
                         jint readback_id,
                         jfloat scale,
                         jobject config,
                         jfloat x,
                         jfloat y,
                         jfloat width,
                         jfloat height,
                         jobject content_view_core);
+  void GetCompositorBitmap(JNIEnv* env,
+                           jobject obj,
+                           jint readback_id,
+                           jlong native_window_android);
 
  private:
+  typedef base::Callback<void(bool, const SkBitmap&)> ResultCallback;
+
   virtual ~ContentReadbackHandler();
 
-  void OnFinishContentReadback(int readback_id,
-                               bool success,
-                               const SkBitmap& bitmap);
+  void OnFinishReadback(int readback_id,
+                        bool success,
+                        const SkBitmap& bitmap);
+
+  static void OnFinishCopyOutputRequest(

[Ted C, 2014/05/21 17:56:29]

maybe this should just be in an empty namespace to avoid the header declaration?

[powei, 2014/05/23 01:15:09]

Done.

+      const ResultCallback& result_callback,
+      scoped_ptr<cc::CopyOutputResult> copy_output_result);
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
   base::WeakPtrFactory<ContentReadbackHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentReadbackHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_READBACK_HANDLER_H_