Add PointerDetails to ui::MouseEvent's constructors

ui/events/blink/web_input_event_unittest.cc

 // Copyright 2016 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/blink/web_input_event.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 230 matching lines @@
         << ", x_keysym:" << test_case.x_keysym
         << "}, expect: " << test_case.expected_result;
   }
 #endif
 }
 
 TEST(WebInputEventTest, TestMakeWebMouseEvent) {
   {
     // Left pressed.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
-                        EF_LEFT_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Left released.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_RELEASED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, 0,
-                        EF_LEFT_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_RELEASED, gfx::Point(123, 321), gfx::Point(123, 321),
+        timestamp, 0, EF_LEFT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Middle pressed.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, EF_MIDDLE_MOUSE_BUTTON,
-                        EF_MIDDLE_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        EF_MIDDLE_MOUSE_BUTTON, EF_MIDDLE_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Middle released.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_RELEASED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, 0,
-                        EF_MIDDLE_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_RELEASED, gfx::Point(123, 321), gfx::Point(123, 321),
+        timestamp, 0, EF_MIDDLE_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Right pressed.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, EF_RIGHT_MOUSE_BUTTON,
-                        EF_RIGHT_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        EF_RIGHT_MOUSE_BUTTON, EF_RIGHT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Right released.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_RELEASED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, 0,
-                        EF_RIGHT_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_RELEASED, gfx::Point(123, 321), gfx::Point(123, 321),
+        timestamp, 0, EF_RIGHT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Moved
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_MOVED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, 0, 0);
+    MouseEvent ui_event(
+        ET_MOUSE_MOVED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        0, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Moved with left down
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_MOVED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
-                        0);
+    MouseEvent ui_event(
+        ET_MOUSE_MOVED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        EF_LEFT_MOUSE_BUTTON, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Left with shift pressed.
     base::TimeTicks timestamp = EventTimeForNow();
     MouseEvent ui_event(
         ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
-        EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EF_LEFT_MOUSE_BUTTON);
+        EF_LEFT_MOUSE_BUTTON | EF_SHIFT_DOWN, EF_LEFT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     EXPECT_EQ(EventFlagsToWebEventModifiers(ui_event.flags()),
               webkit_event.modifiers());
     EXPECT_FLOAT_EQ(EventTimeStampToSeconds(timestamp),
                     webkit_event.timeStampSeconds());
     EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button);
     EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type());
     EXPECT_EQ(ui_event.GetClickCount(), webkit_event.clickCount);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Default values for PointerDetails.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
-                        EF_LEFT_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent webkit_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
 
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
     EXPECT_EQ(0, webkit_event.tiltX);
     EXPECT_EQ(0, webkit_event.tiltY);
     EXPECT_TRUE(std::isnan(webkit_event.force));
     EXPECT_EQ(0.0f, webkit_event.tangentialPressure);
     EXPECT_EQ(0, webkit_event.twist);
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(321, webkit_event.y);
   }
   {
     // Stylus values for PointerDetails.
     base::TimeTicks timestamp = EventTimeForNow();
-    MouseEvent ui_event(ET_MOUSE_PRESSED, gfx::Point(123, 321),
-                        gfx::Point(123, 321), timestamp, EF_LEFT_MOUSE_BUTTON,
-                        EF_LEFT_MOUSE_BUTTON);
+    MouseEvent ui_event(
+        ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
+        EF_LEFT_MOUSE_BUTTON, EF_LEFT_MOUSE_BUTTON,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
                                    /* id */ 63,
                                    /* radius_x */ 0.0f,
                                    /* radius_y */ 0.0f,
                                    /* force */ 0.8f,
                                    /* tilt_x */ 89.5f,
                                    /* tilt_y */ -89.5f,
                                    /* tangential_pressure */ 0.6f,
                                    /* twist */ 269);
     ui_event.set_pointer_details(pointer_details);
@@ skipping 66 matching lines @@
     ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers());
     ASSERT_EQ(static_cast<int>(tests[i].event.GetLocatedWindowsKeyboardCode()),
               web_event.windowsKeyCode);
   }
 }
 
 TEST(WebInputEventTest, WheelEvent) {
   const int kDeltaX = 14;
   const int kDeltaY = -3;
   ui::MouseWheelEvent ui_event(
-      ui::MouseEvent(ui::ET_UNKNOWN, gfx::Point(), gfx::Point(),
-                     base::TimeTicks(), 0, 0),
+      ui::MouseEvent(
+          ui::ET_UNKNOWN, gfx::Point(), gfx::Point(), base::TimeTicks(), 0, 0,
+          ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE)),
       kDeltaX, kDeltaY);
   blink::WebMouseWheelEvent web_event =
       MakeWebMouseWheelEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
   ASSERT_EQ(blink::WebInputEvent::MouseWheel, web_event.type());
   ASSERT_EQ(0, web_event.modifiers());
   ASSERT_EQ(kDeltaX, web_event.deltaX);
   ASSERT_EQ(kDeltaY, web_event.deltaY);
 }
 
 TEST(WebInputEventTest, MousePointerEvent) {
@@ skipping 11 matching lines @@
        ui::EF_LEFT_MOUSE_BUTTON, blink::WebInputEvent::LeftButtonDown,
        gfx::Point(100, 1), gfx::Point(50, 1)},
       {ui::ET_MOUSE_MOVED, blink::WebInputEvent::MouseMove,
        ui::EF_MIDDLE_MOUSE_BUTTON | ui::EF_RIGHT_MOUSE_BUTTON,
        blink::WebInputEvent::MiddleButtonDown |
            blink::WebInputEvent::RightButtonDown,
        gfx::Point(13, 3), gfx::Point(53, 3)},
   };
 
   for (size_t i = 0; i < arraysize(tests); i++) {
-    ui::MouseEvent ui_event(tests[i].ui_type, tests[i].location,
-                            tests[i].screen_location, base::TimeTicks(),
-                            tests[i].ui_modifiers, 0);
+    ui::MouseEvent ui_event(
+        tests[i].ui_type, tests[i].location, tests[i].screen_location,
+        base::TimeTicks(), tests[i].ui_modifiers, 0,
+        ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE));
     blink::WebMouseEvent web_event =
         MakeWebMouseEvent(ui_event, base::Bind(&GetScreenLocationFromEvent));
     ASSERT_TRUE(blink::WebInputEvent::isMouseEventType(web_event.type()));
     ASSERT_EQ(tests[i].web_type, web_event.type());
     ASSERT_EQ(tests[i].web_modifiers, web_event.modifiers());
     ASSERT_EQ(tests[i].location.x(), web_event.x);
     ASSERT_EQ(tests[i].location.y(), web_event.y);
     ASSERT_EQ(tests[i].screen_location.x(), web_event.globalX);
     ASSERT_EQ(tests[i].screen_location.y(), web_event.globalY);
   }
 }
 
 }  // namespace ui