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" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
58 if (compositor_ && compositor != compositor_) | 58 if (compositor_ && compositor != compositor_) |
59 DetachCompositor(); | 59 DetachCompositor(); |
60 | 60 |
61 compositor_ = compositor; | 61 compositor_ = compositor; |
62 FOR_EACH_OBSERVER(WindowAndroidObserver, | 62 FOR_EACH_OBSERVER(WindowAndroidObserver, |
63 observer_list_, | 63 observer_list_, |
64 OnAttachCompositor()); | 64 OnAttachCompositor()); |
65 } | 65 } |
66 | 66 |
67 void WindowAndroid::DetachCompositor() { | 67 void WindowAndroid::DetachCompositor() { |
68 compositor_ = NULL; | |
69 FOR_EACH_OBSERVER(WindowAndroidObserver, | 68 FOR_EACH_OBSERVER(WindowAndroidObserver, |
70 observer_list_, | 69 observer_list_, |
71 OnDetachCompositor()); | 70 OnDetachCompositor()); |
71 // Makes |compositor_| NULL after all observers finishes their work. | |
brianderson
2014/09/04 18:45:46
This comment would be more helpful if it were a "w
| |
72 compositor_ = NULL; | |
72 observer_list_.Clear(); | 73 observer_list_.Clear(); |
73 } | 74 } |
74 | 75 |
75 void WindowAndroid::RequestVSyncUpdate() { | 76 void WindowAndroid::RequestVSyncUpdate() { |
76 JNIEnv* env = AttachCurrentThread(); | 77 JNIEnv* env = AttachCurrentThread(); |
77 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj()); | 78 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj()); |
78 } | 79 } |
79 | 80 |
80 void WindowAndroid::SetNeedsAnimate() { | 81 void WindowAndroid::SetNeedsAnimate() { |
81 if (compositor_) | 82 if (compositor_) |
(...skipping 18 matching lines...) Expand all Loading... | |
100 // ---------------------------------------------------------------------------- | 101 // ---------------------------------------------------------------------------- |
101 // Native JNI methods | 102 // Native JNI methods |
102 // ---------------------------------------------------------------------------- | 103 // ---------------------------------------------------------------------------- |
103 | 104 |
104 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { | 105 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { |
105 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); | 106 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); |
106 return reinterpret_cast<intptr_t>(window); | 107 return reinterpret_cast<intptr_t>(window); |
107 } | 108 } |
108 | 109 |
109 } // namespace ui | 110 } // namespace ui |
OLD | NEW |