Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: content/shell/android/shell_library_loader.cc

Issue 2501193003: Selectively perform JNI registration in render processes on Android. (Closed)
Patch Set: Conditionally register JNI based on process type. Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/jni_android.h" 5 #include "base/android/jni_android.h"
6 #include "base/bind.h" 6 #include "base/bind.h"
7 #include "content/public/app/content_jni_onload.h" 7 #include "content/public/app/content_jni_onload.h"
8 #include "content/public/app/content_main.h" 8 #include "content/public/app/content_main.h"
9 #include "content/public/browser/android/compositor.h" 9 #include "content/public/browser/android/compositor.h"
10 #include "content/shell/android/shell_jni_registrar.h" 10 #include "content/shell/android/shell_jni_registrar.h"
11 #include "content/shell/app/shell_main_delegate.h" 11 #include "content/shell/app/shell_main_delegate.h"
12 12
13 namespace { 13 namespace {
14 14
15 bool RegisterJNI(JNIEnv* env) { 15 bool RegisterJNI(JNIEnv* env) {
16 return content::android::RegisterShellJni(env); 16 return content::android::RegisterShellJni(env);
17 } 17 }
18 18
19 bool Init() { 19 bool Init() {
20 content::Compositor::Initialize(); 20 content::Compositor::Initialize();
21 content::SetContentMainDelegate(new content::ShellMainDelegate()); 21 content::SetContentMainDelegate(new content::ShellMainDelegate());
22 return true; 22 return true;
23 } 23 }
24 24
25 } // namespace 25 } // namespace
26 26
27 27
28 // This is called by the VM when the shared library is first loaded. 28 // This is called by the VM when the shared library is first loaded.
29 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 29 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
30 base::android::InitVM(vm);
31 base::android::InitJniRegistrationType(base::android::AttachCurrentThread(),
32 true);
Torne 2017/01/12 13:48:06 Seems like we shouldn't have to force it for the s
30 std::vector<base::android::RegisterCallback> register_callbacks; 33 std::vector<base::android::RegisterCallback> register_callbacks;
31 register_callbacks.push_back(base::Bind(&RegisterJNI)); 34 register_callbacks.push_back(base::Bind(&RegisterJNI));
32 std::vector<base::android::InitCallback> init_callbacks; 35 std::vector<base::android::InitCallback> init_callbacks;
33 init_callbacks.push_back(base::Bind(&Init)); 36 init_callbacks.push_back(base::Bind(&Init));
34 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) || 37 if (!content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
35 !content::android::OnJNIOnLoadInit(init_callbacks)) { 38 !content::android::OnJNIOnLoadInit(init_callbacks)) {
36 return -1; 39 return -1;
37 } 40 }
38 return JNI_VERSION_1_4; 41 return JNI_VERSION_1_4;
39 } 42 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698