<!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>[179174] trunk/LayoutTests</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/179174">179174</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-26 23:40:39 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rebaseline several CSS tests after <a href="http://trac.webkit.org/projects/webkit/changeset/179168">r179168</a>.
Computed line-height is no longer 'normal' but the font's line
spacing.
* fast/css/font-shorthand-line-height-expected.txt:
* fast/css/font-shorthand-line-height.html:
* platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt:
* platform/mac/fast/css/css2-system-fonts-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssfontshorthandlineheightexpectedtxt">trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssfontshorthandlineheighthtml">trunk/LayoutTests/fast/css/font-shorthand-line-height.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastcsscss2systemfontsexpectedtxt">trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksfastcsscss2systemfontsexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179173 => 179174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/ChangeLog 2015-01-27 07:40:39 UTC (rev 179174)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-26 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, rebaseline several CSS tests after r179168.
+
+ Computed line-height is no longer 'normal' but the font's line
+ spacing.
+
+ * fast/css/font-shorthand-line-height-expected.txt:
+ * fast/css/font-shorthand-line-height.html:
+ * platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt:
+ * platform/mac/fast/css/css2-system-fonts-expected.txt:
+
</ins><span class="cx"> 2015-01-26 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unskipping more tests after correcting baselines for Windows widgets.
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontshorthandlineheightexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt (179173 => 179174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/fast/css/font-shorthand-line-height-expected.txt 2015-01-27 07:40:39 UTC (rev 179174)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS lineHeight(system_font_1) is '100px'
</span><del>-PASS lineHeight(system_font_2) is 'normal'
</del><ins>+PASS lineHeight(system_font_2) is '16px'
</ins><span class="cx"> PASS lineHeight(shorthand_normal_1) is '100px'
</span><del>-PASS lineHeight(shorthand_normal_2) is 'normal'
</del><ins>+PASS lineHeight(shorthand_normal_2) is '12px'
</ins><span class="cx"> PASS lineHeight(shorthand_line_height_1) is '100px'
</span><span class="cx"> PASS lineHeight(shorthand_line_height_2) is '200px'
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssfontshorthandlineheighthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-shorthand-line-height.html (179173 => 179174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/font-shorthand-line-height.html 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/fast/css/font-shorthand-line-height.html 2015-01-27 07:40:39 UTC (rev 179174)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> shouldBe("lineHeight(system_font_1)", "'100px'");
</span><del>- shouldBe("lineHeight(system_font_2)", "'normal'");
</del><ins>+ shouldBe("lineHeight(system_font_2)", "'16px'");
</ins><span class="cx"> shouldBe("lineHeight(shorthand_normal_1)", "'100px'");
</span><del>- shouldBe("lineHeight(shorthand_normal_2)", "'normal'");
</del><ins>+ shouldBe("lineHeight(shorthand_normal_2)", "'12px'");
</ins><span class="cx"> shouldBe("lineHeight(shorthand_line_height_1)", "'100px'");
</span><span class="cx"> shouldBe("lineHeight(shorthand_line_height_2)", "'200px'");
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastcsscss2systemfontsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt (179173 => 179174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/platform/mac/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:40:39 UTC (rev 179174)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> This tests platform specific system font styles. If any of the styles appear in monospace the test fails.
</span><del>-caption: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-icon: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-menu: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-message-box: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
-small-caption: normal normal normal 11px/normal '.HelveticaNeueDeskInterface-Regular'
-status-bar: normal normal normal 10px/normal '.HelveticaNeueDeskInterface-Regular'
--webkit-mini-control: normal normal normal 9px/normal '.HelveticaNeueDeskInterface-Regular'
--webkit-small-control: normal normal normal 11px/normal '.HelveticaNeueDeskInterface-Regular'
--webkit-control: normal normal normal 13px/normal '.HelveticaNeueDeskInterface-Regular'
</del><ins>+caption: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+icon: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+menu: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+message-box: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
+small-caption: normal normal normal 11px/13px '.HelveticaNeueDeskInterface-Regular'
+status-bar: normal normal normal 10px/12px '.HelveticaNeueDeskInterface-Regular'
+-webkit-mini-control: normal normal normal 9px/11px '.HelveticaNeueDeskInterface-Regular'
+-webkit-small-control: normal normal normal 11px/13px '.HelveticaNeueDeskInterface-Regular'
+-webkit-control: normal normal normal 13px/16px '.HelveticaNeueDeskInterface-Regular'
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksfastcsscss2systemfontsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt (179173 => 179174)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:30:59 UTC (rev 179173)
+++ trunk/LayoutTests/platform/mac-mavericks/fast/css/css2-system-fonts-expected.txt 2015-01-27 07:40:39 UTC (rev 179174)
</span><span class="lines">@@ -1,10 +1,10 @@
</span><span class="cx"> This tests platform specific system font styles. If any of the styles appear in monospace the test fails.
</span><del>-caption: normal normal normal 13px/normal '.LucidaGrandeUI'
-icon: normal normal normal 13px/normal '.LucidaGrandeUI'
-menu: normal normal normal 13px/normal '.LucidaGrandeUI'
-message-box: normal normal normal 13px/normal '.LucidaGrandeUI'
-small-caption: normal normal normal 11px/normal '.LucidaGrandeUI'
-status-bar: normal normal normal 10px/normal '.LucidaGrandeUI'
--webkit-mini-control: normal normal normal 9px/normal '.LucidaGrandeUI'
--webkit-small-control: normal normal normal 11px/normal '.LucidaGrandeUI'
--webkit-control: normal normal normal 13px/normal '.LucidaGrandeUI'
</del><ins>+caption: normal normal normal 13px/16px '.LucidaGrandeUI'
+icon: normal normal normal 13px/16px '.LucidaGrandeUI'
+menu: normal normal normal 13px/16px '.LucidaGrandeUI'
+message-box: normal normal normal 13px/16px '.LucidaGrandeUI'
+small-caption: normal normal normal 11px/13px '.LucidaGrandeUI'
+status-bar: normal normal normal 10px/12px '.LucidaGrandeUI'
+-webkit-mini-control: normal normal normal 9px/11px '.LucidaGrandeUI'
+-webkit-small-control: normal normal normal 11px/13px '.LucidaGrandeUI'
+-webkit-control: normal normal normal 13px/16px '.LucidaGrandeUI'
</ins></span></pre>
</div>
</div>
</body>
</html>