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