| 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 19 matching lines...) Expand all Loading... |
| 30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { | 30 ScopedJavaLocalRef<jobject> WindowAndroid::GetJavaObject() { |
| 31 return weak_java_window_.get(AttachCurrentThread()); | 31 return weak_java_window_.get(AttachCurrentThread()); |
| 32 } | 32 } |
| 33 | 33 |
| 34 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { | 34 bool WindowAndroid::RegisterWindowAndroid(JNIEnv* env) { |
| 35 return RegisterNativesImpl(env); | 35 return RegisterNativesImpl(env); |
| 36 } | 36 } |
| 37 | 37 |
| 38 WindowAndroid::~WindowAndroid() { | 38 WindowAndroid::~WindowAndroid() { |
| 39 DCHECK(!compositor_); | 39 DCHECK(!compositor_); |
| 40 FOR_EACH_OBSERVER( | |
| 41 WindowAndroidObserver, observer_list_, OnWillDestroyWindow()); | |
| 42 } | 40 } |
| 43 | 41 |
| 44 void WindowAndroid::OnCompositingDidCommit() { | 42 void WindowAndroid::OnCompositingDidCommit() { |
| 45 FOR_EACH_OBSERVER(WindowAndroidObserver, | 43 FOR_EACH_OBSERVER(WindowAndroidObserver, |
| 46 observer_list_, | 44 observer_list_, |
| 47 OnCompositingDidCommit()); | 45 OnCompositingDidCommit()); |
| 48 } | 46 } |
| 49 | 47 |
| 50 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { | 48 void WindowAndroid::AddObserver(WindowAndroidObserver* observer) { |
| 51 if (!observer_list_.HasObserver(observer)) | 49 if (!observer_list_.HasObserver(observer)) |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 // ---------------------------------------------------------------------------- | 100 // ---------------------------------------------------------------------------- |
| 103 // Native JNI methods | 101 // Native JNI methods |
| 104 // ---------------------------------------------------------------------------- | 102 // ---------------------------------------------------------------------------- |
| 105 | 103 |
| 106 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { | 104 jlong Init(JNIEnv* env, jobject obj, jlong vsync_period) { |
| 107 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); | 105 WindowAndroid* window = new WindowAndroid(env, obj, vsync_period); |
| 108 return reinterpret_cast<intptr_t>(window); | 106 return reinterpret_cast<intptr_t>(window); |
| 109 } | 107 } |
| 110 | 108 |
| 111 } // namespace ui | 109 } // namespace ui |
| OLD | NEW |