Android WebView: Make a custom Picture subclass

android_webview/native/aw_contents.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 "android_webview/native/aw_contents.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h"
 #include "android_webview/browser/in_process_view_renderer.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_autofill_manager_delegate.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_client_bridge.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
+#include "android_webview/native/aw_picture.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.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/atomicops.h"
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/cert/x509_certificate.h"
+#include "third_party/skia/include/core/SkPicture.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
 struct AwDrawSWFunctionTable;
 struct AwDrawGLFunctionTable;
 
 using autofill::AutofillDriverImpl;
 using autofill::AutofillManager;
 using base::android::AttachCurrentThread;
@@ skipping 19 matching lines @@
   reinterpret_cast<android_webview::BrowserViewRenderer*>(view_context)->DrawGL(
       draw_info);
 }
 }
 
 namespace android_webview {
 
 namespace {
 
 JavaBrowserViewRendererHelper* java_renderer_helper() {
-  static JavaBrowserViewRendererHelper* g_instance
-      = new JavaBrowserViewRendererHelper;
-  return g_instance;
+  return JavaBrowserViewRendererHelper::GetInstance();
 }
 
 const void* kAwContentsUserDataKey = &kAwContentsUserDataKey;
 
 class AwContentsUserData : public base::SupportsUserData::Data {
  public:
   AwContentsUserData(AwContents* ptr) : contents_(ptr) {}
 
   static AwContents* GetContents(WebContents* web_contents) {
     if (!web_contents)
@@ skipping 651 matching lines @@
 
 void AwContents::OnWebLayoutPageScaleFactorChanged(float page_scale_factor) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_onWebLayoutPageScaleFactorChanged(env, obj.obj(),
                                                          page_scale_factor);
 }
 
-ScopedJavaLocalRef<jobject> AwContents::CapturePicture(JNIEnv* env,
-                                                       jobject obj,
-                                                       int width,
-                                                       int height) {
-  return browser_view_renderer_->CapturePicture(width, height);
+jint AwContents::CapturePicture(JNIEnv* env,
+                                jobject obj,
+                                int width,
+                                int height) {
+  return reinterpret_cast<jint>(new AwPicture(
+      browser_view_renderer_->CapturePicture(width, height)));
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview