Tune tap disambiguation triggering threshold.

third_party/WebKit/Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 6137 matching lines @@
     EXPECT_GE(target_rects.size(), 2u);
     triggered_ = true;
     return true;
   }
 
   bool Triggered() const { return triggered_; }
   void ResetTriggered() { triggered_ = false; }
   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);
 }
 
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopup) {
   const std::string html_file = "disambiguation_popup.html";
   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.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, nullptr, &client);
   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)
       EXPECT_TRUE(client.Triggered());
     else
       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));
 
     int j = i % 10;
     if (j >= 7 && j <= 9)
       EXPECT_TRUE(client.Triggered());
     else
       EXPECT_FALSE(client.Triggered());
   }
 
   // The same taps shouldn't trigger didTapMultipleTargets() after disabling the
   // notification for multi-target-tap.
   web_view_helper.WebView()
       ->GetSettings()
       ->SetMultiTargetTapNotificationEnabled(false);
 
   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());
   }
 }
 
 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.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "disambiguation_popup_no_container.html", nullptr, &client);
   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());
 }
 
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopupMobileSite) {
   const std::string html_file = "disambiguation_popup_mobile_site.html";
   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.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, nullptr, &client,
                                     nullptr, ConfigureAndroid);
   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());
   }
 }
 
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopupViewportSite) {
   const std::string html_file = "disambiguation_popup_viewport_site.html";
   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.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, nullptr, &client,
                                     nullptr, ConfigureAndroid);
   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());
   }
 }
 
 TEST_F(WebFrameTest, DisambiguationPopupVisualViewport) {
   const std::string html_file = "disambiguation_popup_200_by_800.html";
   RegisterMockedHttpURLLoad(html_file);
 
   DisambiguationPopupTestWebViewClient client;
+  const int kTapDiameter = 100;
 
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, nullptr, &client,
                                     nullptr, ConfigureAndroid);
 
   WebViewBase* web_view_impl = web_view_helper.WebView();
   ASSERT_TRUE(web_view_impl);
   LocalFrame* frame = web_view_impl->MainFrameImpl()->GetFrame();
   ASSERT_TRUE(frame);
 
   web_view_helper.Resize(WebSize(100, 200));
 
   // Scroll main frame to the bottom of the document
   web_view_impl->MainFrame()->SetScrollOffset(WebSize(0, 400));
   EXPECT_SIZE_EQ(ScrollOffset(0, 400), frame->View()->GetScrollOffset());
 
   web_view_impl->SetPageScaleFactor(2.0);
 
   // Scroll visual viewport to the top of the main frame.
   VisualViewport& visual_viewport = frame->GetPage()->GetVisualViewport();
   visual_viewport.SetLocation(FloatPoint(0, 0));
   EXPECT_SIZE_EQ(ScrollOffset(0, 0), visual_viewport.GetScrollOffset());
 
   // 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.
   visual_viewport.SetLocation(FloatPoint(0, 200));
   EXPECT_SIZE_EQ(ScrollOffset(0, 200), visual_viewport.GetScrollOffset());
 
   // 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
   // notification for multi-target-tap.
   web_view_helper.WebView()
       ->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());
 }
 
 TEST_P(ParameterizedWebFrameTest, DisambiguationPopupBlacklist) {
   const unsigned kViewportWidth = 500;
   const unsigned kViewportHeight = 1000;
   const unsigned kDivHeight = 100;
   const std::string html_file = "disambiguation_popup_blacklist.html";
   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.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(base_url_ + html_file, nullptr, &client);
   web_view_helper.Resize(WebSize(kViewportWidth, kViewportHeight));
 
   // 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());
 }
 
 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.
   FrameTestHelpers::WebViewHelper web_view_helper;
   web_view_helper.InitializeAndLoad(
       base_url_ + "disambiguation_popup_page_scale.html", nullptr, &client);
   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());
 }
 
 class TestSubstituteDataWebFrameClient
     : public FrameTestHelpers::TestWebFrameClient {
  public:
   TestSubstituteDataWebFrameClient() : commit_called_(false) {}
 
   virtual void DidFailProvisionalLoad(const WebURLError& error,
                                       WebHistoryCommitType) {
@@ skipping 3220 matching lines @@
   FrameTestHelpers::TestWebRemoteFrameClient remote_client;
   view->SetMainFrame(remote_client.GetFrame());
 
   GestureEventTestWebWidgetClient child_widget_client;
   WebLocalFrame* child_frame = FrameTestHelpers::CreateLocalChild(
       view->MainFrame()->ToWebRemoteFrame(), WebString(), nullptr,
       &child_widget_client);
 
   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();
 }
 
 class MockDocumentThreadableLoaderClient
     : public DocumentThreadableLoaderClient {
  public:
   MockDocumentThreadableLoaderClient() : failed_(false) {}
   void DidFail(const ResourceError&) override { failed_ = true; }
@@ skipping 2542 matching lines @@
     if (obj->IsText()) {
       LayoutText* layout_text = ToLayoutText(obj);
       text = layout_text->GetText();
       break;
     }
   }
   EXPECT_EQ("foo alt", text.Utf8());
 }
 
 }  // namespace blink