Route OnDragEvent through ViewAndroid tree

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/bind.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 DragEventAndroid;
 class EventForwarder;
 class MotionEventAndroid;
 class ViewClient;
 class WindowAndroid;
 
 // A simple container for a UI layer.
 // At the root of the hierarchy is a WindowAndroid, when attached.
 // Dispatches input/view events coming from Java layer. Hit testing against
 // those events is implemented so that the |ViewClient| will be invoked
 // when the event got hit on the area defined by |layout_params_|.
@@ skipping 25 matching lines @@
     // TODO(jinsukkim): Following weak refs can be cast to strong refs which
     //     cannot be garbage-collected and leak memory. Rewrite not to use them.
     //     see comments in crrev.com/2103243002.
     JavaObjectWeakGlobalRef view_;
     JavaObjectWeakGlobalRef delegate_;
 
     // Default copy/assign disabled by move constructor.
   };
 
   // Layout parameters used to set the view's position and size.
-  // Position is in parent's coordinate space.
+  // Position is in parent's coordinate space, and all the values
+  // are in CSS pixel.
   struct LayoutParams {
     static LayoutParams MatchParent() { return {true, 0, 0, 0, 0}; }
     static LayoutParams Normal(int x, int y, int width, int height) {
       return {false, x, y, width, height};
     };
 
+    bool HitBy(const gfx::Point& point) {

[boliu, 2017/05/24 22:54:02]

this should not be part of the public interface

probably should un-inline everything in this struct in a follow up

[Jinsuk Kim, 2017/05/25 03:18:19]

Reverted (inlined it back).

+      if (match_parent)
+        return true;
+      return gfx::Rect(x, y, width, height).Contains(point);
+    }
+
     bool match_parent;  // Bounds matches that of the parent if true.
     int x;
     int y;
     int width;
     int height;
 
     LayoutParams(const LayoutParams& p) = default;
 
    private:
     LayoutParams(bool match_parent, int x, int y, int width, int height)
@@ skipping 61 matching lines @@
 
   ScopedAnchorView AcquireAnchorView();
   void SetAnchorRect(const base::android::JavaRef<jobject>& anchor,
                      const gfx::RectF& bounds);
 
   // This may return null.
   base::android::ScopedJavaLocalRef<jobject> GetContainerView();
 
   float GetDipScale();
 
+  bool HitBy(const gfx::Point& point);

[boliu, 2017/05/24 22:54:02]

ditto does this need to be public?

[Jinsuk Kim, 2017/05/25 03:18:18]

Mistake. changed to private.

+
  protected:
   ViewAndroid* parent_;
 
  private:
   friend class EventForwarder;
   friend class ViewAndroidBoundsTest;
 
-  using ViewClientCallback =
-      const base::Callback<bool(ViewClient*, const MotionEventAndroid&)>;
-
+  bool OnDragEvent(const DragEventAndroid& event);
   bool OnTouchEvent(const MotionEventAndroid& event, bool for_touch_handle);
   bool OnMouseEvent(const MotionEventAndroid& event);
   bool OnMouseWheelEvent(const MotionEventAndroid& event);
 
   void RemoveChild(ViewAndroid* child);
 
-  bool HitTest(ViewClientCallback send_to_client,
-               const MotionEventAndroid& event);
+  template <typename E, typename T>
+  bool HitTest(T send_to_client, const E& event, const gfx::Point& point);
 
+  static bool SendDragEventToClient(ViewClient* client,
+                                    const DragEventAndroid& event,
+                                    const gfx::Point& point);
   static bool SendTouchEventToClient(bool for_touch_handle,
                                      ViewClient* client,
-                                     const MotionEventAndroid& event);
+                                     const MotionEventAndroid& event,
+                                     const gfx::Point& point);
   static bool SendMouseEventToClient(ViewClient* client,
-                                     const MotionEventAndroid& event);
+                                     const MotionEventAndroid& event,
+                                     const gfx::Point& point);
   static bool SendMouseWheelEventToClient(ViewClient* client,
-                                          const MotionEventAndroid& event);
+                                          const MotionEventAndroid& event,
+                                          const gfx::Point& point);
 
   bool has_event_forwarder() const { return !!event_forwarder_; }
 
   // Checks if there is any event forwarder in any node up to root.
   static bool RootPathHasEventForwarder(ViewAndroid* view);
 
   // Checks if there is any event forwarder in the node paths down to
   // each leaf of subtree.
   static bool SubtreeHasEventForwarder(ViewAndroid* view);
 
@@ skipping 17 matching lines @@
 
   gfx::Vector2dF content_offset_;  // in CSS pixel.
   std::unique_ptr<EventForwarder> event_forwarder_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewAndroid);
 };
 
 }  // namespace ui
 
 #endif  // UI_ANDROID_VIEW_ANDROID_H_