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

Unified Diff: ui/events/event_unittest.cc

Issue 1300803003: Drop ui::TouchEvent shims for radius_{x,y} and force (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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/events/event.h ('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 536d393fcf3e7fbf8764ed015d79e11702270036..14aa0462bebafac12826e89087b1456332061b9b 100644
--- a/ui/events/event_unittest.cc
+++ b/ui/events/event_unittest.cc
@@ -549,13 +549,13 @@ TEST(EventTest, TouchEventRadiusDefaultsToOtherAxis) {
TouchEvent event1(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0), 0, 0, time,
non_zero_length1, 0, 0, 0);
- EXPECT_EQ(non_zero_length1, event1.radius_x());
- EXPECT_EQ(non_zero_length1, event1.radius_y());
+ 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);
- EXPECT_EQ(non_zero_length2, event2.radius_x());
- EXPECT_EQ(non_zero_length2, event2.radius_y());
+ EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_x());
+ EXPECT_EQ(non_zero_length2, event2.pointer_details().radius_y());
}
TEST(EventTest, TouchEventRotationAngleFixing) {
@@ -618,10 +618,6 @@ 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());
- EXPECT_EQ(0.0f, touch_event_plain.radius_x());
- EXPECT_EQ(0.0f, touch_event_plain.radius_y());
- EXPECT_EQ(0.0f, touch_event_plain.force());
-
ui::TouchEvent touch_event_with_details(ET_TOUCH_PRESSED, gfx::Point(0, 0), 0,
0, ui::EventTimeForNow(), 10.0f, 5.0f,
0.0f, 15.0f);
« no previous file with comments | « ui/events/event.h ('k') | ui/events/gestures/motion_event_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698