Changeset 214697 in webkit

Timestamp:

Mar 31, 2017, 4:33:24 PM (8 years ago)

Author:

aestes@apple.com

Message:

REGRESSION (r202472): Data Detection overwrites existing links in detected ranges
​https://bugs.webkit.org/show_bug.cgi?id=170365
<rdar://problem/29205721>

Reviewed by Tim Horton.

Source/WebCore:

r202472 changed the node traversal in searchForLinkRemovingExistingDDLinks() to only
consider nodes that are descendants of startNode, but we need to traverse all nodes between
startNode and endNode to find existing non-DD links.

As a result, we'd add a Data Detector link to the following snippet and make the original
links un-clickable:

<a href='#'>tomorrow</a> <a href='#'>night</a>

Fix this by not specifying a stayWithin node when calling NodeTraversal::next(). The loop
will terminate when we reach endNode.

Updated WebKit2.DataDetectionReferenceDate API test.

• editing/cocoa/DataDetection.mm:

(WebCore::searchForLinkRemovingExistingDDLinks):

Tools:

• TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm:

(expectLinkCount): Changed to only query links with the x-apple-data-detectors attribute.
(TEST): Re-enabled the test, which now passes.

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/cocoa/DataDetection.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-31  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r202472): Data Detection overwrites existing links in detected ranges
+        https://bugs.webkit.org/show_bug.cgi?id=170365
+        <rdar://problem/29205721>
+
+        Reviewed by Tim Horton.
+
+        r202472 changed the node traversal in searchForLinkRemovingExistingDDLinks() to only
+        consider nodes that are descendants of startNode, but we need to traverse all nodes between
+        startNode and endNode to find existing non-DD links.
+
+        As a result, we'd add a Data Detector link to the following snippet and make the original
+        links un-clickable:
+
+            <a href='#'>tomorrow</a> <a href='#'>night</a>
+
+        Fix this by not specifying a stayWithin node when calling NodeTraversal::next(). The loop
+        will terminate when we reach endNode.
+
+        Updated WebKit2.DataDetectionReferenceDate API test.
+
+        * editing/cocoa/DataDetection.mm:
+        (WebCore::searchForLinkRemovingExistingDDLinks):
+
 2017-03-31  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/editing/cocoa/DataDetection.mm

@@ -275 +275 @@
 {
     didModifyDOM = false;
-    for (Node* node = &startNode; node; node = NodeTraversal::next(*node, &startNode)) {
+    for (Node* node = &startNode; node; node = NodeTraversal::next(*node)) {
         if (is<HTMLAnchorElement>(*node)) {
             auto& anchor = downcast<HTMLAnchorElement>(*node);

trunk/Tools/ChangeLog

@@ +1 @@
+2017-03-31  Andy Estes  <aestes@apple.com>
+
+        REGRESSION (r202472): Data Detection overwrites existing links in detected ranges
+        https://bugs.webkit.org/show_bug.cgi?id=170365
+        <rdar://problem/29205721>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm:
+        (expectLinkCount): Changed to only query links with the x-apple-data-detectors attribute.
+        (TEST): Re-enabled the test, which now passes.
+
 2017-03-31  Tim Horton  <timothy_horton@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm

@@ -61 +61 @@
     [webView _test_waitForDidFinishNavigation];
 
-    [webView evaluateJavaScript:@"document.getElementsByTagName('a').length" completionHandler:^(id value, NSError *error) {
+    [webView evaluateJavaScript:@"document.querySelectorAll('a[x-apple-data-detectors=true]').length" completionHandler:^(id value, NSError *error) {
         EXPECT_EQ(linkCount, [value unsignedIntValue]);
         ranScript = true;
@@ -70 +70 @@
 }
 
-TEST(WebKit2, DISABLED_DataDetectionReferenceDate)
+TEST(WebKit2, DataDetectionReferenceDate)
 {
     RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
@@ -82 +82 @@
     expectLinkCount(webView.get(), @"tomorrow at 6PM", 1);
     expectLinkCount(webView.get(), @"yesterday at 6PM", 0);
+    expectLinkCount(webView.get(), @"<a href='about:blank'>tomorrow at 6PM</a>", 0);
+    expectLinkCount(webView.get(), @"<a href='about:blank'>tomorrow</a> at <a href='about:blank'>6PM</a>", 0);
+
 
     NSTimeInterval week = 60 * 60 * 24 * 7;