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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/web/tests/WebFrameTest.cpp

Issue 2950553003: Tune tap disambiguation triggering threshold. (Closed)
Patch Set: Fix tests Created 3 years, 6 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
« no previous file with comments | « third_party/WebKit/Source/core/page/TouchDisambiguation.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/tests/WebFrameTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
index 7107a03c2d27bf6137150707c06e2a31b8abbed2..52ffaaba6e0d770de18629dd7fb338c344b1619f 100644
--- a/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebFrameTest.cpp
@@ -6155,14 +6155,14 @@ class DisambiguationPopupTestWebViewClient
bool triggered_;
};
-static WebCoalescedInputEvent FatTap(int x, int y) {
+static WebCoalescedInputEvent FatTap(int x, int y, int diameter) {
WebGestureEvent event(WebInputEvent::kGestureTap, WebInputEvent::kNoModifiers,
WebInputEvent::kTimeStampForTesting);
event.source_device = kWebGestureDeviceTouchscreen;
event.x = x;
event.y = y;
- event.data.tap.width = 50;
- event.data.tap.height = 50;
+ event.data.tap.width = diameter;
+ event.data.tap.height = diameter;
return WebCoalescedInputEvent(event);
}
@@ -6171,6 +6171,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopup) {
RegisterMockedHttpURLLoad(html_file);
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 100;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
@@ -6179,16 +6180,17 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopup) {
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0, kTapDiameter));
EXPECT_FALSE(client.Triggered());
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115, kTapDiameter));
EXPECT_FALSE(client.Triggered());
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(120, 230 + i * 5));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(120, 230 + i * 5, kTapDiameter));
int j = i % 10;
if (j >= 7 && j <= 9)
@@ -6199,7 +6201,8 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopup) {
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10 + i * 5, 590));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(10 + i * 5, 590, kTapDiameter));
int j = i % 10;
if (j >= 7 && j <= 9)
@@ -6216,7 +6219,8 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopup) {
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10 + i * 5, 590));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(10 + i * 5, 590, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
}
@@ -6225,6 +6229,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupNoContainer) {
RegisterMockedHttpURLLoad("disambiguation_popup_no_container.html");
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 100;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
@@ -6234,7 +6239,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupNoContainer) {
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(50, 50));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(50, 50, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
@@ -6243,6 +6248,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite) {
RegisterMockedHttpURLLoad(html_file);
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 100;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
@@ -6252,22 +6258,24 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite) {
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0, kTapDiameter));
EXPECT_FALSE(client.Triggered());
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115, kTapDiameter));
EXPECT_FALSE(client.Triggered());
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(120, 230 + i * 5));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(120, 230 + i * 5, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10 + i * 5, 590));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(10 + i * 5, 590, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
}
@@ -6277,6 +6285,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite) {
RegisterMockedHttpURLLoad(html_file);
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 100;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
@@ -6286,22 +6295,24 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite) {
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(0, 0, kTapDiameter));
EXPECT_FALSE(client.Triggered());
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(200, 115, kTapDiameter));
EXPECT_FALSE(client.Triggered());
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(120, 230 + i * 5));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(120, 230 + i * 5, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
for (int i = 0; i <= 46; i++) {
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10 + i * 5, 590));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(10 + i * 5, 590, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
}
@@ -6311,6 +6322,7 @@ TEST_F(WebFrameTest, DisambiguationPopupVisualViewport) {
RegisterMockedHttpURLLoad(html_file);
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 100;
FrameTestHelpers::WebViewHelper web_view_helper;
web_view_helper.InitializeAndLoad(base_url_ + html_file, nullptr, &client,
@@ -6336,7 +6348,7 @@ TEST_F(WebFrameTest, DisambiguationPopupVisualViewport) {
// Tap at the top: there is nothing there.
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10, 60));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(10, 60, kTapDiameter));
EXPECT_FALSE(client.Triggered());
// Scroll visual viewport to the bottom of the main frame.
@@ -6345,7 +6357,7 @@ TEST_F(WebFrameTest, DisambiguationPopupVisualViewport) {
// Now the tap with the same coordinates should hit two elements.
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10, 60));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(10, 60, kTapDiameter));
EXPECT_TRUE(client.Triggered());
// The same tap shouldn't trigger didTapMultipleTargets() after disabling the
@@ -6354,7 +6366,7 @@ TEST_F(WebFrameTest, DisambiguationPopupVisualViewport) {
->GetSettings()
->SetMultiTargetTapNotificationEnabled(false);
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(10, 60));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(10, 60, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
@@ -6366,6 +6378,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupBlacklist) {
RegisterMockedHttpURLLoad(html_file);
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 100;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
@@ -6375,21 +6388,22 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupBlacklist) {
// Click somewhere where the popup shouldn't appear.
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(kViewportWidth / 2, 0));
+ web_view_helper.WebView()->HandleInputEvent(
+ FatTap(kViewportWidth / 2, 0, kTapDiameter));
EXPECT_FALSE(client.Triggered());
// Click directly in between two container divs with click handlers, with
// children that don't handle clicks.
client.ResetTriggered();
web_view_helper.WebView()->HandleInputEvent(
- FatTap(kViewportWidth / 2, kDivHeight));
+ FatTap(kViewportWidth / 2, kDivHeight, kTapDiameter));
EXPECT_TRUE(client.Triggered());
// The third div container should be blacklisted if you click on the link it
// contains.
client.ResetTriggered();
web_view_helper.WebView()->HandleInputEvent(
- FatTap(kViewportWidth / 2, kDivHeight * 3.25));
+ FatTap(kViewportWidth / 2, kDivHeight * 3.25, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
@@ -6397,6 +6411,7 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupPageScale) {
RegisterMockedHttpURLLoad("disambiguation_popup_page_scale.html");
DisambiguationPopupTestWebViewClient client;
+ const int kTapDiameter = 50;
// Make sure we initialize to minimum scale, even if the window size
// only becomes available after the load begins.
@@ -6406,22 +6421,22 @@ TEST_P(ParameterizedWebFrameTest, DisambiguationPopupPageScale) {
web_view_helper.Resize(WebSize(1000, 1000));
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(80, 80));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(80, 80, kTapDiameter));
EXPECT_TRUE(client.Triggered());
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(230, 190));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(230, 190, kTapDiameter));
EXPECT_TRUE(client.Triggered());
web_view_helper.WebView()->SetPageScaleFactor(3.0f);
web_view_helper.WebView()->UpdateAllLifecyclePhases();
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(240, 240));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(240, 240, kTapDiameter));
EXPECT_TRUE(client.Triggered());
client.ResetTriggered();
- web_view_helper.WebView()->HandleInputEvent(FatTap(690, 570));
+ web_view_helper.WebView()->HandleInputEvent(FatTap(690, 570, kTapDiameter));
EXPECT_FALSE(client.Triggered());
}
@@ -9662,7 +9677,12 @@ TEST_P(ParameterizedWebFrameTest, FrameWidgetTest) {
view->Resize(WebSize(1000, 1000));
- child_frame->FrameWidget()->HandleInputEvent(FatTap(20, 20));
+ WebGestureEvent event(WebInputEvent::kGestureTap, WebInputEvent::kNoModifiers,
+ WebInputEvent::kTimeStampForTesting);
+ event.source_device = kWebGestureDeviceTouchscreen;
+ event.x = 20;
+ event.y = 20;
+ child_frame->FrameWidget()->HandleInputEvent(WebCoalescedInputEvent(event));
EXPECT_TRUE(child_widget_client.DidHandleGestureEvent());
view->Close();
« no previous file with comments | « third_party/WebKit/Source/core/page/TouchDisambiguation.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698