Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/blink/web_input_event_unittest.cc

Issue 2786693002: Add PointerDetails to ui::MouseEvent's constructors (Closed)
Patch Set: mouse event constructor Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/chromeos/touch_exploration_controller_unittest.cc ('k') | ui/events/event.h » ('j') | ui/events/event.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/blink/web_input_event_unittest.cc
diff --git a/ui/events/blink/web_input_event_unittest.cc b/ui/events/blink/web_input_event_unittest.cc
index 768c06eec702cb4e2af00d78c814c3c216678fc2..9da8886292824a21471857bc57a08156b961281d 100644
--- a/ui/events/blink/web_input_event_unittest.cc
+++ b/ui/events/blink/web_input_event_unittest.cc
@@ -248,9 +248,10 @@ 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()),
@@ -266,9 +267,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -284,9 +286,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -302,9 +305,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -320,9 +324,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -338,9 +343,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -356,8 +362,9 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -373,9 +380,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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()),
@@ -393,7 +401,8 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
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()),
@@ -409,9 +418,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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));
@@ -428,9 +438,10 @@ TEST(WebInputEventTest, TestMakeWebMouseEvent) {
{
// 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,
@@ -517,8 +528,9 @@ 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));
@@ -550,9 +562,10 @@ TEST(WebInputEventTest, MousePointerEvent) {
};
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()));
« no previous file with comments | « ui/chromeos/touch_exploration_controller_unittest.cc ('k') | ui/events/event.h » ('j') | ui/events/event.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698