[PDF Ink Signatures] Add test helper to create mouse move events
Add CreateMouseMoveWithLeftButtonEventAtPoint() to simplify a commonly set of MouseEventBuilder calls. Change-Id: I173631a97e614d745c646822bc88ab6ec826bb77 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6195921 Reviewed-by: Alan Screen <awscreen@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org> Cr-Commit-Position: refs/heads/main@{#1411044}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
a2a03f94ff
commit
d563b3b56b
@@ -192,6 +192,15 @@ std::map<int, std::vector<raw_ref<const ink::Stroke>>> CollectVisibleStrokes(
|
|||||||
return visible_stroke_shapes;
|
return visible_stroke_shapes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
blink::WebMouseEvent CreateMouseMoveWithLeftButtonEventAtPoint(
|
||||||
|
const gfx::PointF& point) {
|
||||||
|
return MouseEventBuilder()
|
||||||
|
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
||||||
|
.SetPosition(point)
|
||||||
|
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
||||||
|
.Build();
|
||||||
|
}
|
||||||
|
|
||||||
base::Value::Dict CreateGetAnnotationBrushMessageForTesting(
|
base::Value::Dict CreateGetAnnotationBrushMessageForTesting(
|
||||||
const std::string& brush_type) {
|
const std::string& brush_type) {
|
||||||
base::Value::Dict message;
|
base::Value::Dict message;
|
||||||
@@ -998,11 +1007,7 @@ class PdfInkModuleStrokeTest : public PdfInkModuleTest {
|
|||||||
|
|
||||||
for (const gfx::PointF& mouse_move_point : mouse_move_points) {
|
for (const gfx::PointF& mouse_move_point : mouse_move_points) {
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(mouse_move_point);
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
|
||||||
.SetPosition(mouse_move_point)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_EQ(expect_mouse_events_handled,
|
EXPECT_EQ(expect_mouse_events_handled,
|
||||||
ink_module().HandleInputEvent(mouse_move_event));
|
ink_module().HandleInputEvent(mouse_move_event));
|
||||||
}
|
}
|
||||||
@@ -1717,11 +1722,7 @@ TEST_F(PdfInkModuleStrokeTest, ChangeBrushColorDuringDrawing) {
|
|||||||
EXPECT_CALL(client(), StrokeAdded(kPageIndex, InkStrokeId(0),
|
EXPECT_CALL(client(), StrokeAdded(kPageIndex, InkStrokeId(0),
|
||||||
InkStrokeBrushColorEq(SK_ColorBLACK)));
|
InkStrokeBrushColorEq(SK_ColorBLACK)));
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(kLeftVerticalStrokePoint2);
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
|
||||||
.SetPosition(kLeftVerticalStrokePoint2)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
||||||
blink::WebMouseEvent mouse_up_event =
|
blink::WebMouseEvent mouse_up_event =
|
||||||
MouseEventBuilder()
|
MouseEventBuilder()
|
||||||
@@ -1776,11 +1777,7 @@ TEST_F(PdfInkModuleStrokeTest, ChangeBrushSizeDuringDrawing) {
|
|||||||
UpdateInkCursorImage(BitmapImageSizeEq(SkISize(8, 8))));
|
UpdateInkCursorImage(BitmapImageSizeEq(SkISize(8, 8))));
|
||||||
}
|
}
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(kLeftVerticalStrokePoint2);
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
|
||||||
.SetPosition(kLeftVerticalStrokePoint2)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
||||||
blink::WebMouseEvent mouse_up_event =
|
blink::WebMouseEvent mouse_up_event =
|
||||||
MouseEventBuilder()
|
MouseEventBuilder()
|
||||||
@@ -1880,11 +1877,8 @@ TEST_F(PdfInkModuleStrokeTest, ChangeSizeDuringErasing) {
|
|||||||
static constexpr gfx::PointF kNearbyPointAboveLeftVerticalStroke(10.0f,
|
static constexpr gfx::PointF kNearbyPointAboveLeftVerticalStroke(10.0f,
|
||||||
10.0f);
|
10.0f);
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
kNearbyPointAboveLeftVerticalStroke);
|
||||||
.SetPosition(kNearbyPointAboveLeftVerticalStroke)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
||||||
|
|
||||||
blink::WebMouseEvent mouse_up_event =
|
blink::WebMouseEvent mouse_up_event =
|
||||||
@@ -1934,11 +1928,7 @@ TEST_F(PdfInkModuleStrokeTest, ChangeToEraserDuringDrawing) {
|
|||||||
EXPECT_CALL(client(), StrokeAdded(_, _, _)).Times(0);
|
EXPECT_CALL(client(), StrokeAdded(_, _, _)).Times(0);
|
||||||
EXPECT_CALL(client(), UpdateStrokeActive(_, _, _)).Times(0);
|
EXPECT_CALL(client(), UpdateStrokeActive(_, _, _)).Times(0);
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(kRightVerticalStrokePoint2);
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
|
||||||
.SetPosition(kRightVerticalStrokePoint2)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_FALSE(ink_module().HandleInputEvent(mouse_move_event));
|
EXPECT_FALSE(ink_module().HandleInputEvent(mouse_move_event));
|
||||||
blink::WebMouseEvent mouse_up_event =
|
blink::WebMouseEvent mouse_up_event =
|
||||||
MouseEventBuilder()
|
MouseEventBuilder()
|
||||||
@@ -2003,11 +1993,7 @@ TEST_F(PdfInkModuleStrokeTest, ChangeToDrawingDuringErasing) {
|
|||||||
EXPECT_CALL(client(), StrokeAdded(_, _, _)).Times(0);
|
EXPECT_CALL(client(), StrokeAdded(_, _, _)).Times(0);
|
||||||
EXPECT_CALL(client(), UpdateStrokeActive(_, _, _)).Times(0);
|
EXPECT_CALL(client(), UpdateStrokeActive(_, _, _)).Times(0);
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(kRightVerticalStrokePoint2);
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
|
||||||
.SetPosition(kRightVerticalStrokePoint2)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_FALSE(ink_module().HandleInputEvent(mouse_move_event));
|
EXPECT_FALSE(ink_module().HandleInputEvent(mouse_move_event));
|
||||||
blink::WebMouseEvent mouse_up_event =
|
blink::WebMouseEvent mouse_up_event =
|
||||||
MouseEventBuilder()
|
MouseEventBuilder()
|
||||||
@@ -2068,11 +2054,7 @@ TEST_F(PdfInkModuleStrokeTest, ChangeDrawingBrushTypeDuringDrawing) {
|
|||||||
UpdateInkCursorImage(BitmapImageSizeEq(SkISize(10, 10))));
|
UpdateInkCursorImage(BitmapImageSizeEq(SkISize(10, 10))));
|
||||||
}
|
}
|
||||||
blink::WebMouseEvent mouse_move_event =
|
blink::WebMouseEvent mouse_move_event =
|
||||||
MouseEventBuilder()
|
CreateMouseMoveWithLeftButtonEventAtPoint(kLeftVerticalStrokePoint2);
|
||||||
.SetType(blink::WebInputEvent::Type::kMouseMove)
|
|
||||||
.SetPosition(kLeftVerticalStrokePoint2)
|
|
||||||
.SetButton(blink::WebPointerProperties::Button::kLeft)
|
|
||||||
.Build();
|
|
||||||
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
EXPECT_TRUE(ink_module().HandleInputEvent(mouse_move_event));
|
||||||
blink::WebMouseEvent mouse_up_event =
|
blink::WebMouseEvent mouse_up_event =
|
||||||
MouseEventBuilder()
|
MouseEventBuilder()
|
||||||
|
Reference in New Issue
Block a user