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, jlong vsync_period) | 20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj) |
21 : weak_java_window_(env, obj), | 21 : weak_java_window_(env, obj), compositor_(NULL) { |
22 compositor_(NULL), | |
23 vsync_period_(base::TimeDelta::FromInternalValue(vsync_period)) { | |
24 } | 22 } |
25 | 23 |
26 void WindowAndroid::Destroy(JNIEnv* env, jobject obj) { | 24 void WindowAndroid::Destroy(JNIEnv* env, jobject obj) { |
27 delete this; | 25 delete this; |
28 } | 26 } |
29 | 27 |
30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { | 28 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { |
31 return weak_java_window_.get(AttachCurrentThread()); | 29 return weak_java_window_.get(AttachCurrentThread()); |
32 } | 30 } |
33 | 31 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
80 void WindowAndroid::SetNeedsAnimate() { | 78 void WindowAndroid::SetNeedsAnimate() { |
81 if (compositor_) | 79 if (compositor_) |
82 compositor_->SetNeedsAnimate(); | 80 compositor_->SetNeedsAnimate(); |
83 } | 81 } |
84 | 82 |
85 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { | 83 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { |
86 FOR_EACH_OBSERVER( | 84 FOR_EACH_OBSERVER( |
87 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); | 85 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); |
88 } | 86 } |
89 | 87 |
90 void WindowAndroid::OnVSync(JNIEnv* env, jobject obj, jlong time_micros) { | 88 void WindowAndroid::OnVSync(JNIEnv* env, |
89 jobject obj, | |
90 jlong time_micros, | |
91 jlong period_micros) { | |
91 base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros)); | 92 base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros)); |
93 base::TimeDelta vsync_period( | |
94 base::TimeDelta::FromMicroseconds(period_micros)); | |
92 FOR_EACH_OBSERVER( | 95 FOR_EACH_OBSERVER( |
93 WindowAndroidObserver, | 96 WindowAndroidObserver, |
94 observer_list_, | 97 observer_list_, |
95 OnVSync(frame_time, vsync_period_)); | 98 OnVSync(frame_time, vsync_period)); |
96 if (compositor_) | 99 if (compositor_) |
97 compositor_->OnVSync(frame_time, vsync_period_); | 100 compositor_->OnVSync(frame_time, vsync_period); |
98 } | 101 } |
99 | 102 |
100 // ---------------------------------------------------------------------------- | 103 // ---------------------------------------------------------------------------- |
101 // Native JNI methods | 104 // Native JNI methods |
102 // ---------------------------------------------------------------------------- | 105 // ---------------------------------------------------------------------------- |
103 | 106 |
104 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { | 107 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { |
Sami
2014/10/01 11:42:50
Can we remove the parameter here too?
| |
105 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); | 108 WindowAndroid* window = new WindowAndroid(env, obj); |
106 return reinterpret_cast<intptr_t>(window); | 109 return reinterpret_cast<intptr_t>(window); |
107 } | 110 } |
108 | 111 |
109 } // namespace ui | 112 } // namespace ui |
OLD | NEW |