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

Unified Diff: ui/events/event_unittest.cc

Issue 1975533002: Change ui::Event::time_stamp from TimeDelta to TimeTicks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix gesture recognizer tests Created 4 years, 7 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
Index: ui/events/event_unittest.cc
diff --git a/ui/events/event_unittest.cc b/ui/events/event_unittest.cc
index 505e626d23665a35e0aefcd337dfe68d4e0c818b..22166bb5c1a6dc3a2ec3229d9992a4593f94a958 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -89,9 +89,9 @@ TEST(EventTest, RepeatedClick) {
LocatedEventTestApi test_ev1(&mouse_ev1);
LocatedEventTestApi test_ev2(&mouse_ev2);
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
- base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000);
+ 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));
@@ -132,8 +132,8 @@ TEST(EventTest, DoubleClickRequiresRelease) {
const gfx::Point origin1(0, 0);
const gfx::Point origin2(100, 0);
std::unique_ptr<MouseEvent> ev;
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
+ 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));
@@ -168,8 +168,8 @@ TEST(EventTest, DoubleClickRequiresRelease) {
TEST(EventTest, SingleClickRightLeft) {
const gfx::Point origin(0, 0);
std::unique_ptr<MouseEvent> ev;
- base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
- base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
+ 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,
@@ -567,7 +567,7 @@ TEST(EventTest, AutoRepeat) {
#endif // USE_X11 || OS_WIN
TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
- const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0);
+ const base::TimeTicks time = base::TimeTicks();
const float non_zero_length1 = 30;
const float non_zero_length2 = 46;
@@ -583,7 +583,7 @@ TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
}
TEST(EventTest, TouchEventRotationAngleFixing) {
- const base::TimeDelta time = base::TimeDelta::FromMilliseconds(0);
+ const base::TimeTicks time = base::TimeTicks();
const float radius_x = 20;
const float radius_y = 10;
@@ -733,7 +733,7 @@ TEST(EventTest, PointerDetailsCustomTouch) {
TEST(EventTest, PointerEventCanConvertFrom) {
const gfx::Point point;
- const base::TimeDelta time;
+ const base::TimeTicks time;
// Common mouse events can be converted.
const EventType mouse_allowed[] = {
@@ -795,7 +795,7 @@ 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::TimeDelta(), 0, 0);
+ gfx::Point(0, 0), base::TimeTicks(), 0, 0);
ui::PointerEvent pointer_event(mouse_event);
EXPECT_EQ(kMouseTypeMap[i][1], pointer_event.type());
EXPECT_FALSE(pointer_event.IsMouseEvent());
@@ -805,7 +805,7 @@ TEST(EventTest, PointerEventType) {
for (size_t i = 0; i < arraysize(kTouchTypeMap); i++) {
ui::TouchEvent touch_event(kTouchTypeMap[i][0], gfx::Point(0, 0), 0,
- base::TimeDelta());
+ base::TimeTicks());
ui::PointerEvent pointer_event(touch_event);
EXPECT_EQ(kTouchTypeMap[i][1], pointer_event.type());
EXPECT_FALSE(pointer_event.IsMouseEvent());
@@ -817,14 +817,14 @@ TEST(EventTest, PointerEventType) {
TEST(EventTest, PointerEventId) {
{
ui::MouseEvent mouse_event(ui::ET_MOUSE_PRESSED, gfx::Point(0, 0),
- gfx::Point(0, 0), base::TimeDelta(), 0, 0);
+ gfx::Point(0, 0), base::TimeTicks(), 0, 0);
ui::PointerEvent pointer_event(mouse_event);
EXPECT_EQ(pointer_event.pointer_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), touch_id,
- base::TimeDelta());
+ base::TimeTicks());
ui::PointerEvent pointer_event(touch_event);
EXPECT_EQ(pointer_event.pointer_id(), touch_id);
}

Powered by Google App Engine
This is Rietveld 408576698