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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/event_unittest.cc

Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pointfconvert-gfx: . Created 5 years, 3 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
« cc/layers/picture_layer_impl_unittest.cc ('K') | « ui/events/event_processor_unittest.cc ('k') | ui/events/gestures/motion_event_aura.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 14aa0462bebafac12826e89087b1456332061b9b..93fc4fa5c52029da2ea7f84f060a4eaf72258693 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -58,7 +58,7 @@ TEST(EventTest, GetCharacter) {
}
TEST(EventTest, ClickCount) {
- const gfx::Point origin(0, 0);
+ const gfx::PointF origin;
MouseEvent mouseev(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0, 0);
for (int i = 1; i <=3 ; ++i) {
mouseev.SetClickCount(i);
@@ -67,7 +67,7 @@ TEST(EventTest, ClickCount) {
}
TEST(EventTest, RepeatedClick) {
- const gfx::Point origin(0, 0);
+ const gfx::PointF origin;
MouseEvent mouse_ev1(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
0);
MouseEvent mouse_ev2(ET_MOUSE_PRESSED, origin, origin, EventTimeForNow(), 0,
@@ -80,8 +80,8 @@ TEST(EventTest, RepeatedClick) {
base::TimeDelta later = start + base::TimeDelta::FromMilliseconds(1000);
// Same event.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(1, 0));
+ test_ev1.set_location(gfx::PointF());
+ test_ev2.set_location(gfx::PointF(1.f, 0.f));
test_ev1.set_time_stamp(start);
test_ev2.set_time_stamp(start);
EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
@@ -89,22 +89,22 @@ TEST(EventTest, RepeatedClick) {
EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev3));
// Close point.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(1, 0));
+ test_ev1.set_location(gfx::PointF());
+ test_ev2.set_location(gfx::PointF(1.f, 0.f));
test_ev1.set_time_stamp(start);
test_ev2.set_time_stamp(soon);
EXPECT_TRUE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
// Too far.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(10, 0));
+ test_ev1.set_location(gfx::PointF());
+ test_ev2.set_location(gfx::PointF(10.f, 0.f));
test_ev1.set_time_stamp(start);
test_ev2.set_time_stamp(soon);
EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
// Too long a time between clicks.
- test_ev1.set_location(gfx::Point(0, 0));
- test_ev2.set_location(gfx::Point(0, 0));
+ test_ev1.set_location(gfx::PointF());
+ test_ev2.set_location(gfx::PointF());
test_ev1.set_time_stamp(start);
test_ev2.set_time_stamp(later);
EXPECT_FALSE(MouseEvent::IsRepeatedClickEvent(mouse_ev1, mouse_ev2));
@@ -115,8 +115,8 @@ TEST(EventTest, RepeatedClick) {
// 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);
+ const gfx::PointF origin1;
+ const gfx::PointF origin2(100.f, 0.f);
scoped_ptr<MouseEvent> ev;
base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
@@ -152,7 +152,7 @@ TEST(EventTest, DoubleClickRequiresRelease) {
// Tests that clicking right and then left clicking does not generate a double
// click.
TEST(EventTest, SingleClickRightLeft) {
- const gfx::Point origin(0, 0);
+ const gfx::PointF origin;
scoped_ptr<MouseEvent> ev;
base::TimeDelta start = base::TimeDelta::FromMilliseconds(0);
base::TimeDelta soon = start + base::TimeDelta::FromMilliseconds(1);
@@ -547,13 +547,13 @@ TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
const float non_zero_length1 = 30;
const float non_zero_length2 = 46;
- TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
+ TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time,
non_zero_length1, 0, 0, 0);
EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_x());
EXPECT_EQ(non_zero_length1, event1.pointer_details().radius_y());
- TouchEvent event2(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- 0, non_zero_length2, 0, 0);
+ TouchEvent event2(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, 0,
+ non_zero_length2, 0, 0);
EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_x());
EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_y());
}
@@ -565,49 +565,49 @@ TEST(EventTest, TouchEventRotationAngleFixing) {
{
const float angle_in_range = 0;
- TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- radius_x, radius_y, angle_in_range, 0);
+ TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, radius_x,
+ radius_y, angle_in_range, 0);
EXPECT_FLOAT_EQ(angle_in_range, event.rotation_angle());
}
{
const float angle_in_range = 179.9f;
- TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- radius_x, radius_y, angle_in_range, 0);
+ TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, radius_x,
+ radius_y, angle_in_range, 0);
EXPECT_FLOAT_EQ(angle_in_range, event.rotation_angle());
}
{
const float angle_negative = -0.1f;
- TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- radius_x, radius_y, angle_negative, 0);
+ TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, radius_x,
+ radius_y, angle_negative, 0);
EXPECT_FLOAT_EQ(180 - 0.1f, event.rotation_angle());
}
{
const float angle_negative = -200;
- TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- radius_x, radius_y, angle_negative, 0);
+ TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, radius_x,
+ radius_y, angle_negative, 0);
EXPECT_FLOAT_EQ(360 - 200, event.rotation_angle());
}
{
const float angle_too_big = 180;
- TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- radius_x, radius_y, angle_too_big, 0);
+ TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, radius_x,
+ radius_y, angle_too_big, 0);
EXPECT_FLOAT_EQ(0, event.rotation_angle());
}
{
const float angle_too_big = 400;
- TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
- radius_x, radius_y, angle_too_big, 0);
+ TouchEvent event(ui::ET_TOUCH_PRESSED, gfx::PointF(), 0, 0, time, radius_x,
+ radius_y, angle_too_big, 0);
EXPECT_FLOAT_EQ(400 - 360, event.rotation_angle());
}
}
TEST(EventTest, PointerEventDetailsTouch) {
- ui::TouchEvent touch_event_plain(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0,
+ ui::TouchEvent touch_event_plain(ET_TOUCH_PRESSED, gfx::PointF(), 0,
ui::EventTimeForNow());
EXPECT_EQ(EventPointerType::POINTER_TYPE_TOUCH,
@@ -618,8 +618,8 @@ TEST(EventTest, PointerEventDetailsTouch) {
EXPECT_EQ(0.0f, touch_event_plain.pointer_details().tilt_x());
EXPECT_EQ(0.0f, touch_event_plain.pointer_details().tilt_y());
- ui::TouchEvent touch_event_with_details(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0,
- 0, ui::EventTimeForNow(), 10.0f, 5.0f,
+ ui::TouchEvent touch_event_with_details(ET_TOUCH_PRESSED, gfx::PointF(), 0, 0,
+ ui::EventTimeForNow(), 10.0f, 5.0f,
0.0f, 15.0f);
EXPECT_EQ(EventPointerType::POINTER_TYPE_TOUCH,
@@ -641,8 +641,8 @@ TEST(EventTest, PointerEventDetailsTouch) {
}
TEST(EventTest, PointerEventDetailsMouse) {
- ui::MouseEvent mouse_event(ET_MOUSE_PRESSED, gfx::PointF(0, 0),
- gfx::PointF(0, 0), ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent mouse_event(ET_MOUSE_PRESSED, gfx::PointF(), gfx::PointF(),
+ ui::EventTimeForNow(), 0, 0);
EXPECT_EQ(EventPointerType::POINTER_TYPE_MOUSE,
mouse_event.pointer_details().pointer_type());
@@ -663,8 +663,8 @@ TEST(EventTest, PointerEventDetailsMouse) {
}
TEST(EventTest, PointerEventDetailsStylus) {
- ui::MouseEvent stylus_event(ET_MOUSE_PRESSED, gfx::PointF(0, 0),
- gfx::PointF(0, 0), ui::EventTimeForNow(), 0, 0);
+ ui::MouseEvent stylus_event(ET_MOUSE_PRESSED, gfx::PointF(), gfx::PointF(),
+ ui::EventTimeForNow(), 0, 0);
ui::PointerDetails pointer_details(EventPointerType::POINTER_TYPE_PEN,
/* radius_x */ 0.0f,
/* radius_y */ 0.0f,
« cc/layers/picture_layer_impl_unittest.cc ('K') | « ui/events/event_processor_unittest.cc ('k') | ui/events/gestures/motion_event_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698