Make ui::test::EventGenerator work with PointerEvents in mash

ui/events/test/event_generator.h

 // Copyright 2014 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_EVENTS_TEST_EVENT_GENERATOR_H_
 #define UI_EVENTS_TEST_EVENT_GENERATOR_H_
 
 #include <list>
 #include <memory>
 #include <vector>
@@ skipping 51 matching lines @@
   virtual void ConvertPointFromTarget(const EventTarget* target,
                                       gfx::Point* point) const = 0;
   virtual void ConvertPointToTarget(const EventTarget* target,
                                     gfx::Point* point) const = 0;
 
   // Convert a point from the coordinate system in the host that contains
   // |hosted_target| into the root window's coordinate system.
   virtual void ConvertPointFromHost(const EventTarget* hosted_target,
                                     gfx::Point* point) const = 0;
 
-  // Detemines whether the input method should be the first to handle key events
-  // before dispathcing to Views. If it does, the given |event| will be
+  // Determines if the input method should be the first to handle key events
+  // before dispatching to Views. If it does, the given |event| will be
   // dispatched and processed by the input method from the host of |target|.
   virtual void DispatchKeyEventToIME(EventTarget* target,
                                      ui::KeyEvent* event) = 0;
+
+  // Offers the event to pointer watchers on systems that provide them.
+  // Does not consume the event (pointer watchers cannot consume events).
+  virtual void DispatchEventToPointerWatchers(EventTarget* target,
+                                              const PointerEvent& event) {}
 };
 
 // ui::test::EventGenerator is a tool that generates and dispatches events.
 // Unlike |ui_controls| package in ui/base/test, this does not use platform
 // native message loops. Instead, it sends events to the event dispatcher
 // synchronously.
 //
 // This class is not suited for the following cases:
 //
 // 1) If your test depends on native events (ui::Event::native_event()).
@@ skipping 338 matching lines @@
   void UpdateCurrentDispatcher(const gfx::Point& point);
   void PressButton(int flag);
   void ReleaseButton(int flag);
 
   gfx::Point GetLocationInCurrentRoot() const;
   gfx::Point CenterOfWindow(const EventTarget* window) const;
 
   void DispatchNextPendingEvent();
   void DoDispatchEvent(Event* event, bool async);
 
+  // Offers event to pointer watchers (via delegate) if the event is a mouse or
+  // touch event.
+  void MaybeDispatchToPointerWatchers(Event* event);

[sadrul, 2017/03/17 00:08:36]

I think MaybeDispatchToPointerWatchers() never mutates |event|, right? Can this
a const& instead of a pointer?

[James Cook, 2017/03/17 02:43:16]

Done.

+
   const EventGeneratorDelegate* delegate() const;
   EventGeneratorDelegate* delegate();
 
   std::unique_ptr<EventGeneratorDelegate> delegate_;
   gfx::Point current_location_;
   EventTarget* current_target_;
   int flags_;
   bool grab_;
   ui::PointerDetails touch_pointer_details_;
 
   std::list<std::unique_ptr<Event>> pending_events_;
   // Set to true to cause events to be posted asynchronously.
   bool async_;
   Target target_;
   std::unique_ptr<base::TickClock> tick_clock_;
 
   DISALLOW_COPY_AND_ASSIGN(EventGenerator);
 };
 
 }  // namespace test
 }  // namespace ui
 
 #endif  // UI_EVENTS_TEST_EVENT_GENERATOR_H_