| 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/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 25 matching lines...) Expand all Loading... |
| 36 WindowAndroid::~WindowAndroid() { | 36 WindowAndroid::~WindowAndroid() { |
| 37 DCHECK(!compositor_); | 37 DCHECK(!compositor_); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void WindowAndroid::OnCompositingDidCommit() { | 40 void WindowAndroid::OnCompositingDidCommit() { |
| 41 FOR_EACH_OBSERVER(WindowAndroidObserver, | 41 FOR_EACH_OBSERVER(WindowAndroidObserver, |
| 42 observer_list_, | 42 observer_list_, |
| 43 OnCompositingDidCommit()); | 43 OnCompositingDidCommit()); |
| 44 } | 44 } |
| 45 | 45 |
| 46 void WindowAndroid::OnVisibilityChanged(bool visible) { | |
| 47 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, | |
| 48 OnVisibilityChanged(visible)); | |
| 49 } | |
| 50 | |
| 51 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { | 46 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { |
| 52 if (!observer_list_.HasObserver(observer)) | 47 if (!observer_list_.HasObserver(observer)) |
| 53 observer_list_.AddObserver(observer); | 48 observer_list_.AddObserver(observer); |
| 54 } | 49 } |
| 55 | 50 |
| 56 void WindowAndroid::RemoveObserver(WindowAndroidObserver* observer) { | 51 void WindowAndroid::RemoveObserver(WindowAndroidObserver* observer) { |
| 57 observer_list_.RemoveObserver(observer); | 52 observer_list_.RemoveObserver(observer); |
| 58 } | 53 } |
| 59 | 54 |
| 60 void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) { | 55 void WindowAndroid::AttachCompositor(WindowAndroidCompositor* compositor) { |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 base::TimeDelta vsync_period( | 96 base::TimeDelta vsync_period( |
| 102 base::TimeDelta::FromMicroseconds(period_micros)); | 97 base::TimeDelta::FromMicroseconds(period_micros)); |
| 103 FOR_EACH_OBSERVER( | 98 FOR_EACH_OBSERVER( |
| 104 WindowAndroidObserver, | 99 WindowAndroidObserver, |
| 105 observer_list_, | 100 observer_list_, |
| 106 OnVSync(frame_time, vsync_period)); | 101 OnVSync(frame_time, vsync_period)); |
| 107 if (compositor_) | 102 if (compositor_) |
| 108 compositor_->OnVSync(frame_time, vsync_period); | 103 compositor_->OnVSync(frame_time, vsync_period); |
| 109 } | 104 } |
| 110 | 105 |
| 111 void WindowAndroid::OnActivityResumed(JNIEnv* env, jobject obj) { | |
| 112 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityResumed()); | |
| 113 } | |
| 114 | |
| 115 void WindowAndroid::OnActivityPaused(JNIEnv* env, jobject obj) { | |
| 116 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityPaused()); | |
| 117 } | |
| 118 | |
| 119 // ---------------------------------------------------------------------------- | 106 // ---------------------------------------------------------------------------- |
| 120 // Native JNI methods | 107 // Native JNI methods |
| 121 // ---------------------------------------------------------------------------- | 108 // ---------------------------------------------------------------------------- |
| 122 | 109 |
| 123 jlong Init(JNIEnv* env, jobject obj) { | 110 jlong Init(JNIEnv* env, jobject obj) { |
| 124 WindowAndroid* window = new WindowAndroid(env, obj); | 111 WindowAndroid* window = new WindowAndroid(env, obj); |
| 125 return reinterpret_cast<intptr_t>(window); | 112 return reinterpret_cast<intptr_t>(window); |
| 126 } | 113 } |
| 127 | 114 |
| 128 } // namespace ui | 115 } // namespace ui |
| OLD | NEW |