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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) { | 170 void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) { |
171 if (compositor_ && compositor != compositor_) | 171 if (compositor_ && compositor != compositor_) |
172 DetachCompositor(); | 172 DetachCompositor(); |
173 | 173 |
174 compositor_ = compositor; | 174 compositor_ = compositor; |
175 for (WindowAndroidObserver& observer : observer_list_) | 175 for (WindowAndroidObserver& observer : observer_list_) |
176 observer.OnAttachCompositor(); | 176 observer.OnAttachCompositor(); |
177 } | 177 } |
178 | 178 |
179 void WindowAndroid::DetachCompositor() { | 179 void WindowAndroid::DetachCompositor() { |
180 compositor_ = NULL; | |
181 for (WindowAndroidObserver& observer : observer_list_) | 180 for (WindowAndroidObserver& observer : observer_list_) |
182 observer.OnDetachCompositor(); | 181 observer.OnDetachCompositor(); |
| 182 compositor_ = nullptr; |
183 observer_list_.Clear(); | 183 observer_list_.Clear(); |
184 } | 184 } |
185 | 185 |
186 void WindowAndroid::RequestVSyncUpdate() { | 186 void WindowAndroid::RequestVSyncUpdate() { |
187 JNIEnv* env = AttachCurrentThread(); | 187 JNIEnv* env = AttachCurrentThread(); |
188 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject()); | 188 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject()); |
189 } | 189 } |
190 | 190 |
191 void WindowAndroid::SetNeedsBeginFrames(bool needs_begin_frames) { | 191 void WindowAndroid::SetNeedsBeginFrames(bool needs_begin_frames) { |
192 if (needs_begin_frames_ == needs_begin_frames) | 192 if (needs_begin_frames_ == needs_begin_frames) |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 // ---------------------------------------------------------------------------- | 266 // ---------------------------------------------------------------------------- |
267 // Native JNI methods | 267 // Native JNI methods |
268 // ---------------------------------------------------------------------------- | 268 // ---------------------------------------------------------------------------- |
269 | 269 |
270 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { | 270 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj, int sdk_display_id) { |
271 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); | 271 WindowAndroid* window = new WindowAndroid(env, obj, sdk_display_id); |
272 return reinterpret_cast<intptr_t>(window); | 272 return reinterpret_cast<intptr_t>(window); |
273 } | 273 } |
274 | 274 |
275 } // namespace ui | 275 } // namespace ui |
OLD | NEW |