Title: [214962] trunk
Revision
214962
Author
[email protected]
Date
2017-04-05 12:43:04 -0700 (Wed, 05 Apr 2017)

Log Message

Unreviewed, rolling out r214937.

This change broke an internal build.

Reverted changeset:

"REGRESSION (r202472): Data Detection overwrites existing
links in detected ranges"
https://bugs.webkit.org/show_bug.cgi?id=170365
http://trac.webkit.org/changeset/214937

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (214961 => 214962)


--- trunk/Source/WebCore/ChangeLog	2017-04-05 19:26:50 UTC (rev 214961)
+++ trunk/Source/WebCore/ChangeLog	2017-04-05 19:43:04 UTC (rev 214962)
@@ -1,3 +1,16 @@
+2017-04-05  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r214937.
+
+        This change broke an internal build.
+
+        Reverted changeset:
+
+        "REGRESSION (r202472): Data Detection overwrites existing
+        links in detected ranges"
+        https://bugs.webkit.org/show_bug.cgi?id=170365
+        http://trac.webkit.org/changeset/214937
+
 2017-04-05  Carlos Alberto Lopez Perez  <[email protected]>
 
         [WebRTC][OpenWebRTC] Add support for SDP BUNDLE ("a:group:BUNDLE" and "a=bundle-only" lines)

Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (214961 => 214962)


--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm	2017-04-05 19:26:50 UTC (rev 214961)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm	2017-04-05 19:43:04 UTC (rev 214962)
@@ -274,7 +274,7 @@
 static bool searchForLinkRemovingExistingDDLinks(Node& startNode, Node& endNode, bool& didModifyDOM)
 {
     didModifyDOM = false;
-    for (Node* node = &startNode; node; node = NodeTraversal::next(*node)) {
+    for (Node* node = &startNode; node; node = NodeTraversal::next(*node, &startNode)) {
         if (is<HTMLAnchorElement>(*node)) {
             auto& anchor = downcast<HTMLAnchorElement>(*node);
             if (!equalIgnoringASCIICase(anchor.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))

Modified: trunk/Tools/ChangeLog (214961 => 214962)


--- trunk/Tools/ChangeLog	2017-04-05 19:26:50 UTC (rev 214961)
+++ trunk/Tools/ChangeLog	2017-04-05 19:43:04 UTC (rev 214962)
@@ -1,3 +1,16 @@
+2017-04-05  Ryan Haddad  <[email protected]>
+
+        Unreviewed, rolling out r214937.
+
+        This change broke an internal build.
+
+        Reverted changeset:
+
+        "REGRESSION (r202472): Data Detection overwrites existing
+        links in detected ranges"
+        https://bugs.webkit.org/show_bug.cgi?id=170365
+        http://trac.webkit.org/changeset/214937
+
 2017-04-05  Jonathan Bedard  <[email protected]>
 
         Increase timeouts for simulator testing

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm (214961 => 214962)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm	2017-04-05 19:26:50 UTC (rev 214961)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm	2017-04-05 19:43:04 UTC (rev 214962)
@@ -60,7 +60,7 @@
     [webView loadHTMLString:HTMLString baseURL:nil];
     [webView _test_waitForDidFinishNavigation];
 
-    [webView evaluateJavaScript:@"document.querySelectorAll('a[x-apple-data-detectors=true]').length" completionHandler:^(id value, NSError *error) {
+    [webView evaluateJavaScript:@"document.getElementsByTagName('a').length" completionHandler:^(id value, NSError *error) {
         EXPECT_EQ(linkCount, [value unsignedIntValue]);
         ranScript = true;
     }];
@@ -81,10 +81,7 @@
 
     expectLinkCount(webView.get(), @"tomorrow at 6PM", 1);
     expectLinkCount(webView.get(), @"yesterday at 6PM", 0);
-    expectLinkCount(webView.get(), @"<a href=''>tomorrow at 6PM</a>", 0);
-    expectLinkCount(webView.get(), @"<a href=''>tomorrow</a> at <a href=''>6PM</a>", 0);
 
-
     NSTimeInterval week = 60 * 60 * 24 * 7;
 
     [UIDelegate setReferenceDate:[NSDate dateWithTimeIntervalSinceNow:-week]];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to