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/ui_resource_client_android.h" | |
12 #include "ui/base/android/window_android_compositor.h" | 13 #include "ui/base/android/window_android_compositor.h" |
13 #include "ui/base/android/window_android_observer.h" | 14 #include "ui/base/android/window_android_observer.h" |
14 | 15 |
15 namespace ui { | 16 namespace ui { |
16 | 17 |
17 using base::android::AttachCurrentThread; | 18 using base::android::AttachCurrentThread; |
18 using base::android::ScopedJavaLocalRef; | 19 using base::android::ScopedJavaLocalRef; |
19 | 20 |
20 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, jlong vsync_period) | 21 WindowAndroid::WindowAndroid(JNIEnv* env, jobject obj, jlong vsync_period) |
21 : weak_java_window_(env, obj), | 22 : weak_java_window_(env, obj), |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
80 void WindowAndroid::SetNeedsAnimate() { | 81 void WindowAndroid::SetNeedsAnimate() { |
81 if (compositor_) | 82 if (compositor_) |
82 compositor_->SetNeedsAnimate(); | 83 compositor_->SetNeedsAnimate(); |
83 } | 84 } |
84 | 85 |
85 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { | 86 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { |
86 FOR_EACH_OBSERVER( | 87 FOR_EACH_OBSERVER( |
87 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); | 88 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); |
88 } | 89 } |
89 | 90 |
91 void WindowAndroid::InitializeSystemUIResource( | |
92 SystemUIResource system_resource, | |
93 scoped_ptr<UIResourceClientAndroid> resource) { | |
94 ui_resource_map_.set(system_resource, resource.Pass()); | |
95 } | |
96 | |
97 cc::UIResourceId WindowAndroid::GetSystemUIResource( | |
98 SystemUIResource system_resource) { | |
99 if (ui_resource_map_.find(system_resource) == ui_resource_map_.end()) | |
jdduke (slow)
2014/07/08 20:10:11
Premature optimization nit =/: Might as well use g
powei
2014/07/12 00:24:46
Done. No longer here.
| |
100 return 0; | |
101 return ui_resource_map_.get(system_resource)->id(); | |
102 } | |
103 | |
90 void WindowAndroid::OnVSync(JNIEnv* env, jobject obj, jlong time_micros) { | 104 void WindowAndroid::OnVSync(JNIEnv* env, jobject obj, jlong time_micros) { |
91 base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros)); | 105 base::TimeTicks frame_time(base::TimeTicks::FromInternalValue(time_micros)); |
92 FOR_EACH_OBSERVER( | 106 FOR_EACH_OBSERVER( |
93 WindowAndroidObserver, | 107 WindowAndroidObserver, |
94 observer_list_, | 108 observer_list_, |
95 OnVSync(frame_time, vsync_period_)); | 109 OnVSync(frame_time, vsync_period_)); |
96 if (compositor_) | 110 if (compositor_) |
97 compositor_->OnVSync(frame_time, vsync_period_); | 111 compositor_->OnVSync(frame_time, vsync_period_); |
98 } | 112 } |
99 | 113 |
100 // ---------------------------------------------------------------------------- | 114 // ---------------------------------------------------------------------------- |
101 // Native JNI methods | 115 // Native JNI methods |
102 // ---------------------------------------------------------------------------- | 116 // ---------------------------------------------------------------------------- |
103 | 117 |
104 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { | 118 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { |
105 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); | 119 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); |
106 return reinterpret_cast<intptr_t>(window); | 120 return reinterpret_cast<intptr_t>(window); |
107 } | 121 } |
108 | 122 |
109 } // namespace ui | 123 } // namespace ui |
OLD | NEW |