| 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" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 return base::android::ScopedJavaLocalRef<jobject>(java_window_); | 33 return base::android::ScopedJavaLocalRef<jobject>(java_window_); |
| 34 } | 34 } |
| 35 | 35 |
| 36 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { | 36 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { |
| 37 return RegisterNativesImpl(env); | 37 return RegisterNativesImpl(env); |
| 38 } | 38 } |
| 39 | 39 |
| 40 WindowAndroid::~WindowAndroid() { | 40 WindowAndroid::~WindowAndroid() { |
| 41 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view."; | 41 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view."; |
| 42 DCHECK(!compositor_); | 42 DCHECK(!compositor_); |
| 43 Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject()); |
| 43 } | 44 } |
| 44 | 45 |
| 45 WindowAndroid* WindowAndroid::createForTesting() { | 46 WindowAndroid* WindowAndroid::CreateForTesting() { |
| 46 JNIEnv* env = AttachCurrentThread(); | 47 JNIEnv* env = AttachCurrentThread(); |
| 47 const JavaRef<jobject>& context = base::android::GetApplicationContext(); | 48 const JavaRef<jobject>& context = base::android::GetApplicationContext(); |
| 48 return new WindowAndroid( | 49 return new WindowAndroid( |
| 49 env, Java_WindowAndroid_createForTesting(env, context).obj()); | 50 env, Java_WindowAndroid_createForTesting(env, context).obj()); |
| 50 } | 51 } |
| 51 | 52 |
| 53 void WindowAndroid::DestroyForTesting() { |
| 54 delete this; |
| 55 } |
| 56 |
| 52 void WindowAndroid::OnCompositingDidCommit() { | 57 void WindowAndroid::OnCompositingDidCommit() { |
| 53 FOR_EACH_OBSERVER(WindowAndroidObserver, | 58 FOR_EACH_OBSERVER(WindowAndroidObserver, |
| 54 observer_list_, | 59 observer_list_, |
| 55 OnCompositingDidCommit()); | 60 OnCompositingDidCommit()); |
| 56 } | 61 } |
| 57 | 62 |
| 58 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { | 63 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { |
| 59 if (!observer_list_.HasObserver(observer)) | 64 if (!observer_list_.HasObserver(observer)) |
| 60 observer_list_.AddObserver(observer); | 65 observer_list_.AddObserver(observer); |
| 61 } | 66 } |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 // ---------------------------------------------------------------------------- | 156 // ---------------------------------------------------------------------------- |
| 152 // Native JNI methods | 157 // Native JNI methods |
| 153 // ---------------------------------------------------------------------------- | 158 // ---------------------------------------------------------------------------- |
| 154 | 159 |
| 155 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 160 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 156 WindowAndroid* window = new WindowAndroid(env, obj); | 161 WindowAndroid* window = new WindowAndroid(env, obj); |
| 157 return reinterpret_cast<intptr_t>(window); | 162 return reinterpret_cast<intptr_t>(window); |
| 158 } | 163 } |
| 159 | 164 |
| 160 } // namespace ui | 165 } // namespace ui |
| OLD | NEW |