summaryrefslogtreecommitdiff
path: root/chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc')
-rw-r--r--chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc54
1 files changed, 27 insertions, 27 deletions
diff --git a/chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc b/chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc
index c2a164bbbb1..cd7acb67c50 100644
--- a/chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc
+++ b/chromium/third_party/blink/renderer/core/input/pointer_event_manager_test.cc
@@ -82,8 +82,8 @@ class PointerEventManagerTest : public SimTest {
WebPointerEvent CreateTestPointerEvent(
WebInputEvent::Type type,
WebPointerProperties::PointerType pointer_type,
- WebFloatPoint position_in_widget = WebFloatPoint(100, 100),
- WebFloatPoint position_in_screen = WebFloatPoint(100, 100),
+ gfx::PointF position_in_widget = gfx::PointF(100, 100),
+ gfx::PointF position_in_screen = gfx::PointF(100, 100),
int movement_x = 0,
int movement_y = 0,
float width = 1,
@@ -97,7 +97,7 @@ class PointerEventManagerTest : public SimTest {
return event;
}
WebMouseEvent CreateTestMouseEvent(WebInputEvent::Type type,
- const WebFloatPoint& coordinates) {
+ const gfx::PointF& coordinates) {
WebMouseEvent event(type, coordinates, coordinates,
WebPointerProperties::Button::kLeft, 0,
WebInputEvent::kLeftButtonDown,
@@ -125,7 +125,7 @@ TEST_F(PointerEventManagerTest, HasPointerCapture) {
ExceptionState exception(nullptr, ExceptionState::kExecutionContext, "", "");
GetEventHandler().HandleMousePressEvent(
- CreateTestMouseEvent(WebInputEvent::kMouseDown, WebFloatPoint(100, 100)));
+ CreateTestMouseEvent(WebInputEvent::kMouseDown, gfx::PointF(100, 100)));
ASSERT_FALSE(
GetDocument().body()->hasPointerCapture(PointerEventFactory::kMouseId));
@@ -136,7 +136,7 @@ TEST_F(PointerEventManagerTest, HasPointerCapture) {
GetDocument().body()->hasPointerCapture(PointerEventFactory::kMouseId));
GetEventHandler().HandleMouseMoveEvent(
- CreateTestMouseEvent(WebInputEvent::kMouseMove, WebFloatPoint(200, 200)),
+ CreateTestMouseEvent(WebInputEvent::kMouseMove, gfx::PointF(200, 200)),
Vector<WebMouseEvent>(), Vector<WebMouseEvent>());
ASSERT_TRUE(
@@ -171,7 +171,7 @@ TEST_F(PointerEventManagerTest, PointerCancelsOfAllTypes) {
{}, {}));
GetEventHandler().HandleMousePressEvent(
- CreateTestMouseEvent(WebInputEvent::kMouseDown, WebFloatPoint(100, 100)));
+ CreateTestMouseEvent(WebInputEvent::kMouseDown, gfx::PointF(100, 100)));
ASSERT_EQ(callback->mouseEventCount(), 0);
ASSERT_EQ(callback->touchEventCount(), 0);
@@ -194,7 +194,7 @@ TEST_F(PointerEventManagerTest, PointerCancelsOfAllTypes) {
ASSERT_EQ(callback->penEventCount(), 1);
GetEventHandler().HandleMouseMoveEvent(
- CreateTestMouseEvent(WebInputEvent::kMouseMove, WebFloatPoint(200, 200)),
+ CreateTestMouseEvent(WebInputEvent::kMouseMove, gfx::PointF(200, 200)),
Vector<WebMouseEvent>(), Vector<WebMouseEvent>());
ASSERT_EQ(callback->mouseEventCount(), 1);
@@ -218,8 +218,8 @@ TEST_F(PointerEventManagerTest, PointerEventCoordinates) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerDown,
WebPointerProperties::PointerType::kTouch,
- WebFloatPoint(150, 200), WebFloatPoint(100, 50),
- 10, 10, 16, 24),
+ gfx::PointF(150, 200), gfx::PointF(100, 50), 10,
+ 10, 16, 24),
{}, {}));
ASSERT_EQ(callback->last_client_x_, 75);
@@ -253,8 +253,8 @@ TEST_F(PointerEventManagerTest, PointerEventMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerMove,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 210), WebFloatPoint(100, 50),
- 10, 10),
+ gfx::PointF(150, 210), gfx::PointF(100, 50), 10,
+ 10),
{}, {}));
// The first pointermove event has movement_x/y 0.
ASSERT_EQ(callback->last_screen_x_, 100);
@@ -265,8 +265,8 @@ TEST_F(PointerEventManagerTest, PointerEventMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerMove,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 200), WebFloatPoint(132, 29),
- 10, 10),
+ gfx::PointF(150, 200), gfx::PointF(132, 29), 10,
+ 10),
{}, {}));
// pointermove event movement = event.screenX/Y - last_event.screenX/Y.
ASSERT_EQ(callback->last_screen_x_, 132);
@@ -277,8 +277,8 @@ TEST_F(PointerEventManagerTest, PointerEventMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerMove,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 210),
- WebFloatPoint(113.8, 32.7), 10, 10),
+ gfx::PointF(150, 210), gfx::PointF(113.8, 32.7),
+ 10, 10),
{}, {}));
// fractional screen coordinates result in fractional movement.
ASSERT_FLOAT_EQ(callback->last_screen_x_, 113.8);
@@ -295,8 +295,8 @@ TEST_F(PointerEventManagerTest, PointerEventMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerMove,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 210),
- WebFloatPoint(100, 16.25), 1024, -8765),
+ gfx::PointF(150, 210), gfx::PointF(100, 16.25),
+ 1024, -8765),
{}, {}));
ASSERT_EQ(callback->last_screen_x_, 100);
ASSERT_EQ(callback->last_screen_y_, 16.25);
@@ -323,7 +323,7 @@ TEST_F(PointerEventManagerTest, PointerEventSmallFractionMovements) {
WebPointerEvent pointer_event = CreateTestPointerEvent(
WebInputEvent::kPointerMove, WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 210), WebFloatPoint(113.8, 32.7), 0, 0);
+ gfx::PointF(150, 210), gfx::PointF(113.8, 32.7), 0, 0);
WebView().MainFrameWidget()->HandleInputEvent(
WebCoalescedInputEvent(pointer_event));
ASSERT_FLOAT_EQ(callback->last_movement_x_, 0);
@@ -368,8 +368,8 @@ TEST_F(PointerEventManagerTest, PointerRawUpdateMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerRawUpdate,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 210), WebFloatPoint(100, 50),
- 10, 10),
+ gfx::PointF(150, 210), gfx::PointF(100, 50), 10,
+ 10),
{}, {}));
// The first pointerrawupdate event has movement_x/y 0.
ASSERT_EQ(callback->last_screen_x_, 100);
@@ -380,8 +380,8 @@ TEST_F(PointerEventManagerTest, PointerRawUpdateMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerRawUpdate,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 200), WebFloatPoint(132, 29),
- 10, 10),
+ gfx::PointF(150, 200), gfx::PointF(132, 29), 10,
+ 10),
{}, {}));
// pointerrawupdate event movement = event.screenX/Y - last_event.screenX/Y.
ASSERT_EQ(callback->last_screen_x_, 132);
@@ -392,8 +392,8 @@ TEST_F(PointerEventManagerTest, PointerRawUpdateMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerMove,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 200), WebFloatPoint(144, 30),
- 10, 10),
+ gfx::PointF(150, 200), gfx::PointF(144, 30), 10,
+ 10),
{}, {}));
// First pointermove, have 0 movements.
ASSERT_EQ(callback->last_screen_x_, 144);
@@ -404,8 +404,8 @@ TEST_F(PointerEventManagerTest, PointerRawUpdateMovements) {
WebView().MainFrameWidget()->HandleInputEvent(WebCoalescedInputEvent(
CreateTestPointerEvent(WebInputEvent::kPointerRawUpdate,
WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 200), WebFloatPoint(142, 32),
- 10, 10),
+ gfx::PointF(150, 200), gfx::PointF(142, 32), 10,
+ 10),
{}, {}));
// pointerrawupdate event's movement is independent from pointermoves.
ASSERT_EQ(callback->last_screen_x_, 142);
@@ -428,7 +428,7 @@ TEST_F(PointerEventManagerTest, PointerUnadjustedMovement) {
WebPointerEvent event = CreateTestPointerEvent(
WebInputEvent::kPointerMove, WebPointerProperties::PointerType::kMouse,
- WebFloatPoint(150, 210), WebFloatPoint(100, 50), 120, -321);
+ gfx::PointF(150, 210), gfx::PointF(100, 50), 120, -321);
event.is_raw_movement_event = true;
WebView().MainFrameWidget()->HandleInputEvent(
WebCoalescedInputEvent(event, {}, {}));
View Lorry Controller Status