Reduce hit test on ShowPress by moving event targeting to WebViewImpl

Source/web/tests/LinkHighlightTest.cpp

Index: Source/web/tests/LinkHighlightTest.cpp
diff --git a/Source/web/tests/LinkHighlightTest.cpp b/Source/web/tests/LinkHighlightTest.cpp
index a57554e4631d5f59582734ab8e719639abc8bac1..337178bf97bb86da1f9afbe9a423e35142dfe70b 100644
--- a/Source/web/tests/LinkHighlightTest.cpp
+++ b/Source/web/tests/LinkHighlightTest.cpp
@@ -29,6 +29,8 @@
 #include "bindings/core/v8/ExceptionStatePlaceholder.h"
 #include "core/dom/Node.h"
 #include "core/frame/FrameView.h"
+#include "core/page/EventHandler.h"
+#include "core/page/Page.h"
 #include "core/page/TouchDisambiguation.h"
 #include "core/testing/URLTestHelpers.h"
 #include "platform/geometry/IntRect.h"
@@ -54,6 +56,12 @@ using namespace blink;
 
 namespace {
 
+GestureEventWithHitTestResults getTargetedEvent(WebViewImpl* webViewImpl, WebGestureEvent& touchEvent)

[Rick Byers, 2014/08/22 14:49:57]

nit: s/touch/gesture/

[Zeeshan Qureshi, 2014/08/22 15:30:50]

Only used this because the whole test was using touchEvent even when they're
specifically creating a gesture event.

+{
+    PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+    return webViewImpl->page()->deprecatedLocalMainFrame()->eventHandler().targetGestureEvent(platformEvent, true);
+}
+
 TEST(LinkHighlightTest, verifyWebViewImplIntegration)
 {
     const std::string baseURL("http://www.test.com/");
@@ -74,53 +82,31 @@ TEST(LinkHighlightTest, verifyWebViewImplIntegration)
     touchEvent.x = 20;
     touchEvent.y = 20;
 
-    {
-        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        Node* touchNode = webViewImpl->bestTapNode(platformEvent);
-        ASSERT_TRUE(touchNode);
-    }
+    ASSERT_TRUE(webViewImpl->bestTapNode(getTargetedEvent(webViewImpl, touchEvent)));
 
     touchEvent.y = 40;
-    {
-        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        EXPECT_FALSE(webViewImpl->bestTapNode(platformEvent));
-    }
+    EXPECT_FALSE(webViewImpl->bestTapNode(getTargetedEvent(webViewImpl, touchEvent)));
 
     touchEvent.y = 20;
     // Shouldn't crash.
-
-    {
-        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        webViewImpl->enableTapHighlightAtPoint(platformEvent);
-    }
+    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
 
     EXPECT_TRUE(webViewImpl->linkHighlight(0));
     EXPECT_TRUE(webViewImpl->linkHighlight(0)->contentLayer());
     EXPECT_TRUE(webViewImpl->linkHighlight(0)->clipLayer());
 
     // Find a target inside a scrollable div
-
     touchEvent.y = 100;
-    {
-        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        webViewImpl->enableTapHighlightAtPoint(platformEvent);
-    }
-
+    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
     ASSERT_TRUE(webViewImpl->linkHighlight(0));
 
     // Don't highlight if no "hand cursor"
     touchEvent.y = 220; // An A-link with cross-hair cursor.
-    {
-        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        webViewImpl->enableTapHighlightAtPoint(platformEvent);
-    }
+    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
     ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
     touchEvent.y = 260; // A text input box.
-    {
-        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        webViewImpl->enableTapHighlightAtPoint(platformEvent);
-    }
+    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
     ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
@@ -160,11 +146,11 @@ TEST(LinkHighlightTest, resetDuringNodeRemoval)
     touchEvent.x = 20;
     touchEvent.y = 20;
 
-    PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-    Node* touchNode = webViewImpl->bestTapNode(platformEvent);
+    GestureEventWithHitTestResults targetedEvent = getTargetedEvent(webViewImpl, touchEvent);
+    Node* touchNode = webViewImpl->bestTapNode(targetedEvent);
     ASSERT_TRUE(touchNode);
 
-    webViewImpl->enableTapHighlightAtPoint(platformEvent);
+    webViewImpl->enableTapHighlightAtPoint(targetedEvent);
     ASSERT_TRUE(webViewImpl->linkHighlight(0));
 
     GraphicsLayer* highlightLayer = webViewImpl->linkHighlight(0)->currentGraphicsLayerForTesting();