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

ui/events/test/event_generator.cc

 // 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.
 
 #include "ui/events/test/event_generator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 668 matching lines @@
     if (pending_events_.empty()) {
       base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(&EventGenerator::DispatchNextPendingEvent,
                      base::Unretained(this)));
     }
     pending_events_.push_back(std::move(pending_event));
   } else {
     if (event->IsKeyEvent())
       delegate()->DispatchKeyEventToIME(current_target_, event->AsKeyEvent());
+    MaybeDispatchToPointerWatchers(*event);
     if (!event->handled()) {
       ui::EventSource* event_source =
           delegate()->GetEventSource(current_target_);
       ui::EventSourceTestApi event_source_test(event_source);
       ui::EventDispatchDetails details =
           event_source_test.SendEventToProcessor(event);
       CHECK(!details.dispatcher_destroyed);
     }
   }
 }
 
+void EventGenerator::MaybeDispatchToPointerWatchers(const Event& event) {
+  // Regular pointer events can be dispatched directly.
+  if (event.IsPointerEvent()) {
+    delegate()->DispatchEventToPointerWatchers(current_target_,
+                                               *event.AsPointerEvent());
+    return;
+  }
+
+  // PointerWatchers always use pointer events, so mouse and touch events
+  // need to be converted.
+  if (!PointerEvent::CanConvertFrom(event))
+    return;
+  if (event.IsMouseEvent()) {
+    delegate()->DispatchEventToPointerWatchers(
+        current_target_, PointerEvent(*event.AsMouseEvent()));
+  } else if (event.IsTouchEvent()) {
+    delegate()->DispatchEventToPointerWatchers(
+        current_target_, PointerEvent(*event.AsTouchEvent()));
+  }
+}
+
 void EventGenerator::DispatchNextPendingEvent() {
   DCHECK(!pending_events_.empty());
   ui::Event* event = pending_events_.front().get();
   DoDispatchEvent(event, false);
   pending_events_.pop_front();
   if (!pending_events_.empty()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&EventGenerator::DispatchNextPendingEvent,
                    base::Unretained(this)));
   }
 }
 
 const EventGeneratorDelegate* EventGenerator::delegate() const {
   if (delegate_)
     return delegate_.get();
 
   DCHECK(default_delegate);
   return default_delegate;
 }
 
 EventGeneratorDelegate* EventGenerator::delegate() {
   return const_cast<EventGeneratorDelegate*>(
       const_cast<const EventGenerator*>(this)->delegate());
 }
 
 }  // namespace test
 }  // namespace ui