<!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>[161814] 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/161814">161814</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-12 10:55:33 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/160806">r160806</a>): line-height is not applied when only present in :link style.
<http://webkit.org/b/126839>
<rdar://problem/15799899>
Reviewed by Antti Koivisto.
Source/WebCore:
Test: fast/css/line-height-link-style.html
* css/StyleResolver.cpp:
(WebCore::StyleResolver::CascadedProperties::Property::apply):
Use the CSSValue for SelectorChecker::MatchLink when applying
style inside a link.
LayoutTests:
* fast/css/line-height-link-style-expected.txt: Added.
* fast/css/line-height-link-style.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="#trunkLayoutTestsfastcsslineheightlinkstyleexpectedtxt">trunk/LayoutTests/fast/css/line-height-link-style-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcsslineheightlinkstylehtml">trunk/LayoutTests/fast/css/line-height-link-style.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161813 => 161814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-12 18:47:36 UTC (rev 161813)
+++ trunk/LayoutTests/ChangeLog 2014-01-12 18:55:33 UTC (rev 161814)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-12 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r160806): line-height is not applied when only present in :link style.
+ <http://webkit.org/b/126839>
+ <rdar://problem/15799899>
+
+ Reviewed by Antti Koivisto.
+
+ * fast/css/line-height-link-style-expected.txt: Added.
+ * fast/css/line-height-link-style.html: Added.
+
</ins><span class="cx"> 2014-01-11 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebGL] Correct uniform input validation for texture sampler uniforms
</span></span></pre></div>
<a id="trunkLayoutTestsfastcsslineheightlinkstyleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/line-height-link-style-expected.txt (0 => 161814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/line-height-link-style-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/line-height-link-style-expected.txt 2014-01-12 18:55:33 UTC (rev 161814)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This test verifies that line-height gets applied from link-only style.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS regularComputedStyle.lineHeight is '100px'
+PASS linkComputedStyle.lineHeight is '200px'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastcsslineheightlinkstylehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/css/line-height-link-style.html (0 => 161814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/line-height-link-style.html (rev 0)
+++ trunk/LayoutTests/fast/css/line-height-link-style.html 2014-01-12 18:55:33 UTC (rev 161814)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+a { line-height: 100px }
+a:link { line-height: 200px }
+</style>
+</head>
+<body>
+<div id="gunk">
+ <a id="a_regular">regular anchor</a>
+ <a id="a_link" href="#">link anchor</a>
+</div>
+<script>
+
+description("This test verifies that line-height gets applied from link-only style.");
+
+var regularComputedStyle = window.getComputedStyle(document.getElementById("a_regular"));
+var linkComputedStyle = window.getComputedStyle(document.getElementById("a_link"));
+
+shouldBe("regularComputedStyle.lineHeight", "'100px'");
+shouldBe("linkComputedStyle.lineHeight", "'200px'");
+
+document.getElementById("gunk").remove();
+
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161813 => 161814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-12 18:47:36 UTC (rev 161813)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 18:55:33 UTC (rev 161814)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-12 Andreas Kling <akling@apple.com>
+
+ REGRESSION(r160806): line-height is not applied when only present in :link style.
+ <http://webkit.org/b/126839>
+ <rdar://problem/15799899>
+
+ Reviewed by Antti Koivisto.
+
+ Test: fast/css/line-height-link-style.html
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::CascadedProperties::Property::apply):
+
+ Use the CSSValue for SelectorChecker::MatchLink when applying
+ style inside a link.
+
</ins><span class="cx"> 2014-01-12 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix link errors for iOS: Part 3
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (161813 => 161814)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-01-12 18:47:36 UTC (rev 161813)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-01-12 18:55:33 UTC (rev 161814)
</span><span class="lines">@@ -4252,8 +4252,8 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: It would be nice if line-height were less of a special snowflake.
</span><span class="cx"> if (id == CSSPropertyLineHeight) {
</span><del>- if (cssValue[0])
- state.setLineHeightValue(cssValue[0]);
</del><ins>+ if (auto value = state.style()->insideLink() == NotInsideLink ? cssValue[0] : cssValue[SelectorChecker::MatchLink])
+ state.setLineHeightValue(value);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>