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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/touch/touch_observer_hud_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
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/touch/touch_uma.cc » ('j') | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud_unittest.cc
diff --git a/ash/touch/touch_observer_hud_unittest.cc b/ash/touch/touch_observer_hud_unittest.cc
index f7293a55a429d3ee8bb6d7e7049355b91d3985c8..a6a313b2ed7b894679b1540d7701279c7ed23fb8 100644
--- a/ash/touch/touch_observer_hud_unittest.cc
+++ b/ash/touch/touch_observer_hud_unittest.cc
@@ -291,7 +291,7 @@ class TouchHudProjectionTest : public TouchHudTestBase {
}
void SendTouchEventToInternalHud(ui::EventType type,
- const gfx::Point& location,
+ const gfx::PointF& location,
int touch_id) {
ui::TouchEvent event(type, location, touch_id, event_time);
GetInternalTouchHudProjection()->OnTouchEvent(&event);
@@ -500,13 +500,14 @@ TEST_F(TouchHudProjectionTest, TouchMoveRelease) {
GetInternalTouchHudProjection());
EXPECT_EQ(0, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::PointF(10.f, 10.f), 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::PointF(10.f, 20.f), 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::Point(10, 20), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::PointF(10.f, 20.f),
+ 1);
EXPECT_EQ(0, GetInternalTouchPointsCount());
// Disabling projection touch HUD shoud remove it without crashing.
@@ -525,13 +526,14 @@ TEST_F(TouchHudProjectionTest, TouchMoveCancel) {
GetInternalTouchHudProjection());
EXPECT_EQ(0, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::PointF(10.f, 10.f), 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::PointF(10.f, 20.f), 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_CANCELLED, gfx::Point(10, 20), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_CANCELLED, gfx::PointF(10.f, 20.f),
+ 1);
EXPECT_EQ(0, GetInternalTouchPointsCount());
// Disabling projection touch HUD shoud remove it without crashing.
@@ -549,22 +551,24 @@ TEST_F(TouchHudProjectionTest, DoubleTouch) {
GetInternalTouchHudProjection());
EXPECT_EQ(0, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::PointF(10.f, 10.f), 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(20, 10), 2);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::PointF(20.f, 10.f), 2);
EXPECT_EQ(2, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(10, 20), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::PointF(10.f, 20.f), 1);
EXPECT_EQ(2, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::Point(20, 20), 2);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_MOVED, gfx::PointF(20.f, 20.f), 2);
EXPECT_EQ(2, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::Point(10, 20), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::PointF(10.f, 20.f),
+ 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::Point(20, 20), 2);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_RELEASED, gfx::PointF(20.f, 20.f),
+ 2);
EXPECT_EQ(0, GetInternalTouchPointsCount());
// Disabling projection touch HUD shoud remove it without crashing.
@@ -583,7 +587,7 @@ TEST_F(TouchHudProjectionTest, DisableWhileTouching) {
GetInternalTouchHudProjection());
EXPECT_EQ(0, GetInternalTouchPointsCount());
- SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10), 1);
+ SendTouchEventToInternalHud(ui::ET_TOUCH_PRESSED, gfx::PointF(10.f, 10.f), 1);
EXPECT_EQ(1, GetInternalTouchPointsCount());
// Disabling projection touch HUD shoud remove it without crashing.
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/touch/touch_uma.cc » ('j') | cc/layers/delegated_renderer_layer_impl_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698