Add PointerDetails to ui::MouseEvent's constructors

ui/events/event_unittest.cc

 // Copyright (c) 2012 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/event.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 56 matching lines @@
   // Check if expected Unicode character was returned for a key combination
   // contains Control.
   // e.g. Control+Shift+2 produces U+200C on "Persian" keyboard.
   // http://crbug.com/582453
   KeyEvent keyev5(0x200C, VKEY_UNKNOWN, EF_CONTROL_DOWN | EF_SHIFT_DOWN);
   EXPECT_EQ(0x200C, keyev5.GetCharacter());
 }
 
 TEST(EventTest, ClickCount) {
   const gfx::Point origin(0, 0);
-  MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0);
+  MouseEvent mouseev(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   for (int i = 1; i <=3 ; ++i) {
     mouseev.SetClickCount(i);
     EXPECT_EQ(i, mouseev.GetClickCount());
   }
 }
 
 TEST(EventTest, RepeatedClick) {
   const gfx::Point origin(0, 0);
-  MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
-                       0);
-  MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
-                       0);
+  MouseEvent mouse_ev1(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
+  MouseEvent mouse_ev2(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   LocatedEventTestApi test_ev1(&mouse_ev1);
   LocatedEventTestApi test_ev2(&mouse_ev2);
 
   base::TimeTicks start = base::TimeTicks();
   base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1);
   base::TimeTicks later = start + base::TimeDelta::FromMilliseconds(1000);
 
   // Same event.
   test_ev1.set_location(gfx::Point(0, 0));
   test_ev2.set_location(gfx::Point(1, 0));
@@ skipping 29 matching lines @@
 // double click if a release event was seen for the previous click. This
 // prevents the same PRESSED event from being processed twice:
 // http://crbug.com/389162
 TEST(EventTest, DoubleClickRequiresRelease) {
   const gfx::Point origin1(0, 0);
   const gfx::Point origin2(100, 0);
   std::unique_ptr<MouseEvent> ev;
   base::TimeTicks start = base::TimeTicks();
   base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1);
 
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
-                          0, 0));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(),
-                          0, 0));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin1, origin1, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
 
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(),
-                          0, 0));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin2, origin2,
-                          EventTimeForNow(), 0, 0));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_RELEASED, origin2, origin2, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(),
-                          0, 0));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin2, origin2, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(soon);
   EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin2, origin2,
-                          EventTimeForNow(), 0, 0));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_RELEASED, origin2, origin2, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(soon);
   EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
   MouseEvent::ResetLastClickForTest();
 }
 
 // Tests that clicking right and then left clicking does not generate a double
 // click.
 TEST(EventTest, SingleClickRightLeft) {
   const gfx::Point origin(0, 0);
   std::unique_ptr<MouseEvent> ev;
   base::TimeTicks start = base::TimeTicks();
   base::TimeTicks soon = start + base::TimeDelta::FromMilliseconds(1);
 
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
-                          ui::EF_RIGHT_MOUSE_BUTTON,
-                          ui::EF_RIGHT_MOUSE_BUTTON));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
+      ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_RIGHT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
-                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_RELEASED, origin, origin, EventTimeForNow(),
-                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_RELEASED, origin, origin, EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(start);
   EXPECT_EQ(1, MouseEvent::GetRepeatCount(*ev));
-  ev.reset(new MouseEvent(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
-                          ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON));
+  ev.reset(new MouseEvent(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(),
+      ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
   ev->set_time_stamp(soon);
   EXPECT_EQ(2, MouseEvent::GetRepeatCount(*ev));
   MouseEvent::ResetLastClickForTest();
 }
 
 TEST(EventTest, KeyEvent) {
   static const struct {
     KeyboardCode key_code;
     int flags;
     uint16_t character;
@@ skipping 485 matching lines @@
   EXPECT_EQ(15.0f, touch_event_with_details.pointer_details().force);
   EXPECT_EQ(0.0f, touch_event_with_details.pointer_details().tilt_x);
   EXPECT_EQ(0.0f, touch_event_with_details.pointer_details().tilt_y);
 
   ui::TouchEvent touch_event_copy(touch_event_with_details);
   EXPECT_EQ(touch_event_with_details.pointer_details(),
             touch_event_copy.pointer_details());
 }
 
 TEST(EventTest, PointerDetailsMouse) {
-  ui::MouseEvent mouse_event(ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                             gfx::Point(0, 0), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse_event(
+      ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
 
   EXPECT_EQ(EventPointerType::POINTER_TYPE_MOUSE,
             mouse_event.pointer_details().pointer_type);
   EXPECT_EQ(0.0f, mouse_event.pointer_details().radius_x);
   EXPECT_EQ(0.0f, mouse_event.pointer_details().radius_y);
   EXPECT_TRUE(std::isnan(mouse_event.pointer_details().force));
   EXPECT_EQ(0.0f, mouse_event.pointer_details().tilt_x);
   EXPECT_EQ(0.0f, mouse_event.pointer_details().tilt_y);
 
   ui::MouseEvent mouse_event_copy(mouse_event);
   EXPECT_EQ(mouse_event.pointer_details(), mouse_event_copy.pointer_details());
 }
 
 TEST(EventTest, PointerDetailsStylus) {
-  ui::MouseEvent stylus_event(ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                              gfx::Point(0, 0), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent stylus_event(
+      ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
                                      /* pointer_id*/ 0,
                                      /* radius_x */ 0.0f,
                                      /* radius_y */ 0.0f,
                                      /* force */ 21.0f,
                                      /* tilt_x */ 45.0f,
                                      /* tilt_y */ -45.0f,
                                      /* tangential_pressure */ 0.7f,
                                      /* twist */ 196);
 
@@ skipping 55 matching lines @@
   const gfx::Point point;
   const base::TimeTicks time;
 
   // Common mouse events can be converted.
   const EventType mouse_allowed[] = {
       ET_MOUSE_PRESSED,         ET_MOUSE_DRAGGED, ET_MOUSE_MOVED,
       ET_MOUSE_ENTERED,         ET_MOUSE_EXITED,  ET_MOUSE_RELEASED,
       ET_MOUSE_CAPTURE_CHANGED,
   };
   for (size_t i = 0; i < arraysize(mouse_allowed); i++) {
-    MouseEvent event(mouse_allowed[i], point, point, time, 0, 0);
+    MouseEvent event(
+        mouse_allowed[i], point, point, time, 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
   }
   // Mouse wheel events can be converted.
   MouseWheelEvent event(gfx::Vector2d(), point, point, time, 0, 0);
   EXPECT_TRUE(PointerEvent::CanConvertFrom(event));
 
   // Common touch events can be converted.
   const EventType touch_allowed[] = {
       ET_TOUCH_PRESSED,
       ET_TOUCH_MOVED,
@@ skipping 23 matching lines @@
       {ui::ET_MOUSE_RELEASED, ui::ET_POINTER_UP},
   };
   const ui::EventType kTouchTypeMap[][2] = {
       {ui::ET_TOUCH_PRESSED, ui::ET_POINTER_DOWN},
       {ui::ET_TOUCH_MOVED, ui::ET_POINTER_MOVED},
       {ui::ET_TOUCH_RELEASED, ui::ET_POINTER_UP},
       {ui::ET_TOUCH_CANCELLED, ui::ET_POINTER_CANCELLED},
   };
 
   for (size_t i = 0; i < arraysize(kMouseTypeMap); i++) {
-    ui::MouseEvent mouse_event(kMouseTypeMap[i][0], gfx::Point(0, 0),
-                               gfx::Point(0, 0), base::TimeTicks(), 0, 0);
+    ui::MouseEvent mouse_event(
+        kMouseTypeMap[i][0], gfx::Point(0, 0), gfx::Point(0, 0),
+        base::TimeTicks(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::PointerEvent pointer_event(mouse_event);
     EXPECT_EQ(kMouseTypeMap[i][1], pointer_event.type());
     EXPECT_FALSE(pointer_event.IsMouseEvent());
     EXPECT_FALSE(pointer_event.IsTouchEvent());
     EXPECT_TRUE(pointer_event.IsPointerEvent());
   }
 
   for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) {
     ui::TouchEvent touch_event(
         kTouchTypeMap[i][0], gfx::Point(0, 0), base::TimeTicks(),
         PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
     ui::PointerEvent pointer_event(touch_event);
     EXPECT_EQ(kTouchTypeMap[i][1], pointer_event.type());
     EXPECT_FALSE(pointer_event.IsMouseEvent());
     EXPECT_FALSE(pointer_event.IsTouchEvent());
     EXPECT_TRUE(pointer_event.IsPointerEvent());
   }
 }
 
 TEST(EventTest, PointerEventId) {
   {
-    ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                               gfx::Point(0, 0), base::TimeTicks(), 0, 0);
+    ui::MouseEvent mouse_event(
+        ui::ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+        base::TimeTicks(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     ui::PointerEvent pointer_event(mouse_event);
     EXPECT_EQ(pointer_event.pointer_details().id,
               ui::PointerEvent::kMousePointerId);
   }
 
   for (int touch_id = 0; touch_id < 8; touch_id++) {
     ui::TouchEvent touch_event(
         ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), base::TimeTicks(),
         PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, touch_id));
     ui::PointerEvent pointer_event(touch_event);
@@ skipping 15 matching lines @@
   ui::PointerEvent pointer_event_from_touch(touch_event);
   EXPECT_EQ(kRadiusX, pointer_event_from_touch.pointer_details().radius_x);
   EXPECT_EQ(kRadiusY, pointer_event_from_touch.pointer_details().radius_y);
   EXPECT_EQ(kForce, pointer_event_from_touch.pointer_details().force);
   EXPECT_EQ(kRadiusX, pointer_event_from_touch.pointer_details().radius_x);
   EXPECT_EQ(0.0f, pointer_event_from_touch.pointer_details().tilt_x);
   EXPECT_EQ(0.0f, pointer_event_from_touch.pointer_details().tilt_y);
   EXPECT_EQ(EventPointerType::POINTER_TYPE_TOUCH,
             pointer_event_from_touch.pointer_details().pointer_type);
 
-  ui::MouseEvent mouse_event(ET_MOUSE_PRESSED, gfx::Point(0, 0),
-                             gfx::Point(0, 0), ui::EventTimeForNow(), 0, 0);
+  ui::MouseEvent mouse_event(
+      ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+      ui::EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   ui::PointerEvent pointer_event_from_mouse(mouse_event);
   EXPECT_EQ(mouse_event.pointer_details(),
             pointer_event_from_mouse.pointer_details());
 }
 
 TEST(EventTest, PointerEventClone) {
   {
     ui::PointerEvent ptr_event(ui::TouchEvent(
         ET_TOUCH_PRESSED, gfx::Point(0, 0), ui::EventTimeForNow(),
         PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH,
                        /* pointer_id*/ 0,
                        /* radius_x */ 10.0f,
                        /* radius_y */ 5.0f,
                        /* force */ 15.0f)));
     std::unique_ptr<ui::Event> clone(ui::Event::Clone(ptr_event));
     EXPECT_TRUE(clone->IsPointerEvent());
     ui::PointerEvent* clone_as_ptr = clone->AsPointerEvent();
 
     EXPECT_EQ(ptr_event.type(), clone_as_ptr->type());
     EXPECT_EQ(ptr_event.pointer_details().id,
               clone_as_ptr->pointer_details().id);
     EXPECT_EQ(ptr_event.pointer_details(), clone_as_ptr->pointer_details());
     EXPECT_EQ(ptr_event.location(), clone_as_ptr->location());
     EXPECT_EQ(ptr_event.root_location(), clone_as_ptr->root_location());
   }
 
   {
-    ui::PointerEvent ptr_event(
-        ui::MouseEvent(ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
-                       ui::EventTimeForNow(), 0, 0));
+    ui::PointerEvent ptr_event(ui::MouseEvent(
+        ET_MOUSE_PRESSED, gfx::Point(0, 0), gfx::Point(0, 0),
+        ui::EventTimeForNow(), 0, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)));
     std::unique_ptr<ui::Event> clone(ui::Event::Clone(ptr_event));
     EXPECT_TRUE(clone->IsPointerEvent());
     ui::PointerEvent* clone_as_ptr = clone->AsPointerEvent();
 
     EXPECT_EQ(ptr_event.type(), clone_as_ptr->type());
     EXPECT_EQ(ptr_event.pointer_details().id,
               clone_as_ptr->pointer_details().id);
     EXPECT_EQ(ptr_event.pointer_details(), clone_as_ptr->pointer_details());
     EXPECT_EQ(ptr_event.location(), clone_as_ptr->location());
     EXPECT_EQ(ptr_event.root_location(), clone_as_ptr->root_location());
   }
 }
 
 TEST(EventTest, MouseEventLatencyUIComponentExists) {
   const gfx::Point origin(0, 0);
-  MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0);
+  MouseEvent mouseev(
+      ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0,
+      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
   EXPECT_TRUE(mouseev.latency()->FindLatency(
       ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, nullptr));
 }
 
 TEST(EventTest, MouseWheelEventLatencyUIComponentExists) {
   const gfx::Point origin(0, 0);
   MouseWheelEvent mouseWheelev(gfx::Vector2d(), origin, origin,
                                EventTimeForNow(), 0, 0);
   EXPECT_TRUE(mouseWheelev.latency()->FindLatency(
       ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, nullptr));
@@ skipping 142 matching lines @@
   XButtonEvent* button_event = &(native_event.xbutton);
   button_event->type = ButtonPress;
   button_event->button = 4; // A valid wheel button number between min and max.
   MouseWheelEvent mouse_ev(&native_event);
 
   histogram_tester.ExpectTotalCount("Event.Latency.OS.MOUSE_WHEEL", 1);
 #endif
 }
 
 }  // namespace ui