| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 void WindowAndroid::DetachCompositor() { | 77 void WindowAndroid::DetachCompositor() { |
| 78 compositor_ = NULL; | 78 compositor_ = NULL; |
| 79 FOR_EACH_OBSERVER(WindowAndroidObserver, | 79 FOR_EACH_OBSERVER(WindowAndroidObserver, |
| 80 observer_list_, | 80 observer_list_, |
| 81 OnDetachCompositor()); | 81 OnDetachCompositor()); |
| 82 observer_list_.Clear(); | 82 observer_list_.Clear(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void WindowAndroid::RequestVSyncUpdate() { | 85 void WindowAndroid::RequestVSyncUpdate() { |
| 86 JNIEnv* env = AttachCurrentThread(); | 86 JNIEnv* env = AttachCurrentThread(); |
| 87 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject().obj()); | 87 Java_WindowAndroid_requestVSyncUpdate(env, GetJavaObject()); |
| 88 } | 88 } |
| 89 | 89 |
| 90 void WindowAndroid::SetNeedsAnimate() { | 90 void WindowAndroid::SetNeedsAnimate() { |
| 91 if (compositor_) | 91 if (compositor_) |
| 92 compositor_->SetNeedsAnimate(); | 92 compositor_->SetNeedsAnimate(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { | 95 void WindowAndroid::Animate(base::TimeTicks begin_frame_time) { |
| 96 FOR_EACH_OBSERVER( | 96 FOR_EACH_OBSERVER( |
| 97 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); | 97 WindowAndroidObserver, observer_list_, OnAnimate(begin_frame_time)); |
| (...skipping 27 matching lines...) Expand all Loading... |
| 125 } | 125 } |
| 126 | 126 |
| 127 void WindowAndroid::OnActivityStarted(JNIEnv* env, | 127 void WindowAndroid::OnActivityStarted(JNIEnv* env, |
| 128 const JavaParamRef<jobject>& obj) { | 128 const JavaParamRef<jobject>& obj) { |
| 129 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityStarted()); | 129 FOR_EACH_OBSERVER(WindowAndroidObserver, observer_list_, OnActivityStarted()); |
| 130 } | 130 } |
| 131 | 131 |
| 132 bool WindowAndroid::HasPermission(const std::string& permission) { | 132 bool WindowAndroid::HasPermission(const std::string& permission) { |
| 133 JNIEnv* env = AttachCurrentThread(); | 133 JNIEnv* env = AttachCurrentThread(); |
| 134 return Java_WindowAndroid_hasPermission( | 134 return Java_WindowAndroid_hasPermission( |
| 135 env, | 135 env, GetJavaObject(), |
| 136 GetJavaObject().obj(), | 136 base::android::ConvertUTF8ToJavaString(env, permission)); |
| 137 base::android::ConvertUTF8ToJavaString(env, permission).obj()); | |
| 138 } | 137 } |
| 139 | 138 |
| 140 bool WindowAndroid::CanRequestPermission(const std::string& permission) { | 139 bool WindowAndroid::CanRequestPermission(const std::string& permission) { |
| 141 JNIEnv* env = AttachCurrentThread(); | 140 JNIEnv* env = AttachCurrentThread(); |
| 142 return Java_WindowAndroid_canRequestPermission( | 141 return Java_WindowAndroid_canRequestPermission( |
| 143 env, | 142 env, GetJavaObject(), |
| 144 GetJavaObject().obj(), | 143 base::android::ConvertUTF8ToJavaString(env, permission)); |
| 145 base::android::ConvertUTF8ToJavaString(env, permission).obj()); | |
| 146 } | 144 } |
| 147 | 145 |
| 148 WindowAndroid* WindowAndroid::GetWindowAndroid() const { | 146 WindowAndroid* WindowAndroid::GetWindowAndroid() const { |
| 149 DCHECK(parent_ == nullptr); | 147 DCHECK(parent_ == nullptr); |
| 150 return const_cast<WindowAndroid*>(this); | 148 return const_cast<WindowAndroid*>(this); |
| 151 } | 149 } |
| 152 | 150 |
| 153 // ---------------------------------------------------------------------------- | 151 // ---------------------------------------------------------------------------- |
| 154 // Native JNI methods | 152 // Native JNI methods |
| 155 // ---------------------------------------------------------------------------- | 153 // ---------------------------------------------------------------------------- |
| 156 | 154 |
| 157 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { | 155 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
| 158 WindowAndroid* window = new WindowAndroid(env, obj); | 156 WindowAndroid* window = new WindowAndroid(env, obj); |
| 159 return reinterpret_cast<intptr_t>(window); | 157 return reinterpret_cast<intptr_t>(window); |
| 160 } | 158 } |
| 161 | 159 |
| 162 } // namespace ui | 160 } // namespace ui |
| OLD | NEW |