[iOS] <a ping> and <area ping> tests time out

dydz · dydz · commit 731237bf3d72 · 2016-08-22T16:13:28.000Z
https://bugs.webkit.org/show_bug.cgi?id=156857 Reviewed by Simon Fraser. Source/WebCore: Export HTMLAreaElement::imageElement() so that we can make use of it in WebKit2. * html/HTMLAreaElement.h: Source/WebKit2: Support single tapping on an HTML area element in WebKit2 just as we do in Legacy WebKit. WebKit2 commits to clicking a "clickable" DOM node on a single tap only if it has a renderer. An HTML area element represents a hyperlink in an image map and does not have a renderer. * WebProcess/WebPage/ios/WebPageIOS.mm: (WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Compute the tap highlight with respect to the renderer for the image map associated with the tapped HTML area element (if it has one). (WebKit::WebPage::commitPotentialTap): Allow committing a potential tap on an HTML area element. LayoutTests: Update test to use work in WebKitTestRunner and unskip the tests. Also remove some unused files. * http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html: Include external JavaScript script resources/utilities.js and write code in terms of clickElement(). Additionally, add HTML5 doctype tag and put <head> on its own line so as to be consistent with the placement of </head> on its own line. * http/tests/navigation/ping-attribute/anchor-cross-origin.html: Ditto. * http/tests/navigation/ping-attribute/anchor-same-origin.html: Ditto. * http/tests/navigation/ping-attribute/resources/check-ping.php: Removed. * http/tests/navigation/ping-attribute/resources/delete-ping.php: Removed. * http/tests/navigation/ping-attribute/resources/ping-file-path.php: Removed. * http/tests/navigation/ping-attribute/resources/save-Ping.php: Removed. * http/tests/navigation/ping-attribute/resources/utilities.js: (clearLastPingResultAndRunTest): (clickElement): Make use of UIScriptController to click the element via a tap on platforms that support touch events and implement UIScriptController (window.uiController). * platform/ios-simulator-wk2/TestExpectations: Unskip ping-attribute tests. * platform/ios-simulator/TestExpectations: Ditto. Canonical link: https://commits.webkit.org/179183@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204720 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,30 @@
+2016-08-22  Daniel Bates  <dabates@apple.com>
+
+        [iOS] <a ping> and <area ping> tests time out
+        https://bugs.webkit.org/show_bug.cgi?id=156857
+
+        Reviewed by Simon Fraser.
+
+        Update test to use work in WebKitTestRunner and unskip the tests.
+
+        Also remove some unused files.
+
+        * http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html: Include external JavaScript
+        script resources/utilities.js and write code in terms of clickElement(). Additionally, add HTML5 doctype
+        tag and put <head> on its own line so as to be consistent with the placement of </head> on its own line.
+        * http/tests/navigation/ping-attribute/anchor-cross-origin.html: Ditto.
+        * http/tests/navigation/ping-attribute/anchor-same-origin.html: Ditto.
+        * http/tests/navigation/ping-attribute/resources/check-ping.php: Removed.
+        * http/tests/navigation/ping-attribute/resources/delete-ping.php: Removed.
+        * http/tests/navigation/ping-attribute/resources/ping-file-path.php: Removed.
+        * http/tests/navigation/ping-attribute/resources/save-Ping.php: Removed.
+        * http/tests/navigation/ping-attribute/resources/utilities.js:
+        (clearLastPingResultAndRunTest):
+        (clickElement): Make use of UIScriptController to click the element via a tap on platforms that
+        support touch events and implement UIScriptController (window.uiController).
+        * platform/ios-simulator-wk2/TestExpectations: Unskip ping-attribute tests.
+        * platform/ios-simulator/TestExpectations: Ditto.
+
 2016-08-22  Youenn Fablet  <youenn@apple.com>
 
         LayoutTest http/tests/fetch/fetch-in-worker-crash.html is flaky
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html b/LayoutTests/http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html
@@ -1,5 +1,8 @@
-<html><head>
+<!DOCTYPE html>
+<html>
+<head>
 <title>Ping</title>
+<script src="resources/utilities.js"></script>
 <script>
 
 if (window.testRunner) {
@@ -23,12 +26,7 @@
         return;
     }
 
-    if (window.eventSender) {
-        var a = document.getElementById("a");
-        eventSender.mouseMoveTo(a.offsetLeft + 2, a.offsetTop + 2);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
-    }
+    clickElement(document.getElementById("a"));
 }
 
 </script>
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/anchor-cross-origin.html b/LayoutTests/http/tests/navigation/ping-attribute/anchor-cross-origin.html
@@ -1,5 +1,8 @@
-<html><head>
+<!DOCTYPE html>
+<html>
+<head>
 <title>Ping</title>
+<script src="resources/utilities.js"></script>
 <script>
 
 var testCalled = false;
@@ -15,12 +18,7 @@
         return;
     }
 
-    if (window.eventSender) {
-        var a = document.getElementById("a");
-        eventSender.mouseMoveTo(a.offsetLeft + 2, a.offsetTop + 2);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
-    }
+    clickElement(document.getElementById("a"));
 }
 
 </script>
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/anchor-same-origin.html b/LayoutTests/http/tests/navigation/ping-attribute/anchor-same-origin.html
@@ -1,5 +1,8 @@
-<html><head>
+<!DOCTYPE html>
+<html>
+<head>
 <title>Ping</title>
+<script src="resources/utilities.js"></script>
 <script>
 
 var testCalled = false;
@@ -15,12 +18,7 @@
         return;
     }
 
-    if (window.eventSender) {
-        var a = document.getElementById("a");
-        eventSender.mouseMoveTo(a.offsetLeft + 2, a.offsetTop + 2);
-        eventSender.mouseDown();
-        eventSender.mouseUp();
-    }
+    clickElement(document.getElementById("a"));
 }
 
 </script>
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/resources/check-ping.php b/LayoutTests/http/tests/navigation/ping-attribute/resources/check-ping.php
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/resources/delete-ping.php b/LayoutTests/http/tests/navigation/ping-attribute/resources/delete-ping.php
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/resources/ping-file-path.php b/LayoutTests/http/tests/navigation/ping-attribute/resources/ping-file-path.php
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/resources/save-Ping.php b/LayoutTests/http/tests/navigation/ping-attribute/resources/save-Ping.php
diff --git a/LayoutTests/http/tests/navigation/ping-attribute/resources/utilities.js b/LayoutTests/http/tests/navigation/ping-attribute/resources/utilities.js
@@ -26,17 +26,22 @@ function clearLastPingResultAndRunTest(callback)
     }
 
     var xhr = new XMLHttpRequest;
-    xhr.open("GET", "resources/delete-ping.php", true /* async */);
+    xhr.open("GET", "../../resources/delete-ping.php", true /* async */);
     xhr.send(null);
     xhr.onload = callback;
     xhr.onerror = done;
 }
 
 function clickElement(element)
 {
-    if (!window.eventSender)
-        return;
-    eventSender.mouseMoveTo(element.offsetLeft + 2, element.offsetTop + 2);
-    eventSender.mouseDown();
-    eventSender.mouseUp();
+    var x = element.offsetLeft + 2;
+    var y = element.offsetTop + 2;
+    var supportsTouchEvents = "TouchEvent" in window;
+    if (testRunner.runUIScript && supportsTouchEvents)
+        testRunner.runUIScript("(function() { uiController.singleTapAtPoint(" + x + ", " + y + "); })()");
+    else if (window.eventSender) {
+        eventSender.mouseMoveTo(x, y);
+        eventSender.mouseDown();
+        eventSender.mouseUp();
+    }
 }
diff --git a/LayoutTests/platform/ios-simulator-wk2/TestExpectations b/LayoutTests/platform/ios-simulator-wk2/TestExpectations
@@ -405,9 +405,6 @@ http/tests/navigation/no-referrer-reset.html
 http/tests/navigation/no-referrer-same-window.html
 http/tests/navigation/no-referrer-subframe.html
 http/tests/navigation/no-referrer-target-blank.html
-http/tests/navigation/ping-attribute/anchor-cross-origin-from-https.html
-http/tests/navigation/ping-attribute/anchor-cross-origin.html
-http/tests/navigation/ping-attribute/anchor-same-origin.html
 http/tests/navigation/redirect-preserves-referrer.html
 http/tests/navigation/redirect-to-random-url-versus-memory-cache.html
 http/tests/security/aboutBlank/xss-DENIED-navigate-opener-document-write.html
@@ -1741,7 +1738,6 @@ fast/forms/focus-option-control-on-page.html [ Skip ]
 # Skip timeouts
 fast/dom/Geolocation/startUpdatingOnlyWhenPageVisible.html [ Skip ]
 fast/dom/Geolocation/stopUpdatingForHiddenPage.html [ Skip ]
-http/tests/navigation/ping-attribute/anchor-cookie.html [ Skip ]
 webkit.org/b/148709 fast/events/wheelevent-basic.html [ Skip ]
 webkit.org/b/148709 fast/events/wheelevent-mousewheel-interaction.html [ Skip ]
 
diff --git a/LayoutTests/platform/ios-simulator/TestExpectations b/LayoutTests/platform/ios-simulator/TestExpectations
@@ -317,8 +317,6 @@ fast/shadow-dom/shadow-host-removal-crash.html [ Skip ]
 # The file-wrapper part of <attachment> is not yet working on iOS
 fast/attachment/attachment-type-attribute.html [ Skip ]
 
-webkit.org/b/156857 http/tests/navigation/ping-attribute [ Skip ]
-
 # RTL Scrollbars are only implemented on certain versions of OS X
 fast/scrolling/rtl-scrollbars-iframe-scrolled.html [ Skip ]
 fast/scrolling/rtl-scrollbars-listbox-scroll.html [ Skip ]
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2016-08-22  Daniel Bates  <dabates@apple.com>
+
+        [iOS] <a ping> and <area ping> tests time out
+        https://bugs.webkit.org/show_bug.cgi?id=156857
+
+        Reviewed by Simon Fraser.
+
+        Export HTMLAreaElement::imageElement() so that we can make use of it in WebKit2.
+
+        * html/HTMLAreaElement.h:
+
 2016-08-22  Darin Adler  <darin@apple.com>
 
         [Cocoa] Move Objective-C DOM bindings from WebCore to legacy WebKit
diff --git a/Source/WebCore/html/HTMLAreaElement.h b/Source/WebCore/html/HTMLAreaElement.h
@@ -46,7 +46,7 @@ class HTMLAreaElement final : public HTMLAnchorElement {
     Path computePathForFocusRing(const LayoutSize& elementSize) const;
 
     // The parent map's image.
-    HTMLImageElement* imageElement() const;
+    WEBCORE_EXPORT HTMLImageElement* imageElement() const;
     
 private:
     HTMLAreaElement(const QualifiedName&, Document&);
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
@@ -1,3 +1,21 @@
+2016-08-22  Daniel Bates  <dabates@apple.com>
+
+        [iOS] <a ping> and <area ping> tests time out
+        https://bugs.webkit.org/show_bug.cgi?id=156857
+
+        Reviewed by Simon Fraser.
+
+        Support single tapping on an HTML area element in WebKit2 just as we do in Legacy WebKit.
+
+        WebKit2 commits to clicking a "clickable" DOM node on a single tap only if it has a
+        renderer. An HTML area element represents a hyperlink in an image map and does not have
+        a renderer.
+
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::sendTapHighlightForNodeIfNecessary): Compute the tap highlight with respect
+        to the renderer for the image map associated with the tapped HTML area element (if it has one).
+        (WebKit::WebPage::commitPotentialTap): Allow committing a potential tap on an HTML area element.
+
 2016-08-22  Darin Adler  <darin@apple.com>
 
         Move Objective-C DOM bindings from WebCore to legacy WebKit
diff --git a/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm b/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm
@@ -64,6 +64,7 @@
 #import <WebCore/FrameLoaderClient.h>
 #import <WebCore/FrameView.h>
 #import <WebCore/GeometryUtilities.h>
+#import <WebCore/HTMLAreaElement.h>
 #import <WebCore/HTMLAttachmentElement.h>
 #import <WebCore/HTMLElementTypeHelpers.h>
 #import <WebCore/HTMLFormElement.h>
@@ -610,6 +611,12 @@ static inline FloatRect adjustExposedRectForNewScale(const FloatRect& exposedRec
         m_page->mainFrame().loader().client().prefetchDNS(downcast<Element>(*node).absoluteLinkURL().host());
     }
 
+    if (is<HTMLAreaElement>(node)) {
+        node = downcast<HTMLAreaElement>(node)->imageElement();
+        if (!node)
+            return;
+    }
+
     Vector<FloatQuad> quads;
     if (RenderObject *renderer = node->renderer()) {
         renderer->absoluteQuads(quads);
@@ -665,7 +672,7 @@ static inline FloatRect adjustExposedRectForNewScale(const FloatRect& exposedRec
 
 void WebPage::commitPotentialTap(uint64_t lastLayerTreeTransactionId)
 {
-    if (!m_potentialTapNode || !m_potentialTapNode->renderer()) {
+    if (!m_potentialTapNode || (!m_potentialTapNode->renderer() && !is<HTMLAreaElement>(m_potentialTapNode.get()))) {
         commitPotentialTapFailed();
         return;
     }
