content/browser/renderer_host/input/input_router_impl_unittest.cc - Issue 1372253002: gfx: Make conversions from gfx::Point to PointF explicit.

Unified Diff: content/browser/renderer_host/input/input_router_impl_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') | « content/browser/devtools/protocol/input_handler.cc ('k') | content/browser/renderer_host/input/synthetic_gesture_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/input/input_router_impl_unittest.cc

diff --git a/content/browser/renderer_host/input/input_router_impl_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc

index 034eb5ba27b2b3331739dd2c0ff9348903f5fa92..3024c0584f5dc7606d25eb94cc877b6fb4b52972 100644

--- a/content/browser/renderer_host/input/input_router_impl_unittest.cc

+++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc

@@ -876,8 +876,8 @@ TEST_F(InputRouterImplTest, AckedTouchEventState) {

SetTouchTimestamp(timestamp);

uint32 touch_press_event_id1 = SendTouchEvent();

EXPECT_EQ(1U, GetSentMessageCountAndResetSink());

- expected_events.push_back(new ui::TouchEvent(ui::ET_TOUCH_PRESSED,

- gfx::Point(1, 1), 0, timestamp));

+ expected_events.push_back(new ui::TouchEvent(

+ ui::ET_TOUCH_PRESSED, gfx::PointF(1.f, 1.f), 0, timestamp));

// Move the finger.

timestamp += base::TimeDelta::FromSeconds(10);

@@ -885,8 +885,8 @@ TEST_F(InputRouterImplTest, AckedTouchEventState) {

SetTouchTimestamp(timestamp);

uint32 touch_move_event_id1 = SendTouchEvent();

EXPECT_FALSE(TouchEventQueueEmpty());

- expected_events.push_back(new ui::TouchEvent(ui::ET_TOUCH_MOVED,

- gfx::Point(500, 500), 0, timestamp));

+ expected_events.push_back(new ui::TouchEvent(

+ ui::ET_TOUCH_MOVED, gfx::PointF(500.f, 500.f), 0, timestamp));

// Now press a second finger.

timestamp += base::TimeDelta::FromSeconds(10);

@@ -894,8 +894,8 @@ TEST_F(InputRouterImplTest, AckedTouchEventState) {

SetTouchTimestamp(timestamp);

uint32 touch_press_event_id2 = SendTouchEvent();

EXPECT_FALSE(TouchEventQueueEmpty());

- expected_events.push_back(new ui::TouchEvent(ui::ET_TOUCH_PRESSED,

- gfx::Point(2, 2), 1, timestamp));

+ expected_events.push_back(new ui::TouchEvent(

+ ui::ET_TOUCH_PRESSED, gfx::PointF(2.f, 2.f), 1, timestamp));

// Move both fingers.

timestamp += base::TimeDelta::FromSeconds(10);

@@ -904,10 +904,10 @@ TEST_F(InputRouterImplTest, AckedTouchEventState) {

SetTouchTimestamp(timestamp);

uint32 touch_move_event_id2 = SendTouchEvent();

EXPECT_FALSE(TouchEventQueueEmpty());

- expected_events.push_back(new ui::TouchEvent(ui::ET_TOUCH_MOVED,

- gfx::Point(10, 10), 0, timestamp));

- expected_events.push_back(new ui::TouchEvent(ui::ET_TOUCH_MOVED,

- gfx::Point(20, 20), 1, timestamp));

+ expected_events.push_back(new ui::TouchEvent(

+ ui::ET_TOUCH_MOVED, gfx::PointF(10.f, 10.f), 0, timestamp));

+ expected_events.push_back(new ui::TouchEvent(

+ ui::ET_TOUCH_MOVED, gfx::PointF(20.f, 20.f), 1, timestamp));

// Receive the ACKs and make sure the generated events from the acked events

// are correct.