Expand tap highlight to allow multiple highlights for touch disambiguation.

Source/WebKit/chromium/tests/LinkHighlightTest.cpp

Index: Source/WebKit/chromium/tests/LinkHighlightTest.cpp
diff --git a/Source/WebKit/chromium/tests/LinkHighlightTest.cpp b/Source/WebKit/chromium/tests/LinkHighlightTest.cpp
index 4d6aa797e11212cd655b9d713803ccb7242f238a..edb6a62985e75e2b8377293c9776e181571ac514 100644
--- a/Source/WebKit/chromium/tests/LinkHighlightTest.cpp
+++ b/Source/WebKit/chromium/tests/LinkHighlightTest.cpp
@@ -88,37 +88,37 @@ TEST(LinkHighlightTest, verifyWebViewImplIntegration)
 
     {
         PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        webViewImpl->enableTapHighlight(platformEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
     }
 
-    EXPECT_TRUE(webViewImpl->linkHighlight());
-    EXPECT_TRUE(webViewImpl->linkHighlight()->contentLayer());
-    EXPECT_TRUE(webViewImpl->linkHighlight()->clipLayer());
+    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->enableTapHighlight(platformEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
     }
 
-    ASSERT_TRUE(webViewImpl->linkHighlight());
+    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->enableTapHighlight(platformEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
     }
-    ASSERT_FALSE(webViewImpl->linkHighlight());
+    ASSERT_FALSE(webViewImpl->linkHighlight(0));
 
     touchEvent.y = 260; // A text input box.
     {
         PlatformGestureEventBuilder platformEvent(webViewImpl->mainFrameImpl()->frameView(), touchEvent);
-        webViewImpl->enableTapHighlight(platformEvent);
+        webViewImpl->enableTapHighlightAtPoint(platformEvent);
     }
-    ASSERT_FALSE(webViewImpl->linkHighlight());
+    ASSERT_FALSE(webViewImpl->linkHighlight(0));
 
     webViewImpl->close();
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();
@@ -179,16 +179,16 @@ TEST(LinkHighlightTest, resetDuringNodeRemoval)
     Node* touchNode = webViewImpl->bestTapNode(platformEvent);
     ASSERT_TRUE(touchNode);
 
-    webViewImpl->enableTapHighlight(platformEvent);
-    ASSERT_TRUE(webViewImpl->linkHighlight());
+    webViewImpl->enableTapHighlightAtPoint(platformEvent);

[wjmaclean, 2013/06/12 15:09:06]

We should add a test that verifies that multiple highlights work, i.e. calls
enableTapHighlights.

+    ASSERT_TRUE(webViewImpl->linkHighlight(0));
 
-    GraphicsLayer* highlightLayer = webViewImpl->linkHighlight()->currentGraphicsLayerForTesting();
+    GraphicsLayer* highlightLayer = webViewImpl->linkHighlight(0)->currentGraphicsLayerForTesting();
     ASSERT_TRUE(highlightLayer);
-    EXPECT_TRUE(highlightLayer->linkHighlight());
+    EXPECT_TRUE(highlightLayer->linkHighlight(0));
 
     touchNode->remove(IGNORE_EXCEPTION);
     webViewImpl->layout();
-    EXPECT_FALSE(highlightLayer->linkHighlight());
+    EXPECT_FALSE(highlightLayer->linkHighlight(0));
 
     webViewImpl->close();
     Platform::current()->unitTestSupport()->unregisterAllMockedURLs();