android_webview/native/android_webview_jni_registrar.cc - Issue 1844343005: WIP - Control the lifetime of RenderThreadManager from Java.

Unified Diff: android_webview/native/android_webview_jni_registrar.cc

Issue 1844343005: WIP - Control the lifetime of RenderThreadManager from Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Connect BVR and RTM Created 4 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« android_webview/java/src/org/chromium/android_webview/AwGLFunctor.java ('K') | « android_webview/native/BUILD.gn ('k') | android_webview/native/aw_contents.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/native/android_webview_jni_registrar.cc

diff --git a/android_webview/native/android_webview_jni_registrar.cc b/android_webview/native/android_webview_jni_registrar.cc

index cd353eca89ecf317e6ecf3085b69515f5e3fa1ac..f7044ebdff24877e28d94f4fdb72a728fb31abc7 100644

--- a/android_webview/native/android_webview_jni_registrar.cc

+++ b/android_webview/native/android_webview_jni_registrar.cc

@@ -15,6 +15,7 @@

#include "android_webview/native/aw_debug.h"

#include "android_webview/native/aw_dev_tools_server.h"

#include "android_webview/native/aw_form_database.h"

+#include "android_webview/native/aw_gl_functor.h"

#include "android_webview/native/aw_http_auth_handler.h"

#include "android_webview/native/aw_message_port_service_impl.h"

#include "android_webview/native/aw_metrics_switch.h"

@@ -36,33 +37,34 @@

namespace android_webview {

static base::android::RegistrationMethod kWebViewRegisteredMethods[] = {

- // Register JNI for android_webview classes.

- { "AndroidProtocolHandler", RegisterAndroidProtocolHandler },

- { "AwAutofillClient", RegisterAwAutofillClient },

- { "AwContents", RegisterAwContents },

- { "AwContentsBackgroundThreadClient",

- RegisterAwContentsBackgroundThreadClient },

- { "AwContentsClientBridge", RegisterAwContentsClientBridge },

- { "AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl },

- { "AwContentsStatics", RegisterAwContentsStatics },

- { "AwDebug", RegisterAwDebug },

- { "AwDevToolsServer", RegisterAwDevToolsServer },

- { "AwFormDatabase", RegisterAwFormDatabase },

- { "AwPicture", RegisterAwPicture },

- { "AwSettings", RegisterAwSettings },

- { "AwHttpAuthHandler", RegisterAwHttpAuthHandler },

- { "AwMetricsServiceClient", RegisterAwMetricsServiceClient },

- { "AwPdfExporter", RegisterAwPdfExporter },

- { "AwPermissionRequest", RegisterAwPermissionRequest },

- { "AwQuotaManagerBridge", RegisterAwQuotaManagerBridge },

- { "AwResource", AwResource::RegisterAwResource },

- { "AwWebContentsDelegate", RegisterAwWebContentsDelegate },

- { "CookieManager", RegisterCookieManager },

- { "AwWebResourceResponseImpl", RegisterAwWebResourceResponse },

- { "InputStream", RegisterInputStream },

- { "JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper },

- { "AwMessagePortService", RegisterAwMessagePortService },

- { "AwContentsLifecycleNotifier", RegisterAwContentsLifecycleNotifier },

+ // Register JNI for android_webview classes.

+ {"AndroidProtocolHandler", RegisterAndroidProtocolHandler},

+ {"AwAutofillClient", RegisterAwAutofillClient},

+ {"AwContents", RegisterAwContents},

+ {"AwContentsBackgroundThreadClient",

+ RegisterAwContentsBackgroundThreadClient},

+ {"AwContentsClientBridge", RegisterAwContentsClientBridge},

+ {"AwContentsIoThreadClientImpl", RegisterAwContentsIoThreadClientImpl},

+ {"AwContentsStatics", RegisterAwContentsStatics},

+ {"AwDebug", RegisterAwDebug},

+ {"AwDevToolsServer", RegisterAwDevToolsServer},

+ {"AwFormDatabase", RegisterAwFormDatabase},

+ {"AwPicture", RegisterAwPicture},

+ {"AwSettings", RegisterAwSettings},

+ {"AwHttpAuthHandler", RegisterAwHttpAuthHandler},

+ {"AwMetricsServiceClient", RegisterAwMetricsServiceClient},

+ {"AwPdfExporter", RegisterAwPdfExporter},

+ {"AwPermissionRequest", RegisterAwPermissionRequest},

+ {"AwQuotaManagerBridge", RegisterAwQuotaManagerBridge},

+ {"AwResource", AwResource::RegisterAwResource},

+ {"AwWebContentsDelegate", RegisterAwWebContentsDelegate},

+ {"CookieManager", RegisterCookieManager},

+ {"AwWebResourceResponseImpl", RegisterAwWebResourceResponse},

+ {"InputStream", RegisterInputStream},

+ {"JavaBrowserViewRendererHelper", RegisterJavaBrowserViewRendererHelper},

+ {"AwMessagePortService", RegisterAwMessagePortService},

+ {"AwContentsLifecycleNotifier", RegisterAwContentsLifecycleNotifier},

+ {"AwGLFunctor", RegisterAwGLFunctor},

boliu 2016/04/06 16:09:01 can you not re-format here? Hard to review. This

};

bool RegisterJni(JNIEnv* env) {