OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ui/android/window_android.h" | 5 #include "ui/android/window_android.h" |
6 | 6 |
7 #include "base/android/context_utils.h" | 7 #include "base/android/context_utils.h" |
8 #include "base/android/jni_android.h" | 8 #include "base/android/jni_android.h" |
9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
11 #include "base/android/jni_weak_ref.h" | 11 #include "base/android/jni_weak_ref.h" |
12 #include "base/android/scoped_java_ref.h" | 12 #include "base/android/scoped_java_ref.h" |
13 #include "jni/WindowAndroid_jni.h" | 13 #include "jni/WindowAndroid_jni.h" |
14 #include "ui/android/window_android_compositor.h" | 14 #include "ui/android/window_android_compositor.h" |
15 #include "ui/android/window_android_observer.h" | 15 #include "ui/android/window_android_observer.h" |
16 | 16 |
17 namespace ui { | 17 namespace ui { |
18 | 18 |
19 using base::android::AttachCurrentThread; | 19 using base::android::AttachCurrentThread; |
20 using base::android::JavaParamRef; | 20 using base::android::JavaParamRef; |
| 21 using base::android::JavaRef; |
21 using base::android::ScopedJavaLocalRef; | 22 using base::android::ScopedJavaLocalRef; |
22 | 23 |
23 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) : compositor_(NULL) { | 24 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) : compositor_(NULL) { |
24 java_window_.Reset(env, obj); | 25 java_window_.Reset(env, obj); |
25 } | 26 } |
26 | 27 |
27 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 28 void WindowAndroid::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
28 delete this; | 29 delete this; |
29 } | 30 } |
30 | 31 |
31 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { | 32 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { |
32 return base::android::ScopedJavaLocalRef<jobject>(java_window_); | 33 return base::android::ScopedJavaLocalRef<jobject>(java_window_); |
33 } | 34 } |
34 | 35 |
35 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { | 36 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { |
36 return RegisterNativesImpl(env); | 37 return RegisterNativesImpl(env); |
37 } | 38 } |
38 | 39 |
39 WindowAndroid::~WindowAndroid() { | 40 WindowAndroid::~WindowAndroid() { |
40 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view."; | 41 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view."; |
41 DCHECK(!compositor_); | 42 DCHECK(!compositor_); |
42 } | 43 } |
43 | 44 |
44 WindowAndroid* WindowAndroid::createForTesting() { | 45 WindowAndroid* WindowAndroid::createForTesting() { |
45 JNIEnv* env = AttachCurrentThread(); | 46 JNIEnv* env = AttachCurrentThread(); |
46 jobject context = base::android::GetApplicationContext(); | 47 const JavaRef<jobject>& context = base::android::GetApplicationContext(); |
47 return new WindowAndroid( | 48 return new WindowAndroid( |
48 env, Java_WindowAndroid_createForTesting(env, context).obj()); | 49 env, Java_WindowAndroid_createForTesting(env, context).obj()); |
49 } | 50 } |
50 | 51 |
51 void WindowAndroid::OnCompositingDidCommit() { | 52 void WindowAndroid::OnCompositingDidCommit() { |
52 FOR_EACH_OBSERVER(WindowAndroidObserver, | 53 FOR_EACH_OBSERVER(WindowAndroidObserver, |
53 observer_list_, | 54 observer_list_, |
54 OnCompositingDidCommit()); | 55 OnCompositingDidCommit()); |
55 } | 56 } |
56 | 57 |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 // ---------------------------------------------------------------------------- | 153 // ---------------------------------------------------------------------------- |
153 // Native JNI methods | 154 // Native JNI methods |
154 // ---------------------------------------------------------------------------- | 155 // ---------------------------------------------------------------------------- |
155 | 156 |
156 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 157 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
157 WindowAndroid* window = new WindowAndroid(env, obj); | 158 WindowAndroid* window = new WindowAndroid(env, obj); |
158 return reinterpret_cast<intptr_t>(window); | 159 return reinterpret_cast<intptr_t>(window); |
159 } | 160 } |
160 | 161 |
161 } // namespace ui | 162 } // namespace ui |
OLD | NEW |