summaryrefslogtreecommitdiff
path: root/chromium/ui/events/android/motion_event_android_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/events/android/motion_event_android_unittest.cc
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/events/android/motion_event_android_unittest.cc')
-rw-r--r--chromium/ui/events/android/motion_event_android_unittest.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/ui/events/android/motion_event_android_unittest.cc b/chromium/ui/events/android/motion_event_android_unittest.cc
index a57f8744762..8714dab88a7 100644
--- a/chromium/ui/events/android/motion_event_android_unittest.cc
+++ b/chromium/ui/events/android/motion_event_android_unittest.cc
@@ -75,7 +75,7 @@ TEST(MotionEventAndroidTest, Constructor) {
MotionEventAndroid event(
base::android::AttachCurrentThread(), nullptr, kPixToDip, 0.f, 0.f, 0.f,
kEventTimeMS, kAndroidActionDown, pointer_count, history_size,
- action_index, kAndroidActionButton, kAndroidButtonPrimary,
+ action_index, kAndroidActionButton, 0, kAndroidButtonPrimary,
kAndroidAltKeyDown, raw_offset, -raw_offset, false, &p0, &p1);
EXPECT_EQ(MotionEvent::Action::DOWN, event.GetAction());
@@ -119,7 +119,7 @@ TEST(MotionEventAndroidTest, Clone) {
1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger);
MotionEventAndroid event(base::android::AttachCurrentThread(), nullptr,
kPixToDip, 0, 0, 0, 0, kAndroidActionDown,
- pointer_count, 0, 0, 0, 0, 0, 0, 0, false, &p0,
+ pointer_count, 0, 0, 0, 0, 0, 0, 0, 0, false, &p0,
nullptr);
std::unique_ptr<MotionEvent> clone = event.Clone();
@@ -138,7 +138,7 @@ TEST(MotionEventAndroidTest, Cancel) {
1, 13.7f, -7.13f, 5.3f, 1.2f, 0.1f, 0.2f, kAndroidToolTypeFinger);
MotionEventAndroid event(base::android::AttachCurrentThread(), nullptr,
kPixToDip, 0, 0, 0, kEventTimeMS, kAndroidActionDown,
- pointer_count, 0, 0, 0, 0, 0, 0, 0, false, &p0,
+ pointer_count, 0, 0, 0, 0, 0, 0, 0, 0, false, &p0,
nullptr);
std::unique_ptr<MotionEvent> cancel_event = event.Cancel();
@@ -162,7 +162,8 @@ TEST(MotionEventAndroidTest, InvalidOrientationsSanitized) {
MotionEventAndroid::Pointer p1(1, 0, 0, 0, 0, orientation1, 0, 0);
MotionEventAndroid event(base::android::AttachCurrentThread(), nullptr,
kPixToDip, 0, 0, 0, 0, kAndroidActionDown,
- pointer_count, 0, 0, 0, 0, 0, 0, 0, false, &p0, &p1);
+ pointer_count, 0, 0, 0, 0, 0, 0, 0, 0, false, &p0,
+ &p1);
EXPECT_EQ(0.f, event.GetOrientation(0));
EXPECT_EQ(0.f, event.GetOrientation(1));
@@ -177,8 +178,8 @@ TEST(MotionEventAndroidTest, NonEmptyHistoryForNonMoveEventsSanitized) {
MotionEventAndroid::Pointer p0(0, 0, 0, 0, 0, 0, 0, 0);
MotionEventAndroid event(base::android::AttachCurrentThread(), nullptr,
kPixToDip, 0, 0, 0, 0, kAndroidActionDown,
- pointer_count, history_size, 0, 0, 0, 0, 0, 0, false,
- &p0, nullptr);
+ pointer_count, history_size, 0, 0, 0, 0, 0, 0, 0,
+ false, &p0, nullptr);
EXPECT_EQ(0U, event.GetHistorySize());
}
@@ -197,7 +198,7 @@ TEST(MotionEventAndroidTest, ActionIndexForPointerDown) {
MotionEventAndroid event(base::android::AttachCurrentThread(), nullptr,
kPixToDip, 0, 0, 0, 0, kAndroidActionPointerDown,
pointer_count, history_size, action_index, 0, 0, 0,
- 0, 0, false, &p0, &p1);
+ 0, 0, 0, false, &p0, &p1);
EXPECT_EQ(MotionEvent::Action::POINTER_DOWN, event.GetAction());
EXPECT_EQ(action_index, event.GetActionIndex());