Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/view_android.h" | 5 #include "ui/android/view_android.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
| 11 #include "jni/ViewAndroidDelegate_jni.h" | 11 #include "jni/ViewAndroidDelegate_jni.h" |
| 12 #include "ui/android/window_android.h" | 12 #include "ui/android/window_android.h" |
| 13 #include "ui/display/display.h" | 13 #include "ui/display/display.h" |
| 14 #include "ui/display/screen.h" | 14 #include "ui/display/screen.h" |
| 15 | 15 |
| 16 namespace ui { | 16 namespace ui { |
| 17 | 17 |
| 18 using base::android::JavaParamRef; | |
| 18 using base::android::JavaRef; | 19 using base::android::JavaRef; |
| 19 using base::android::ScopedJavaLocalRef; | 20 using base::android::ScopedJavaLocalRef; |
| 20 | 21 |
| 21 ViewAndroid::ScopedAnchorView::ScopedAnchorView( | 22 ViewAndroid::ScopedAnchorView::ScopedAnchorView( |
| 22 JNIEnv* env, | 23 JNIEnv* env, |
| 23 const JavaRef<jobject>& jview, | 24 const JavaRef<jobject>& jview, |
| 24 const JavaRef<jobject>& jdelegate) | 25 const JavaRef<jobject>& jdelegate) |
| 25 : view_(env, jview.obj()), delegate_(env, jdelegate.obj()) { | 26 : view_(env, jview.obj()), delegate_(env, jdelegate.obj()) { |
| 26 // If there's a view, then we need a delegate to remove it. | 27 // If there's a view, then we need a delegate to remove it. |
| 27 DCHECK(!jdelegate.is_null() || jview.is_null()); | 28 DCHECK(!jdelegate.is_null() || jview.is_null()); |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 61 view_.reset(); | 62 view_.reset(); |
| 62 delegate_.reset(); | 63 delegate_.reset(); |
| 63 } | 64 } |
| 64 | 65 |
| 65 const base::android::ScopedJavaLocalRef<jobject> | 66 const base::android::ScopedJavaLocalRef<jobject> |
| 66 ViewAndroid::ScopedAnchorView::view() const { | 67 ViewAndroid::ScopedAnchorView::view() const { |
| 67 JNIEnv* env = base::android::AttachCurrentThread(); | 68 JNIEnv* env = base::android::AttachCurrentThread(); |
| 68 return view_.get(env); | 69 return view_.get(env); |
| 69 } | 70 } |
| 70 | 71 |
| 71 ViewAndroid::ViewAndroid(const JavaRef<jobject>& delegate) | |
| 72 : parent_(nullptr) | |
| 73 , delegate_(base::android::AttachCurrentThread(), | |
| 74 delegate.obj()) {} | |
| 75 | |
| 76 ViewAndroid::ViewAndroid() : parent_(nullptr) {} | 72 ViewAndroid::ViewAndroid() : parent_(nullptr) {} |
| 77 | 73 |
| 78 ViewAndroid::~ViewAndroid() { | 74 ViewAndroid::~ViewAndroid() { |
| 79 RemoveFromParent(); | 75 RemoveFromParent(); |
| 80 | 76 |
| 81 for (std::list<ViewAndroid*>::iterator it = children_.begin(); | 77 for (std::list<ViewAndroid*>::iterator it = children_.begin(); |
| 82 it != children_.end(); it++) { | 78 it != children_.end(); it++) { |
| 83 DCHECK_EQ((*it)->parent_, this); | 79 DCHECK_EQ((*it)->parent_, this); |
| 84 (*it)->parent_ = nullptr; | 80 (*it)->parent_ = nullptr; |
| 85 } | 81 } |
| 86 } | 82 } |
| 87 | 83 |
| 88 void ViewAndroid::SetDelegate(const JavaRef<jobject>& delegate) { | 84 void ViewAndroid::SetDelegate(const JavaRef<jobject>& delegate) { |
| 85 // A ViewAndroid may have its own delegate or otherwise will | |
| 86 // use the next available parent's delegate. | |
| 89 JNIEnv* env = base::android::AttachCurrentThread(); | 87 JNIEnv* env = base::android::AttachCurrentThread(); |
| 90 delegate_ = JavaObjectWeakGlobalRef(env, delegate); | 88 delegate_ = JavaObjectWeakGlobalRef(env, delegate); |
| 89 Java_ViewAndroidDelegate_setNativePointer(env, | |
|
boliu
2016/11/15 04:51:03
delegate has a many-to-one relationship with view,
Jinsuk Kim
2016/11/15 16:47:44
My intention was to maintain only one handler per
| |
| 90 delegate, | |
| 91 reinterpret_cast<jlong>(this)); | |
| 91 } | 92 } |
| 92 | 93 |
| 93 void ViewAndroid::AddChild(ViewAndroid* child) { | 94 void ViewAndroid::AddChild(ViewAndroid* child) { |
| 94 DCHECK(child); | 95 DCHECK(child); |
| 95 DCHECK(std::find(children_.begin(), children_.end(), child) == | 96 DCHECK(std::find(children_.begin(), children_.end(), child) == |
| 96 children_.end()); | 97 children_.end()); |
| 97 | 98 |
| 98 children_.push_back(child); | 99 children_.push_back(child); |
| 99 if (child->parent_) | 100 if (child->parent_) |
| 100 child->RemoveFromParent(); | 101 child->RemoveFromParent(); |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 172 bool ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext, | 173 bool ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext, |
| 173 const JavaRef<jobject>& jimage) { | 174 const JavaRef<jobject>& jimage) { |
| 174 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate()); | 175 ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate()); |
| 175 if (delegate.is_null()) | 176 if (delegate.is_null()) |
| 176 return false; | 177 return false; |
| 177 JNIEnv* env = base::android::AttachCurrentThread(); | 178 JNIEnv* env = base::android::AttachCurrentThread(); |
| 178 return Java_ViewAndroidDelegate_startDragAndDrop(env, delegate, jtext, | 179 return Java_ViewAndroidDelegate_startDragAndDrop(env, delegate, jtext, |
| 179 jimage); | 180 jimage); |
| 180 } | 181 } |
| 181 | 182 |
| 183 void ViewAndroid::OnPhysicalBackingSizeChanged( | |
| 184 JNIEnv* env, | |
| 185 const JavaParamRef<jobject>& obj, | |
| 186 jint width, jint height) { | |
| 187 if (!physical_backing_size_changed_handler_.is_null()) { | |
| 188 physical_backing_size_changed_handler_.Run(width, height); | |
| 189 return; | |
| 190 } | |
| 191 } | |
| 192 | |
| 193 // static | |
| 194 bool ViewAndroid::RegisterViewAndroid(JNIEnv* env) { | |
| 195 return RegisterNativesImpl(env); | |
| 196 } | |
| 197 | |
| 182 } // namespace ui | 198 } // namespace ui |
| OLD | NEW |