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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/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
« ui/events/event.h ('K') | « ui/events/event_processor_unittest.cc ('k') | ui/events/ozone/evdev/event_factory_evdev.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/event_unittest.cc
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
index 9a6a7791572f35106fb3b0d8d39a978d3976a664..7afe81683d37d40909f36f4d42e18b2fe9a32ac5 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -74,7 +74,9 @@ TEST(EventTest, 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());
@@ -83,10 +85,12 @@ TEST(EventTest, ClickCount) {
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);
@@ -136,29 +140,35 @@ TEST(EventTest, DoubleClickRequiresRelease) {
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();
@@ -172,21 +182,28 @@ TEST(EventTest, SingleClickRightLeft) {
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();
@@ -692,8 +709,10 @@ TEST(EventTest, PointerDetailsTouch) {
}
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);
@@ -708,8 +727,10 @@ TEST(EventTest, PointerDetailsMouse) {
}
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,
@@ -785,7 +806,9 @@ TEST(EventTest, PointerEventCanConvertFrom) {
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.
@@ -829,8 +852,10 @@ TEST(EventTest, PointerEventType) {
};
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());
@@ -852,8 +877,10 @@ TEST(EventTest, PointerEventType) {
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);
@@ -889,8 +916,10 @@ TEST(EventTest, PointerDetailsPointer) {
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());
@@ -918,9 +947,10 @@ TEST(EventTest, PointerEventClone) {
}
{
- 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();
@@ -936,7 +966,9 @@ TEST(EventTest, PointerEventClone) {
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));
}
« ui/events/event.h ('K') | « ui/events/event_processor_unittest.cc ('k') | ui/events/ozone/evdev/event_factory_evdev.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698