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

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

Issue 11280097: Initialize compositor early on. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed DEPS Created 8 years 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 | Annotate | Revision Log
« no previous file with comments | « content/browser/android/content_view_render_view.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/debug/debugger.h" 6 #include "base/debug/debugger.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_registrar.h" 9 #include "base/android/jni_registrar.h"
10 #include "content/public/app/android_library_loader_hooks.h" 10 #include "content/public/app/android_library_loader_hooks.h"
11 #include "content/public/app/content_main.h" 11 #include "content/public/app/content_main.h"
12 #include "content/public/browser/android/compositor.h"
12 #include "content/shell/android/shell_manager.h" 13 #include "content/shell/android/shell_manager.h"
13 #include "content/shell/shell.h" 14 #include "content/shell/shell.h"
14 #include "content/shell/shell_main_delegate.h" 15 #include "content/shell/shell_main_delegate.h"
15 16
16 static base::android::RegistrationMethod kRegistrationMethods[] = { 17 static base::android::RegistrationMethod kRegistrationMethods[] = {
17 { "Shell", content::Shell::Register }, 18 { "Shell", content::Shell::Register },
18 { "ShellManager", content::RegisterShellManager }, 19 { "ShellManager", content::RegisterShellManager },
19 }; 20 };
20 21
21 // This is called by the VM when the shared library is first loaded. 22 // This is called by the VM when the shared library is first loaded.
22 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) { 23 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
23 base::android::InitVM(vm); 24 base::android::InitVM(vm);
24 JNIEnv* env = base::android::AttachCurrentThread(); 25 JNIEnv* env = base::android::AttachCurrentThread();
25 if (!content::RegisterLibraryLoaderEntryHook(env)) { 26 if (!content::RegisterLibraryLoaderEntryHook(env))
26 return -1; 27 return -1;
27 }
28 28
29 // To be called only from the UI thread. If loading the library is done on 29 // To be called only from the UI thread. If loading the library is done on
30 // a separate thread, this should be moved elsewhere. 30 // a separate thread, this should be moved elsewhere.
31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods, 31 if (!base::android::RegisterNativeMethods(env, kRegistrationMethods,
32 arraysize(kRegistrationMethods))) 32 arraysize(kRegistrationMethods)))
33 return -1; 33 return -1;
34 34
35 content::Compositor::Initialize();
36
35 content::SetContentMainDelegate(new content::ShellMainDelegate()); 37 content::SetContentMainDelegate(new content::ShellMainDelegate());
36 38
37 return JNI_VERSION_1_4; 39 return JNI_VERSION_1_4;
38 } 40 }
OLDNEW
« no previous file with comments | « content/browser/android/content_view_render_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698