Revert of Reduce hit test on ShowPress by moving event targeting to WebViewImpl

Source/web/tests/LinkHighlightTest.cpp

 /*
  * Copyright (C) 2012 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:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "web/LinkHighlight.h"
 
 #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"
 #include "public/platform/Platform.h"
 #include "public/platform/WebContentLayer.h"
 #include "public/platform/WebFloatPoint.h"
 #include "public/platform/WebSize.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "public/web/WebFrame.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
 #include "wtf/PassOwnPtr.h"
 #include <gtest/gtest.h>
 
 using namespace blink;
 
 namespace {
 
-GestureEventWithHitTestResults getTargetedEvent(WebViewImpl* webViewImpl, WebGestureEvent& touchEvent)
-{
-    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/");
     const std::string fileName("test_touch_link_highlight.html");
 
     URLTestHelpers::registerMockedURLFromBaseURL(WebString::fromUTF8(baseURL.c_str()), WebString::fromUTF8("test_touch_link_highlight.html"));
     FrameTestHelpers::WebViewHelper webViewHelper;
     WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(baseURL + fileName, true);
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     WebGestureEvent touchEvent;
     touchEvent.type = WebInputEvent::GestureShowPress;
 
     // The coordinates below are linked to absolute positions in the referenced .html file.
     touchEvent.x = 20;
     touchEvent.y = 20;
 
-    ASSERT_TRUE(webViewImpl->bestTapNode(getTargetedEvent(webViewImpl, touchEvent)));
+    {
+        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+        Node* touchNode = webViewImpl->bestTapNode(platformEvent);
+        ASSERT_TRUE(touchNode);
+    }
 
     touchEvent.y = 40;
-    EXPECT_FALSE(webViewImpl->bestTapNode(getTargetedEvent(webViewImpl, touchEvent)));
+    {
+        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+        EXPECT_FALSE(webViewImpl->bestTapNode(platformEvent));
+    }
 
     touchEvent.y = 20;
     // Shouldn't crash.
-    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
+
+    {
+        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
+    }
 
     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;
-    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
+    {
+        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
+    }
+
     ASSERT_TRUE(webViewImpl->linkHighlight(0));
 
     // Don't highlight if no "hand cursor"
     touchEvent.y = 220; // An A-link with cross-hair cursor.
-    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
+    {
+        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
+    }
     ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
     touchEvent.y = 260; // A text input box.
-    webViewImpl->enableTapHighlightAtPoint(getTargetedEvent(webViewImpl, touchEvent));
+    {
+        PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
+    }
     ASSERT_EQ(0U, webViewImpl->numLinkHighlights());
 
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
 }
 
 class FakeWebFrameClient : public WebFrameClient {
     // To make the destructor public.
 };
 
 class FakeCompositingWebViewClient : public FrameTestHelpers::TestWebViewClient {
@@ skipping 19 matching lines @@
     int pageWidth = 640;
     int pageHeight = 480;
     webViewImpl->resize(WebSize(pageWidth, pageHeight));
     webViewImpl->layout();
 
     WebGestureEvent touchEvent;
     touchEvent.type = WebInputEvent::GestureShowPress;
     touchEvent.x = 20;
     touchEvent.y = 20;
 
-    GestureEventWithHitTestResults targetedEvent = getTargetedEvent(webViewImpl, touchEvent);
-    Node* touchNode = webViewImpl->bestTapNode(targetedEvent);
+    PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
+    Node* touchNode = webViewImpl->bestTapNode(platformEvent);
     ASSERT_TRUE(touchNode);
 
-    webViewImpl->enableTapHighlightAtPoint(targetedEvent);
+    webViewImpl->enableTapHighlightAtPoint(platformEvent);
     ASSERT_TRUE(webViewImpl->linkHighlight(0));
 
     GraphicsLayer* highlightLayer = webViewImpl->linkHighlight(0)->currentGraphicsLayerForTesting();
     ASSERT_TRUE(highlightLayer);
     EXPECT_TRUE(highlightLayer->linkHighlight(0));
 
     touchNode->remove(IGNORE_EXCEPTION);
     webViewImpl->layout();
     ASSERT_EQ(0U, highlightLayer->numLinkHighlights());
 
@@ skipping 25 matching lines @@
     IntRect boundingBox(touchEvent.x - touchEvent.data.tap.width / 2, touchEvent.y - touchEvent.data.tap.height / 2, touchEvent.data.tap.width, touchEvent.data.tap.height);
     findGoodTouchTargets(boundingBox, webViewImpl->mainFrameImpl()->frame(), goodTargets, highlightNodes);
 
     webViewImpl->enableTapHighlights(highlightNodes);
     EXPECT_EQ(2U, webViewImpl->numLinkHighlights());
 
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
 }
 
 } // namespace