| 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" | |
| 8 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 9 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 10 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 11 #include "base/android/jni_weak_ref.h" | 10 #include "base/android/jni_weak_ref.h" |
| 12 #include "base/android/scoped_java_ref.h" | 11 #include "base/android/scoped_java_ref.h" |
| 13 #include "base/observer_list.h" | 12 #include "base/observer_list.h" |
| 14 #include "base/stl_util.h" | 13 #include "base/stl_util.h" |
| 15 #include "cc/output/begin_frame_args.h" | 14 #include "cc/output/begin_frame_args.h" |
| 16 #include "cc/scheduler/begin_frame_source.h" | 15 #include "cc/scheduler/begin_frame_source.h" |
| 17 #include "jni/WindowAndroid_jni.h" | 16 #include "jni/WindowAndroid_jni.h" |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 } | 137 } |
| 139 | 138 |
| 140 WindowAndroid::~WindowAndroid() { | 139 WindowAndroid::~WindowAndroid() { |
| 141 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view."; | 140 DCHECK(parent_ == nullptr) << "WindowAndroid must be a root view."; |
| 142 DCHECK(!compositor_); | 141 DCHECK(!compositor_); |
| 143 Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject()); | 142 Java_WindowAndroid_clearNativePointer(AttachCurrentThread(), GetJavaObject()); |
| 144 } | 143 } |
| 145 | 144 |
| 146 WindowAndroid* WindowAndroid::CreateForTesting() { | 145 WindowAndroid* WindowAndroid::CreateForTesting() { |
| 147 JNIEnv* env = AttachCurrentThread(); | 146 JNIEnv* env = AttachCurrentThread(); |
| 148 const JavaRef<jobject>& context = base::android::GetApplicationContext(); | 147 long native_pointer = Java_WindowAndroid_createForTesting(env); |
| 149 long native_pointer = Java_WindowAndroid_createForTesting(env, context); | |
| 150 return reinterpret_cast<WindowAndroid*>(native_pointer); | 148 return reinterpret_cast<WindowAndroid*>(native_pointer); |
| 151 } | 149 } |
| 152 | 150 |
| 153 void WindowAndroid::DestroyForTesting() { | 151 void WindowAndroid::DestroyForTesting() { |
| 154 delete this; | 152 delete this; |
| 155 } | 153 } |
| 156 | 154 |
| 157 void WindowAndroid::OnCompositingDidCommit() { | 155 void WindowAndroid::OnCompositingDidCommit() { |
| 158 for (WindowAndroidObserver& observer : observer_list_) | 156 for (WindowAndroidObserver& observer : observer_list_) |
| 159 observer.OnCompositingDidCommit(); | 157 observer.OnCompositingDidCommit(); |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 286 // ---------------------------------------------------------------------------- | 284 // ---------------------------------------------------------------------------- |
| 287 // Native JNI methods | 285 // Native JNI methods |
| 288 // ---------------------------------------------------------------------------- | 286 // ---------------------------------------------------------------------------- |
| 289 | 287 |
| 290 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { | 288 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { |
| 291 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); | 289 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); |
| 292 return reinterpret_cast<intptr_t>(window); | 290 return reinterpret_cast<intptr_t>(window); |
| 293 } | 291 } |
| 294 | 292 |
| 295 } // namespace ui | 293 } // namespace ui |
| OLD | NEW |