<!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>[200331] trunk/Source/WebCore</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/200331">200331</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2016-05-02 12:33:28 -0700 (Mon, 02 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>DataDetector underline color should be based on the text color
https://bugs.webkit.org/show_bug.cgi?id=157272
Fixes:
<rdar://problem/25663930> DataDetectors links should use the default text color for their parent nodes
<rdar://problem/25663983> DataDetectors links underline color update
Reviewed by Tim Horton.
* editing/cocoa/DataDetection.mm:
(WebCore::DataDetection::detectContentInRange):
When using light links, use the color of the parent element as the text color, and that same color with
20% alpha as the underline color.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200330 => 200331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-05-02 19:08:47 UTC (rev 200330)
+++ trunk/Source/WebCore/ChangeLog        2016-05-02 19:33:28 UTC (rev 200331)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-05-02 Sam Weinig <sam@webkit.org>
+
+ DataDetector underline color should be based on the text color
+ https://bugs.webkit.org/show_bug.cgi?id=157272
+
+ Fixes:
+ <rdar://problem/25663930> DataDetectors links should use the default text color for their parent nodes
+ <rdar://problem/25663983> DataDetectors links underline color update
+
+ Reviewed by Tim Horton.
+
+ * editing/cocoa/DataDetection.mm:
+ (WebCore::DataDetection::detectContentInRange):
+ When using light links, use the color of the parent element as the text color, and that same color with
+ 20% alpha as the underline color.
+
</ins><span class="cx"> 2016-05-01 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> document.currentScript must be null when we're executing a script inside a shadow tree
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaDataDetectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/DataDetection.mm (200330 => 200331)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/DataDetection.mm        2016-05-02 19:08:47 UTC (rev 200330)
+++ trunk/Source/WebCore/editing/cocoa/DataDetection.mm        2016-05-02 19:33:28 UTC (rev 200331)
</span><span class="lines">@@ -53,8 +53,6 @@
</span><span class="cx"> #import <WebKitAdditions/DataDetectorsAdditions.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-const char* dataDetectorsLinkStyle = "-webkit-text-decoration-color:rgb(199, 199, 204); color:initial;";
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="lines">@@ -635,9 +633,19 @@
</span><span class="cx"> Ref<HTMLAnchorElement> anchorElement = HTMLAnchorElement::create(document);
</span><span class="cx"> anchorElement->setHref(correspondingURL);
</span><span class="cx"> anchorElement->setDir("ltr");
</span><del>- if (shouldUseLightLinks)
- anchorElement->setAttribute(styleAttr, dataDetectorsLinkStyle);
- else if (is<StyledElement>(*parentNode)) {
</del><ins>+ if (shouldUseLightLinks) {
+ document.updateStyleIfNeeded();
+ auto* renderStyle = parentNode->computedStyle();
+ if (renderStyle) {
+ auto textColor = renderStyle->visitedDependentColor(CSSPropertyColor);
+ if (textColor.isValid()) {
+ auto underlineColor = Color(colorWithOverrideAlpha(textColor.rgb(), 0.2));
+
+ anchorElement->setInlineStyleProperty(CSSPropertyColor, textColor.cssText());
+ anchorElement->setInlineStyleProperty(CSSPropertyWebkitTextDecorationColor, underlineColor.cssText());
+ }
+ }
+ } else if (is<StyledElement>(*parentNode)) {
</ins><span class="cx"> if (auto* style = downcast<StyledElement>(*parentNode).presentationAttributeStyle()) {
</span><span class="cx"> String color = style->getPropertyValue(CSSPropertyColor);
</span><span class="cx"> if (!color.isEmpty())
</span></span></pre>
</div>
</div>
</body>
</html>