Introduce ViewRoot forwarding input/view events to native

ui/android/view_android.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/android/view_android.h"
 
 #include <algorithm>
 
 #include "base/android/jni_android.h"
 #include "cc/layers/layer.h"
 #include "jni/ViewAndroidDelegate_jni.h"
-#include "jni/ViewRoot_jni.h"
 #include "ui/android/view_client.h"
 #include "ui/android/window_android.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 
 namespace ui {
 
 using base::android::JavaParamRef;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
@@ skipping 54 matching lines @@
                                                physical_height_pix_(0) {}
 ViewAndroid::ViewAndroid() : ViewAndroid(nullptr) {}
 
 ViewAndroid::~ViewAndroid() {
   RemoveFromParent();
 
   for (auto& child : children_) {
     DCHECK_EQ(child->parent_, this);
     child->parent_ = nullptr;
   }
-
-  JNIEnv* env = base::android::AttachCurrentThread();
-  const ScopedJavaLocalRef<jobject> view_root = view_root_.get(env);
-  if (!view_root.is_null())
-    Java_ViewRoot_onDestroyNativeView(env, view_root);
 }
 
 void ViewAndroid::SetDelegate(const JavaRef<jobject>& delegate) {
   // A ViewAndroid may have its own delegate or otherwise will
   // use the next available parent's delegate.
   JNIEnv* env = base::android::AttachCurrentThread();
   delegate_ = JavaObjectWeakGlobalRef(env, delegate);
 }
 
 void ViewAndroid::AddChild(ViewAndroid* child) {
   DCHECK(child);
+  DCHECK(child->GetViewRoot() != child);  // ViewRoot cannot be a child.

[boliu, 2017/01/04 18:58:06]

just have a "bool IsViewRoot" method instead

[Jinsuk Kim, 2017/01/05 11:03:12]

Done.

   DCHECK(std::find(children_.begin(), children_.end(), child) ==
          children_.end());
-  DCHECK(!HasViewRootInTreeHierarchy() ||
-         !child->HasViewRootInSubtree());
 
   children_.push_back(child);
   if (child->parent_)
     child->RemoveFromParent();
   child->parent_ = this;
   if (physical_width_pix_ || physical_height_pix_) {
-    child->OnPhysicalBackingSizeChanged(physical_width_pix_,
-                                        physical_height_pix_);
+    child->OnPhysicalBackingSizeChangedInternal(physical_width_pix_,
+                                                physical_height_pix_);
   }
 }
 
 void ViewAndroid::RemoveFromParent() {
   if (parent_)
     parent_->RemoveChild(this);
 }
 
 ViewAndroid::ScopedAnchorView ViewAndroid::AcquireAnchorView() {
   ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
@@ skipping 33 matching lines @@
       std::find(children_.begin(), children_.end(), child);
   DCHECK(it != children_.end());
   children_.erase(it);
   child->parent_ = nullptr;
 }
 
 WindowAndroid* ViewAndroid::GetWindowAndroid() const {
   return parent_ ? parent_->GetWindowAndroid() : nullptr;
 }
 
-ScopedJavaLocalRef<jobject> ViewAndroid::CreateViewRoot() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  return Java_ViewRoot_create(env, reinterpret_cast<intptr_t>(this));
-}
-
-bool ViewAndroid::HasViewRoot() {
-  return !view_root_.is_uninitialized();
-}
-
 const ScopedJavaLocalRef<jobject> ViewAndroid::GetViewAndroidDelegate()
     const {
   JNIEnv* env = base::android::AttachCurrentThread();
   const ScopedJavaLocalRef<jobject> delegate = delegate_.get(env);
   if (!delegate.is_null())
     return delegate;
 
   return parent_ ? parent_->GetViewAndroidDelegate() : delegate;
 }
 
 cc::Layer* ViewAndroid::GetLayer() const {
   return layer_.get();
 }
 
 void ViewAndroid::SetLayer(scoped_refptr<cc::Layer> layer) {
   layer_ = layer;
   UpdateLayerBounds();
 }
 
-ScopedJavaLocalRef<jobject> ViewAndroid::GetViewRoot() {
-  JNIEnv* env = base::android::AttachCurrentThread();
-  const ScopedJavaLocalRef<jobject> view_root = view_root_.get(env);
-  if (!view_root.is_null())
-     return view_root;
-
-  DCHECK(!HasViewRootInTreeHierarchy());
-  view_root_ = JavaObjectWeakGlobalRef(env, CreateViewRoot());
-  return view_root_.get(env);
-}
-
-bool ViewAndroid::HasViewRootInTreeHierarchy() {
-  ViewAndroid* view = parent_;
-  while (view) {
-    if (view->HasViewRoot())
-      return true;
-    view = view->parent_;
-  }
-  return HasViewRootInSubtree();
-}
-
-bool ViewAndroid::HasViewRootInSubtree() {
-  if (HasViewRoot())
-    return true;
-  for (auto& child : children_) {
-    if (child->HasViewRootInSubtree())
-      return true;
-  }
-  return false;
+ViewAndroid* ViewAndroid::GetViewRoot() {
+  return parent_ ? parent_->GetViewRoot() : nullptr;
 }
 
 bool ViewAndroid::StartDragAndDrop(const JavaRef<jstring>& jtext,
                                    const JavaRef<jobject>& jimage) {
   ScopedJavaLocalRef<jobject> delegate(GetViewAndroidDelegate());
   if (delegate.is_null())
     return false;
   JNIEnv* env = base::android::AttachCurrentThread();
   return Java_ViewAndroidDelegate_startDragAndDrop(env, delegate, jtext,
                                                    jimage);
 }
 
 gfx::Size ViewAndroid::GetPhysicalBackingSize() {
   return gfx::Size(physical_width_pix_, physical_height_pix_);
 }
 
 void ViewAndroid::UpdateLayerBounds() {
   if (layer_)
     layer_->SetBounds(GetPhysicalBackingSize());
 }
 
-void ViewAndroid::OnPhysicalBackingSizeChanged(int width, int height) {
+void ViewAndroid::OnPhysicalBackingSizeChangedInternal(int width, int height) {
   if (width == physical_width_pix_ && height == physical_height_pix_)
     return;
 
   physical_width_pix_ = width;
   physical_height_pix_ = height;
   UpdateLayerBounds();
 
   if (client_)
     client_->OnPhysicalBackingSizeChanged(width, height);
 
   for (auto& child : children_)
-    child->OnPhysicalBackingSizeChanged(width, height);
+    child->OnPhysicalBackingSizeChangedInternal(width, height);
 }
-
-// static
-void OnPhysicalBackingSizeChanged(JNIEnv* env,
-                                  const JavaParamRef<jclass>& jcaller,
-                                  jlong native_view,
-                                  int width,
-                                  int height) {
-  ViewAndroid* view_android = reinterpret_cast<ViewAndroid*>(native_view);
-  view_android->OnPhysicalBackingSizeChanged(width, height);
-}
-
-bool RegisterViewRoot(JNIEnv* env) {
-  return RegisterNativesImpl(env);
-}
-
 }  // namespace ui