<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[214697] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/214697">214697</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2017-03-31 16:33:24 -0700 (Fri, 31 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/202472">r202472</a>): 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:
<a href="http://trac.webkit.org/projects/webkit/changeset/202472">r202472</a> 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaDataDetectionmm">trunk/Source/WebCore/editing/cocoa/DataDetection.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2CocoaDataDetectionmm">trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214696 => 214697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-31 23:19:11 UTC (rev 214696)
+++ trunk/Source/WebCore/ChangeLog 2017-03-31 23:33:24 UTC (rev 214697)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+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):
+
</ins><span class="cx"> 2017-03-31 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Incoming video source doesn't propogate frame rotation
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (214696 => 214697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2017-03-31 23:19:11 UTC (rev 214696)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm 2017-03-31 23:33:24 UTC (rev 214697)
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> static bool searchForLinkRemovingExistingDDLinks(Node& startNode, Node& endNode, bool& didModifyDOM)
</span><span class="cx"> {
</span><span class="cx"> didModifyDOM = false;
</span><del>- for (Node* node = &startNode; node; node = NodeTraversal::next(*node, &startNode)) {
</del><ins>+ for (Node* node = &startNode; node; node = NodeTraversal::next(*node)) {
</ins><span class="cx"> if (is<HTMLAnchorElement>(*node)) {
</span><span class="cx"> auto& anchor = downcast<HTMLAnchorElement>(*node);
</span><span class="cx"> if (!equalIgnoringASCIICase(anchor.attributeWithoutSynchronization(x_apple_data_detectorsAttr), "true"))
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214696 => 214697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-31 23:19:11 UTC (rev 214696)
+++ trunk/Tools/ChangeLog 2017-03-31 23:33:24 UTC (rev 214697)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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.
+
</ins><span class="cx"> 2017-03-31 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Mail can get stuck underneath FindController::findStringMatches after searching in a long message
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2CocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm (214696 => 214697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm 2017-03-31 23:19:11 UTC (rev 214696)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/DataDetection.mm 2017-03-31 23:33:24 UTC (rev 214697)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> [webView loadHTMLString:HTMLString baseURL:nil];
</span><span class="cx"> [webView _test_waitForDidFinishNavigation];
</span><span class="cx">
</span><del>- [webView evaluateJavaScript:@"document.getElementsByTagName('a').length" completionHandler:^(id value, NSError *error) {
</del><ins>+ [webView evaluateJavaScript:@"document.querySelectorAll('a[x-apple-data-detectors=true]').length" completionHandler:^(id value, NSError *error) {
</ins><span class="cx"> EXPECT_EQ(linkCount, [value unsignedIntValue]);
</span><span class="cx"> ranScript = true;
</span><span class="cx"> }];
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> ranScript = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TEST(WebKit2, DISABLED_DataDetectionReferenceDate)
</del><ins>+TEST(WebKit2, DataDetectionReferenceDate)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
</span><span class="cx"> [configuration setDataDetectorTypes:WKDataDetectorTypeCalendarEvent];
</span><span class="lines">@@ -81,7 +81,10 @@
</span><span class="cx">
</span><span class="cx"> expectLinkCount(webView.get(), @"tomorrow at 6PM", 1);
</span><span class="cx"> expectLinkCount(webView.get(), @"yesterday at 6PM", 0);
</span><ins>+ 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);
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> NSTimeInterval week = 60 * 60 * 24 * 7;
</span><span class="cx">
</span><span class="cx"> [UIDelegate setReferenceDate:[NSDate dateWithTimeIntervalSinceNow:-week]];
</span></span></pre>
</div>
</div>
</body>
</html>