Introduce ViewRoot forwarding input/view events to native

ui/android/view_android.h

 // Copyright 2013 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.
 
 #ifndef UI_ANDROID_VIEW_ANDROID_H_
 #define UI_ANDROID_VIEW_ANDROID_H_
 
 #include <list>
 
 #include "base/android/jni_weak_ref.h"
 #include "base/memory/ref_counted.h"
 #include "ui/android/ui_android_export.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace cc {
 class Layer;
 }
 
 namespace ui {
 
 class ViewClient;
 class WindowAndroid;
 
 // A simple container for a UI layer.
-// At the root of the hierarchy is a WindowAndroid, when attached.
+// At the root of the hierarchy is a ViewRoot, a subclass of ViewAndroid.
 class UI_ANDROID_EXPORT ViewAndroid {
  public:
   // Stores an anchored view to delete itself at the end of its lifetime
   // automatically. This helps manage the lifecyle without the dependency
   // on |ViewAndroid|.
   class ScopedAnchorView {
    public:
     ScopedAnchorView(JNIEnv* env,
                      const base::android::JavaRef<jobject>& jview,
                      const base::android::JavaRef<jobject>& jdelegate);
@@ skipping 21 matching lines @@
 
   explicit ViewAndroid(ViewClient* client);
 
   ViewAndroid();
   virtual ~ViewAndroid();
 
   // Returns the window at the root of this hierarchy, or |null|
   // if disconnected.
   virtual WindowAndroid* GetWindowAndroid() const;
 
-  // Returns |ViewRoot| associated with the current ViewAndroid.
-  // Create one if not present.
-  base::android::ScopedJavaLocalRef<jobject> GetViewRoot();
+  // Adds this view as a child of another view.
+  virtual void AddChild(ViewAndroid* child);

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

hmm, why does this need to be virtual?

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

Ah forgot to remove it after some testing. Done.

 
   // Used to return and set the layer for this view. May be |null|.
   cc::Layer* GetLayer() const;
   void SetLayer(scoped_refptr<cc::Layer> layer);
 
   void SetDelegate(const base::android::JavaRef<jobject>& delegate);
 
-  // Adds this view as a child of another view.
-  void AddChild(ViewAndroid* child);
-
   // Detaches this view from its parent.
   void RemoveFromParent();
 
   bool StartDragAndDrop(const base::android::JavaRef<jstring>& jtext,
                         const base::android::JavaRef<jobject>& jimage);
 
   ScopedAnchorView AcquireAnchorView();
   void SetAnchorRect(const base::android::JavaRef<jobject>& anchor,
                      const gfx::RectF& bounds);
 
   gfx::Size GetPhysicalBackingSize();
   void UpdateLayerBounds();
 
+ protected:
+  // Returns |ViewRoot| of this hierarchy. |null| if the hierarchy isn't
+  // attached to a |ViewRoot|.
+  virtual ViewAndroid* GetViewRoot();
+
+  virtual void RemoveChild(ViewAndroid* child);

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

this doesn't need to be virtual or protected if ViewRoot is destroyed explicitly

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

Removed virtual and turned to private.

+
   // Internal implementation of ViewClient forwarding calls to the interface.
-  void OnPhysicalBackingSizeChanged(int width, int height);
+  void OnPhysicalBackingSizeChangedInternal(int width, int height);
 
- protected:
-  ViewAndroid* parent_;
+  std::list<ViewAndroid*> children_;
 
  private:
-  void RemoveChild(ViewAndroid* child);
-
-  // Checks if any ViewAndroid instance in the tree hierarchy (including
-  // all the parents and the children) has |ViewRoot| already.
-  bool HasViewRootInTreeHierarchy();
-
-  // Checks if any children (plus this ViewAndroid itself) has |ViewRoot|.
-  bool HasViewRootInSubtree();
-
   // Returns the Java delegate for this view. This is used to delegate work
   // up to the embedding view (or the embedder that can deal with the
   // implementation details).
   const base::android::ScopedJavaLocalRef<jobject>
       GetViewAndroidDelegate() const;
 
   // Creates a new |ViewRoot| for this ViewAndroid. No parent or child
   // should have |ViewRoot| for this ViewAndroid to have one.
   base::android::ScopedJavaLocalRef<jobject> CreateViewRoot();
 
-  bool HasViewRoot();
-
-  std::list<ViewAndroid*> children_;
+  ViewAndroid* parent_;
   scoped_refptr<cc::Layer> layer_;
   JavaObjectWeakGlobalRef delegate_;
-  JavaObjectWeakGlobalRef view_root_;
   ViewClient* const client_;
 
   int physical_width_pix_;
   int physical_height_pix_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewAndroid);
 };
 
-bool RegisterViewRoot(JNIEnv* env);
-
 }  // namespace ui
 
 #endif  // UI_ANDROID_VIEW_ANDROID_H_