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/base/android/window_android.h" | 5 #include "ui/base/android/window_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
9 #include "base/android/jni_weak_ref.h" | 9 #include "base/android/jni_weak_ref.h" |
10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
11 #include "jni/WindowAndroid_jni.h" | 11 #include "jni/WindowAndroid_jni.h" |
12 #include "ui/base/android/window_android_compositor.h" | 12 #include "ui/base/android/window_android_compositor.h" |
13 #include "ui/base/android/window_android_observer.h" | 13 #include "ui/base/android/window_android_observer.h" |
14 | 14 |
15 namespace ui { | 15 namespace ui { |
16 | 16 |
17 using base::android::AttachCurrentThread; | 17 using base::android::AttachCurrentThread; |
18 using base::android::ScopedJavaLocalRef; | 18 using base::android::ScopedJavaLocalRef; |
19 | 19 |
20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) | 20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, jlong vsync_period) |
21 : weak_java_window_(env, obj), | 21 : weak_java_window_(env, obj), |
22 compositor_(NULL) { | 22 compositor_(NULL), |
| 23 vsync_period_(base::TimeDelta::FromInternalValue(vsync_period)) { |
23 } | 24 } |
24 | 25 |
25 void WindowAndroid::Destroy(JNIEnv* env, jobject obj) { | 26 void WindowAndroid::Destroy(JNIEnv* env, jobject obj) { |
26 delete this; | 27 delete this; |
27 } | 28 } |
28 | 29 |
29 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { | 30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { |
30 return weak_java_window_.get(AttachCurrentThread()); | 31 return weak_java_window_.get(AttachCurrentThread()); |
31 } | 32 } |
32 | 33 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 } | 83 } |
83 | 84 |
84 void WindowAndroid::DetachCompositor() { | 85 void WindowAndroid::DetachCompositor() { |
85 compositor_ = NULL; | 86 compositor_ = NULL; |
86 FOR_EACH_OBSERVER(WindowAndroidObserver, | 87 FOR_EACH_OBSERVER(WindowAndroidObserver, |
87 observer_list_, | 88 observer_list_, |
88 OnDetachCompositor()); | 89 OnDetachCompositor()); |
89 observer_list_.Clear(); | 90 observer_list_.Clear(); |
90 } | 91 } |
91 | 92 |
| 93 void WindowAndroid::RequestVSyncUpdate() { |
| 94 JNIEnv* env = AttachCurrentThread(); |
| 95 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj()); |
| 96 } |
| 97 |
| 98 void WindowAndroid::OnVSync(JNIEnv* env, jobject obj, jlong time_micros) { |
| 99 FOR_EACH_OBSERVER( |
| 100 WindowAndroidObserver, |
| 101 observer_list_, |
| 102 OnVSync(base::TimeTicks::FromInternalValue(time_micros), vsync_period_)); |
| 103 } |
| 104 |
92 // ---------------------------------------------------------------------------- | 105 // ---------------------------------------------------------------------------- |
93 // Native JNI methods | 106 // Native JNI methods |
94 // ---------------------------------------------------------------------------- | 107 // ---------------------------------------------------------------------------- |
95 | 108 |
96 jlong Init(JNIEnv* env, jobject obj) { | 109 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { |
97 WindowAndroid* window = new WindowAndroid(env, obj); | 110 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); |
98 return reinterpret_cast<intptr_t>(window); | 111 return reinterpret_cast<intptr_t>(window); |
99 } | 112 } |
100 | 113 |
101 } // namespace ui | 114 } // namespace ui |
OLD | NEW |