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

Unified Diff: ui/aura/window_event_dispatcher_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-event: mandol_line Created 5 years, 1 month 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/aura/test/ui_controls_factory_ozone.cc ('k') | ui/aura/window_tree_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_event_dispatcher_unittest.cc
diff --git a/ui/aura/window_event_dispatcher_unittest.cc b/ui/aura/window_event_dispatcher_unittest.cc
index db90159cf73360cbe82f47d4ba0f6604c8f1a9ab..38c5f2ac01b556d5cb6e786c5bbcc9a09a597089 100644
--- a/ui/aura/window_event_dispatcher_unittest.cc
+++ b/ui/aura/window_event_dispatcher_unittest.cc
@@ -2513,8 +2513,10 @@ TEST_F(WindowEventDispatcherTest, GestureEventCoordinates) {
delegate.set_window(window.get());
- ui::TouchEvent touch_pressed_event(
- ui::ET_TOUCH_PRESSED, gfx::PointF(kX, kY), 0, ui::EventTimeForNow());
+ ui::TouchEvent touch_pressed_event(ui::ET_TOUCH_PRESSED, gfx::Point(), 0,
+ ui::EventTimeForNow());
+ touch_pressed_event.set_location_f(gfx::PointF(kX, kY));
+ touch_pressed_event.set_root_location_f(gfx::PointF(kX, kY));
DispatchEventUsingWindowDispatcher(&touch_pressed_event);
@@ -2564,9 +2566,7 @@ TEST_F(WindowEventDispatcherTest, TouchMovesMarkedWhenCausingScroll) {
// Delay the release to avoid fling generation.
ui::TouchEvent release(
- ui::ET_TOUCH_RELEASED,
- location + gfx::Vector2dF(200, 200),
- 0,
+ ui::ET_TOUCH_RELEASED, location + gfx::Vector2d(200, 200), 0,
ui::EventTimeForNow() + base::TimeDelta::FromSeconds(1));
DispatchEventUsingWindowDispatcher(&release);
EXPECT_FALSE(recorder.LastTouchMayCauseScrolling());
« no previous file with comments | « ui/aura/test/ui_controls_factory_ozone.cc ('k') | ui/aura/window_tree_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698