<!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>[200302] 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/200302">200302</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-04-30 23:07:35 -0700 (Sat, 30 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/199640">r199640</a>): position:absolute generated content inherits text-decoration from its element
https://bugs.webkit.org/show_bug.cgi?id=157199
<rdar://problem/26013111>
Reviewed by Zalan Bujtas.
Source/WebCore:
Test: fast/css/text-decoration-inheritance-pseudo.html
* css/StyleResolver.cpp:
(WebCore::doesNotInheritTextDecoration):
(WebCore::StyleResolver::adjustRenderStyle):
There was an accidental logic change here. Even if element is null other conditions may make this test true.
LayoutTests:
* fast/css/text-decoration-inheritance-pseudo-expected.html: Added.
* fast/css/text-decoration-inheritance-pseudo.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastcsstextdecorationinheritancepseudoexpectedhtml">trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastcsstextdecorationinheritancepseudohtml">trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200301 => 200302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-01 05:42:25 UTC (rev 200301)
+++ trunk/LayoutTests/ChangeLog 2016-05-01 06:07:35 UTC (rev 200302)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-04-30 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r199640): position:absolute generated content inherits text-decoration from its element
+ https://bugs.webkit.org/show_bug.cgi?id=157199
+ <rdar://problem/26013111>
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/css/text-decoration-inheritance-pseudo-expected.html: Added.
+ * fast/css/text-decoration-inheritance-pseudo.html: Added.
+
</ins><span class="cx"> 2016-04-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Some content causes deep recursion.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsstextdecorationinheritancepseudoexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo-expected.html (0 => 200302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo-expected.html (rev 0)
+++ trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo-expected.html 2016-05-01 06:07:35 UTC (rev 200302)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+<style>
+.link1, .link2 {
+ text-decoration: none;
+ color: green;
+}
+.link1::before {
+ content: "before content ";
+ text-decoration: underline;
+}
+.link1::after {
+ content: " after content";
+ text-decoration: underline;
+}
+.link2::before {
+ content: "before content ";
+ position: absolute;
+ top: 90px;
+}
+.link2::after {
+ content: " after content";
+ position: absolute;
+}
+.underline {
+ text-decoration: underline;
+}
+</style>
+<p>Test that text decoration is not inherited to a positioned :before/:after pseudo element.</p>
+
+<span class="link1"><span class="underline">normal content</span></span>
+<br>
+<span class="link2"><span class="underline">normal content</span></span>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsstextdecorationinheritancepseudohtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo.html (0 => 200302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo.html (rev 0)
+++ trunk/LayoutTests/fast/css/text-decoration-inheritance-pseudo.html 2016-05-01 06:07:35 UTC (rev 200302)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<style>
+:link {
+ color: green;
+}
+a::before {
+ content: "before content ";
+ text-decoration: none;
+}
+a::after {
+ content: " after content";
+ text-decoration: none;
+}
+.absolute::before {
+ position: absolute;
+ top: 90px;
+}
+.absolute::after {
+ position: absolute;
+}
+</style>
+<p>Test that text decoration is not inherited to a positioned :before/:after pseudo element.</p>
+
+<a href="#">normal content</a>
+<br>
+<a class="absolute" href="#">normal content</a>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200301 => 200302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-01 05:42:25 UTC (rev 200301)
+++ trunk/Source/WebCore/ChangeLog 2016-05-01 06:07:35 UTC (rev 200302)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-30 Antti Koivisto <antti@apple.com>
+
+ REGRESSION (r199640): position:absolute generated content inherits text-decoration from its element
+ https://bugs.webkit.org/show_bug.cgi?id=157199
+ <rdar://problem/26013111>
+
+ Reviewed by Zalan Bujtas.
+
+ Test: fast/css/text-decoration-inheritance-pseudo.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::doesNotInheritTextDecoration):
+ (WebCore::StyleResolver::adjustRenderStyle):
+
+ There was an accidental logic change here. Even if element is null other conditions may make this test true.
+
</ins><span class="cx"> 2016-04-30 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Some content causes deep recursion.
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (200301 => 200302)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2016-05-01 05:42:25 UTC (rev 200301)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2016-05-01 06:07:35 UTC (rev 200302)
</span><span class="lines">@@ -741,10 +741,10 @@
</span><span class="cx"> // CSS requires text-decoration to be reset at each DOM element for tables,
</span><span class="cx"> // inline blocks, inline tables, shadow DOM crossings, floating elements,
</span><span class="cx"> // and absolute or relatively positioned elements.
</span><del>-static bool doesNotInheritTextDecoration(const RenderStyle& style, const Element& element)
</del><ins>+static bool doesNotInheritTextDecoration(const RenderStyle& style, const Element* element)
</ins><span class="cx"> {
</span><span class="cx"> return style.display() == TABLE || style.display() == INLINE_TABLE
</span><del>- || style.display() == INLINE_BLOCK || style.display() == INLINE_BOX || isAtShadowBoundary(element)
</del><ins>+ || style.display() == INLINE_BLOCK || style.display() == INLINE_BOX || (element && isAtShadowBoundary(*element))
</ins><span class="cx"> || style.isFloating() || style.hasOutOfFlowPosition();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (element && doesNotInheritTextDecoration(style, *element))
</del><ins>+ if (doesNotInheritTextDecoration(style, element))
</ins><span class="cx"> style.setTextDecorationsInEffect(style.textDecoration());
</span><span class="cx"> else
</span><span class="cx"> style.addToTextDecorationsInEffect(style.textDecoration());
</span></span></pre>
</div>
</div>
</body>
</html>