<!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>[179168] 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/179168">179168</a></dd>

<dt>Author</dt> <dd>dino@apple.com</dd>

<dt>Date</dt> <dd>2015-01-26 22:12:40 -0800 (Mon, 26 Jan 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>The computed value of line-height:normal is incorrect

https://bugs.webkit.org/show_bug.cgi?id=133744

Patch by Sylvain Galineau &lt;galineau@adobe.com&gt; on 2015-01-26

Reviewed by Dean Jackson.

Source/WebCore:

Use font's line spacing as computed line-height value when specified value is 'normal'.

This behavior is compatible with all other engines.

No new tests; all existing tests are updated to reflect the new computed value.

* css/CSSComputedStyleDeclaration.cpp:

(WebCore::lineHeightFromStyle): If line-height wasn't set, use the font's line spacing (same as Blink).

LayoutTests:

line-height:normal now computes to a length value.

This patch updates the tests to reflect the new computed value, as needed.

* css3/calc/line-height-expected.txt:

* editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt:

* fast/css/font-calculated-value-expected.txt:

* fast/css/font-calculated-value.html:

* fast/css/font-shorthand-from-longhands-expected.txt:

* fast/css/font-shorthand-from-longhands.html:

* fast/css/getComputedStyle/computed-style-expected.txt:

* fast/css/getComputedStyle/computed-style-font-expected.txt:

* fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:

* fast/css/getComputedStyle/script-tests/computed-style-font.js:

* fast/css/line-height-text-autosizing-expected.txt:

* fast/css/line-height-text-autosizing.html:

* fast/ruby/ruby-line-height-expected.txt:

* fast/ruby/script-tests/ruby-line-height.js:

* media/track/track-cue-rendering-on-resize-expected.txt:

* media/track/track-cue-rendering-on-resize.html:

* platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt:

* platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt:

* platform/mac/editing/attributed-string/anchor-element-expected.txt:

* platform/mac/editing/attributed-string/basic-expected.txt:

* platform/mac/editing/attributed-string/font-size-expected.txt:

* platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt:

* platform/mac/editing/attributed-string/font-weight-expected.txt:

* platform/mac/editing/attributed-string/letter-spacing-expected.txt:

* platform/mac/editing/attributed-string/text-decorations-expected.txt:

* platform/mac/editing/attributed-string/vertical-align-expected.txt:

* svg/css/getComputedStyle-basic-expected.txt:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestscss3calclineheightexpectedtxt">trunk/LayoutTests/css3/calc/line-height-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingpasteboardsimplfiyingmarkupshouldnotstripcontentexpectedtxt">trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcssfontcalculatedvalueexpectedtxt">trunk/LayoutTests/fast/css/font-calculated-value-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcssfontcalculatedvaluehtml">trunk/LayoutTests/fast/css/font-calculated-value.html</a></li>

<li><a href="#trunkLayoutTestsfastcssfontshorthandfromlonghandsexpectedtxt">trunk/LayoutTests/fast/css/font-shorthand-from-longhands-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcssfontshorthandfromlonghandshtml">trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html</a></li>

<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylefontexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt">trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcssgetComputedStylescripttestscomputedstylefontjs">trunk/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js</a></li>

<li><a href="#trunkLayoutTestsfastcsslineheighttextautosizingexpectedtxt">trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastcsslineheighttextautosizinghtml">trunk/LayoutTests/fast/css/line-height-text-autosizing.html</a></li>

<li><a href="#trunkLayoutTestsfastrubyrubylineheightexpectedtxt">trunk/LayoutTests/fast/ruby/ruby-line-height-expected.txt</a></li>

<li><a href="#trunkLayoutTestsfastrubyscripttestsrubylineheightjs">trunk/LayoutTests/fast/ruby/script-tests/ruby-line-height.js</a></li>

<li><a href="#trunkLayoutTestsmediatracktrackcuerenderingonresizeexpectedtxt">trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt</a></li>

<li><a href="#trunkLayoutTestsmediatracktrackcuerenderingonresizehtml">trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringanchorelementexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/anchor-element-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringbasicexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/basic-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringfontsizeexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/font-size-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringfontstylevarianteffectexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringfontweightexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/font-weight-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringletterspacingexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/letter-spacing-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringtextdecorationsexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/text-decorations-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmaceditingattributedstringverticalalignexpectedtxt">trunk/LayoutTests/platform/mac/editing/attributed-string/vertical-align-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringanchorelementexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringbasicexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringfontsizeexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringfontstylevarianteffectexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringfontweightexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringletterspacingexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringtextdecorationsexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacmavericksplatformmaceditingattributedstringverticalalignexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt</a></li>

<li><a href="#trunkLayoutTestssvgcssgetComputedStylebasicexpectedtxt">trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/ChangeLog        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -1,3 +1,47 @@

</span><ins>+2015-01-26  Sylvain Galineau  &lt;galineau@adobe.com&gt;

+

+        The computed value of line-height:normal is incorrect

+        https://bugs.webkit.org/show_bug.cgi?id=133744

+

+        Reviewed by Dean Jackson.

+

+        line-height:normal now computes to a length value.

+        This patch updates the tests to reflect the new computed value, as needed.

+

+        * css3/calc/line-height-expected.txt:

+        * editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt:

+        * fast/css/font-calculated-value-expected.txt:

+        * fast/css/font-calculated-value.html:

+        * fast/css/font-shorthand-from-longhands-expected.txt:

+        * fast/css/font-shorthand-from-longhands.html:

+        * fast/css/getComputedStyle/computed-style-expected.txt:

+        * fast/css/getComputedStyle/computed-style-font-expected.txt:

+        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:

+        * fast/css/getComputedStyle/script-tests/computed-style-font.js:

+        * fast/css/line-height-text-autosizing-expected.txt:

+        * fast/css/line-height-text-autosizing.html:

+        * fast/ruby/ruby-line-height-expected.txt:

+        * fast/ruby/script-tests/ruby-line-height.js:

+        * media/track/track-cue-rendering-on-resize-expected.txt:

+        * media/track/track-cue-rendering-on-resize.html:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt:

+        * platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt:

+        * platform/mac/editing/attributed-string/anchor-element-expected.txt:

+        * platform/mac/editing/attributed-string/basic-expected.txt:

+        * platform/mac/editing/attributed-string/font-size-expected.txt:

+        * platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt:

+        * platform/mac/editing/attributed-string/font-weight-expected.txt:

+        * platform/mac/editing/attributed-string/letter-spacing-expected.txt:

+        * platform/mac/editing/attributed-string/text-decorations-expected.txt:

+        * platform/mac/editing/attributed-string/vertical-align-expected.txt:

+        * svg/css/getComputedStyle-basic-expected.txt:

+

</ins><span class="cx"> 2015-01-26  Brent Fulgham  &lt;bfulgham@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         [Win] Windows gardening (removing more skips).

</span></span></pre></div>

<a id="trunkLayoutTestscss3calclineheightexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/calc/line-height-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/css3/calc/line-height-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/css3/calc/line-height-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -4,7 +4,7 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> PASS getComputedStyle(document.getElementById(&quot;calc-percent&quot;), null).lineHeight is getComputedStyle(document.getElementById(&quot;control&quot;), null).lineHeight

<del>-FAIL getComputedStyle(document.getElementById(&quot;calc-percent-pixels&quot;), null).lineHeight should be 32px. Was normal.

</del><ins>+FAIL getComputedStyle(document.getElementById(&quot;calc-percent-pixels&quot;), null).lineHeight should be 32px. Was 18px.

</ins><span class="cx"> PASS successfullyParsed is true

</span><span class="cx"> 

</span><span class="cx"> TEST COMPLETE

</span></span></pre></div>

<a id="trunkLayoutTestseditingpasteboardsimplfiyingmarkupshouldnotstripcontentexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -33,7 +33,7 @@

</span><span class="cx"> |   face=&quot;Verdana&quot;

</span><span class="cx"> |   &quot;hello &quot;

</span><span class="cx"> | &lt;br&gt;

</span><del>-|   style=&quot;font-family: Helvetica;&quot;

</del><ins>+|   style=&quot;font-family: Helvetica; line-height: 18px;&quot;

</ins><span class="cx"> | &lt;font&gt;

</span><span class="cx"> |   face=&quot;Verdana&quot;

</span><span class="cx"> |   &quot;worldWebKit&lt;#selection-caret&gt;&quot;

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssfontcalculatedvalueexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-calculated-value-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/font-calculated-value-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/font-calculated-value-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -6,7 +6,7 @@

</span><span class="cx"> PASS testDiv.style['font'] is &quot;&quot;

</span><span class="cx"> testDiv.style['font'] = 'italic small-caps calc(100 * 9) 12px arial'

</span><span class="cx"> PASS testDiv.style['font'] is &quot;italic small-caps 900 12px arial&quot;

</span><del>-PASS window.getComputedStyle(testDiv).getPropertyValue('font') is &quot;italic small-caps 900 12px/normal arial&quot;

</del><ins>+PASS window.getComputedStyle(testDiv).getPropertyValue('font') is &quot;italic small-caps 900 12px/14px arial&quot;

</ins><span class="cx"> PASS successfullyParsed is true

</span><span class="cx"> 

</span><span class="cx"> TEST COMPLETE

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssfontcalculatedvaluehtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-calculated-value.html (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/font-calculated-value.html        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/font-calculated-value.html        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -10,7 +10,7 @@

</span><span class="cx"> shouldBeEmptyString(&quot;testDiv.style['font']&quot;);

</span><span class="cx"> evalAndLog(&quot;testDiv.style['font'] = 'italic small-caps calc(100 * 9) 12px arial'&quot;);

</span><span class="cx"> shouldBeEqualToString(&quot;testDiv.style['font']&quot;, &quot;italic small-caps 900 12px arial&quot;);

</span><del>-shouldBeEqualToString(&quot;window.getComputedStyle(testDiv).getPropertyValue('font')&quot;, &quot;italic small-caps 900 12px/normal arial&quot;);

</del><ins>+shouldBeEqualToString(&quot;window.getComputedStyle(testDiv).getPropertyValue('font')&quot;, &quot;italic small-caps 900 12px/14px arial&quot;);

</ins><span class="cx"> 

</span><span class="cx"> &lt;/script&gt;

</span><span class="cx"> &lt;script src=&quot;../../resources/js-test-post.js&quot;&gt;&lt;/script&gt;

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssfontshorthandfromlonghandsexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-shorthand-from-longhands-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/font-shorthand-from-longhands-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/font-shorthand-from-longhands-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -4,23 +4,23 @@

</span><span class="cx"> 

</span><span class="cx"> 

</span><span class="cx"> PASS style.font is ''

</span><del>-PASS computedStyle.font is 'normal normal normal 20px/normal foobar'

</del><ins>+PASS computedStyle.font is 'normal normal normal 20px/23px foobar'

</ins><span class="cx"> PASS computedStyle.fontSize is '20px'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is '20px sans-serif'

</span><del>-PASS computedStyle.font is 'normal normal normal 20px/normal sans-serif'

</del><ins>+PASS computedStyle.font is 'normal normal normal 20px/23px sans-serif'

</ins><span class="cx"> PASS computedStyle.fontFamily is 'sans-serif'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is 'italic 20px sans-serif'

</span><del>-PASS computedStyle.font is 'italic normal normal 20px/normal sans-serif'

</del><ins>+PASS computedStyle.font is 'italic normal normal 20px/23px sans-serif'

</ins><span class="cx"> PASS computedStyle.fontStyle is 'italic'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is 'italic small-caps 20px sans-serif'

</span><del>-PASS computedStyle.font is 'italic small-caps normal 20px/normal sans-serif'

</del><ins>+PASS computedStyle.font is 'italic small-caps normal 20px/23px sans-serif'

</ins><span class="cx"> PASS computedStyle.fontVariant is 'small-caps'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is 'italic small-caps bold 20px sans-serif'

</span><del>-PASS computedStyle.font is 'italic small-caps bold 20px/normal sans-serif'

</del><ins>+PASS computedStyle.font is 'italic small-caps bold 20px/23px sans-serif'

</ins><span class="cx"> PASS computedStyle.fontWeight is 'bold'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is 'italic small-caps bold 20px/40px sans-serif'

</span><span class="lines">@@ -28,14 +28,14 @@

</span><span class="cx"> PASS computedStyle.lineHeight is '40px'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is ''

</span><del>-PASS computedStyle.font is 'normal normal normal 16px/normal foobar'

</del><ins>+PASS computedStyle.font is 'normal normal normal 16px/18px foobar'

</ins><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is ''

</span><del>-PASS computedStyle.font is 'normal normal bold 16px/normal foobar'

</del><ins>+PASS computedStyle.font is 'normal normal bold 16px/18px foobar'

</ins><span class="cx"> PASS computedStyle.fontWeight is 'bold'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span><span class="cx"> PASS style.font is 'bold 40px sans-serif'

</span><del>-PASS computedStyle.font is 'normal normal bold 40px/normal sans-serif'

</del><ins>+PASS computedStyle.font is 'normal normal bold 40px/46px sans-serif'

</ins><span class="cx"> PASS computedStyle.fontSize is '40px'

</span><span class="cx"> PASS computedStyle.fontFamily is 'sans-serif'

</span><span class="cx"> PASS checkFontStyleValue() is true

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssfontshorthandfromlonghandshtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -36,32 +36,32 @@

</span><span class="cx"> style.fontSize = &quot;20px&quot;;

<span class="cx"> // We need at least the font-family to build the shorthand.

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;''&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal normal 20px/normal foobar'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal normal 20px/23px foobar'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontSize&quot;, &quot;'20px'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="cx"> style.fontSize = &quot;20px&quot;;

</span><span class="cx"> style.fontFamily = &quot;sans-serif&quot;;

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;'20px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal normal 20px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal normal 20px/23px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontFamily&quot;, &quot;'sans-serif'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="cx"> style.fontStyle = &quot;italic&quot;;

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;'italic 20px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'italic normal normal 20px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'italic normal normal 20px/23px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontStyle&quot;, &quot;'italic'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="cx"> style.fontVariant = &quot;small-caps&quot;;

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;'italic small-caps 20px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'italic small-caps normal 20px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'italic small-caps normal 20px/23px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontVariant&quot;, &quot;'small-caps'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="cx"> style.fontWeight = &quot;bold&quot;;

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;'italic small-caps bold 20px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'italic small-caps bold 20px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'italic small-caps bold 20px/23px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontWeight&quot;, &quot;'bold'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="lines">@@ -73,13 +73,13 @@

</span><span class="cx"> 

</span><span class="cx"> style.font = &quot;&quot;;

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;''&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal normal 16px/normal foobar'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal normal 16px/18px foobar'&quot;);

</ins><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="cx"> style.fontWeight = &quot;bold&quot;;

<span class="cx"> // It is normal to return null as the font-size is mandatory to build the shorthand.

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;''&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal bold 16px/normal foobar'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal bold 16px/18px foobar'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontWeight&quot;, &quot;'bold'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span><span class="cx"> 

</span><span class="lines">@@ -87,7 +87,7 @@

</span><span class="cx"> style.fontFamily = &quot;sans-serif&quot;;

</span><span class="cx"> style.fontWeight = &quot;bold&quot;;

</span><span class="cx"> shouldBe(&quot;style.font&quot;, &quot;'bold 40px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal bold 40px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedStyle.font&quot;, &quot;'normal normal bold 40px/46px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedStyle.fontSize&quot;, &quot;'40px'&quot;);

</span><span class="cx"> shouldBe(&quot;computedStyle.fontFamily&quot;, &quot;'sans-serif'&quot;);

</span><span class="cx"> shouldBe(&quot;checkFontStyleValue()&quot;, &quot;true&quot;);

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstyleexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -50,7 +50,7 @@

</span><span class="cx"> image-rendering: auto;

</span><span class="cx"> left: auto;

</span><span class="cx"> letter-spacing: normal;

</span><del>-line-height: normal;

</del><ins>+line-height: 18px;

</ins><span class="cx"> list-style-image: none;

</span><span class="cx"> list-style-position: outside;

</span><span class="cx"> list-style-type: disc;

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylefontexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -3,62 +3,62 @@

<span class="cx"> On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.

</span><span class="cx"> 

</span><span class="cx"> 

</span><del>-PASS computedFont('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFont('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFont('10px SANS-SERIF') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFont('12px sans-serif') is 'normal normal normal 12px/normal sans-serif'

-PASS computedFont('12px  sans-serif') is 'normal normal normal 12px/normal sans-serif'

-PASS computedFont('10px sans-serif, sans-serif') is 'normal normal normal 10px/normal sans-serif, sans-serif'

-PASS computedFont('10px sans-serif, serif') is 'normal normal normal 10px/normal sans-serif, serif'

-PASS computedFont('12px ahem') is 'normal normal normal 12px/normal ahem'

-PASS computedFont('12px unlikely-font-name') is 'normal normal normal 12px/normal unlikely-font-name'

-PASS computedFont('100 10px sans-serif') is 'normal normal 100 10px/normal sans-serif'

-PASS computedFont('200 10px sans-serif') is 'normal normal 200 10px/normal sans-serif'

-PASS computedFont('300 10px sans-serif') is 'normal normal 300 10px/normal sans-serif'

-PASS computedFont('400 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFont('normal 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFont('500 10px sans-serif') is 'normal normal 500 10px/normal sans-serif'

-PASS computedFont('600 10px sans-serif') is 'normal normal 600 10px/normal sans-serif'

-PASS computedFont('700 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'

-PASS computedFont('bold 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'

-PASS computedFont('800 10px sans-serif') is 'normal normal 800 10px/normal sans-serif'

-PASS computedFont('900 10px sans-serif') is 'normal normal 900 10px/normal sans-serif'

-PASS computedFont('italic 10px sans-serif') is 'italic normal normal 10px/normal sans-serif'

-PASS computedFont('small-caps 10px sans-serif') is 'normal small-caps normal 10px/normal sans-serif'

-PASS computedFont('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/normal sans-serif'

-PASS computedFont('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/normal sans-serif'

</del><ins>+PASS computedFont('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFont('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFont('10px SANS-SERIF') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFont('12px sans-serif') is 'normal normal normal 12px/14px sans-serif'

+PASS computedFont('12px  sans-serif') is 'normal normal normal 12px/14px sans-serif'

+PASS computedFont('10px sans-serif, sans-serif') is 'normal normal normal 10px/12px sans-serif, sans-serif'

+PASS computedFont('10px sans-serif, serif') is 'normal normal normal 10px/12px sans-serif, serif'

+PASS computedFont('12px ahem') is 'normal normal normal 12px/12px ahem'

+PASS computedFont('12px unlikely-font-name') is 'normal normal normal 12px/14px unlikely-font-name'

+PASS computedFont('100 10px sans-serif') is 'normal normal 100 10px/12px sans-serif'

+PASS computedFont('200 10px sans-serif') is 'normal normal 200 10px/12px sans-serif'

+PASS computedFont('300 10px sans-serif') is 'normal normal 300 10px/12px sans-serif'

+PASS computedFont('400 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFont('normal 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFont('500 10px sans-serif') is 'normal normal 500 10px/12px sans-serif'

+PASS computedFont('600 10px sans-serif') is 'normal normal 600 10px/12px sans-serif'

+PASS computedFont('700 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'

+PASS computedFont('bold 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'

+PASS computedFont('800 10px sans-serif') is 'normal normal 800 10px/12px sans-serif'

+PASS computedFont('900 10px sans-serif') is 'normal normal 900 10px/12px sans-serif'

+PASS computedFont('italic 10px sans-serif') is 'italic normal normal 10px/12px sans-serif'

+PASS computedFont('small-caps 10px sans-serif') is 'normal small-caps normal 10px/12px sans-serif'

+PASS computedFont('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/12px sans-serif'

+PASS computedFont('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/12px sans-serif'

</ins><span class="cx"> PASS computedFont('10px/100% sans-serif') is 'normal normal normal 10px/10px sans-serif'

</span><span class="cx"> PASS computedFont('10px/100px sans-serif') is 'normal normal normal 10px/100px sans-serif'

</span><del>-PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('10px SANS-SERIF') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('12px sans-serif') is 'normal normal normal 12px/normal sans-serif'

-PASS computedFontCSSValue('12px  sans-serif') is 'normal normal normal 12px/normal sans-serif'

-PASS computedFontCSSValue('10px sans-serif, sans-serif') is 'normal normal normal 10px/normal sans-serif, sans-serif'

-PASS computedFontCSSValue('10px sans-serif, serif') is 'normal normal normal 10px/normal sans-serif, serif'

-PASS computedFontCSSValue('12px ahem') is 'normal normal normal 12px/normal ahem'

-PASS computedFontCSSValue('12px unlikely-font-name') is 'normal normal normal 12px/normal unlikely-font-name'

-PASS computedFontCSSValue('100 10px sans-serif') is 'normal normal 100 10px/normal sans-serif'

-PASS computedFontCSSValue('200 10px sans-serif') is 'normal normal 200 10px/normal sans-serif'

-PASS computedFontCSSValue('300 10px sans-serif') is 'normal normal 300 10px/normal sans-serif'

-PASS computedFontCSSValue('400 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('normal 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('500 10px sans-serif') is 'normal normal 500 10px/normal sans-serif'

-PASS computedFontCSSValue('600 10px sans-serif') is 'normal normal 600 10px/normal sans-serif'

-PASS computedFontCSSValue('700 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'

-PASS computedFontCSSValue('bold 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'

-PASS computedFontCSSValue('800 10px sans-serif') is 'normal normal 800 10px/normal sans-serif'

-PASS computedFontCSSValue('900 10px sans-serif') is 'normal normal 900 10px/normal sans-serif'

-PASS computedFontCSSValue('italic 10px sans-serif') is 'italic normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('small-caps 10px sans-serif') is 'normal small-caps normal 10px/normal sans-serif'

-PASS computedFontCSSValue('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/normal sans-serif'

-PASS computedFontCSSValue('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/normal sans-serif'

</del><ins>+PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('10px SANS-SERIF') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('12px sans-serif') is 'normal normal normal 12px/14px sans-serif'

+PASS computedFontCSSValue('12px  sans-serif') is 'normal normal normal 12px/14px sans-serif'

+PASS computedFontCSSValue('10px sans-serif, sans-serif') is 'normal normal normal 10px/12px sans-serif, sans-serif'

+PASS computedFontCSSValue('10px sans-serif, serif') is 'normal normal normal 10px/12px sans-serif, serif'

+PASS computedFontCSSValue('12px ahem') is 'normal normal normal 12px/12px ahem'

+PASS computedFontCSSValue('12px unlikely-font-name') is 'normal normal normal 12px/14px unlikely-font-name'

+PASS computedFontCSSValue('100 10px sans-serif') is 'normal normal 100 10px/12px sans-serif'

+PASS computedFontCSSValue('200 10px sans-serif') is 'normal normal 200 10px/12px sans-serif'

+PASS computedFontCSSValue('300 10px sans-serif') is 'normal normal 300 10px/12px sans-serif'

+PASS computedFontCSSValue('400 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('normal 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('500 10px sans-serif') is 'normal normal 500 10px/12px sans-serif'

+PASS computedFontCSSValue('600 10px sans-serif') is 'normal normal 600 10px/12px sans-serif'

+PASS computedFontCSSValue('700 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'

+PASS computedFontCSSValue('bold 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'

+PASS computedFontCSSValue('800 10px sans-serif') is 'normal normal 800 10px/12px sans-serif'

+PASS computedFontCSSValue('900 10px sans-serif') is 'normal normal 900 10px/12px sans-serif'

+PASS computedFontCSSValue('italic 10px sans-serif') is 'italic normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('small-caps 10px sans-serif') is 'normal small-caps normal 10px/12px sans-serif'

+PASS computedFontCSSValue('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/12px sans-serif'

+PASS computedFontCSSValue('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/12px sans-serif'

</ins><span class="cx"> PASS computedFontCSSValue('10px/100% sans-serif') is 'normal normal normal 10px/10px sans-serif'

</span><span class="cx"> PASS computedFontCSSValue('10px/100px sans-serif') is 'normal normal normal 10px/100px sans-serif'

</span><del>-PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'

-PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'

</del><ins>+PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'

+PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'

</ins><span class="cx"> PASS successfullyParsed is true

</span><span class="cx"> 

</span><span class="cx"> TEST COMPLETE

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssgetComputedStylecomputedstylewithoutrendererexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -49,7 +49,7 @@

</span><span class="cx"> image-rendering: auto

</span><span class="cx"> left: auto

</span><span class="cx"> letter-spacing: normal

</span><del>-line-height: normal

</del><ins>+line-height: 18px

</ins><span class="cx"> list-style-image: none

</span><span class="cx"> list-style-position: outside

</span><span class="cx"> list-style-type: disc

</span></span></pre></div>

<a id="trunkLayoutTestsfastcssgetComputedStylescripttestscomputedstylefontjs"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -18,60 +18,60 @@

</span><span class="cx">     return cssValue.cssText;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-shouldBe(&quot;computedFont('10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('10px SANS-SERIF')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('12px sans-serif')&quot;, &quot;'normal normal normal 12px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('12px  sans-serif')&quot;, &quot;'normal normal normal 12px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('10px sans-serif, sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif, sans-serif'&quot;);

-shouldBe(&quot;computedFont('10px sans-serif, serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif, serif'&quot;);

-shouldBe(&quot;computedFont('12px ahem')&quot;, &quot;'normal normal normal 12px/normal ahem'&quot;);

-shouldBe(&quot;computedFont('12px unlikely-font-name')&quot;, &quot;'normal normal normal 12px/normal unlikely-font-name'&quot;);

-shouldBe(&quot;computedFont('100 10px sans-serif')&quot;, &quot;'normal normal 100 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('200 10px sans-serif')&quot;, &quot;'normal normal 200 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('300 10px sans-serif')&quot;, &quot;'normal normal 300 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('400 10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('normal 10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('500 10px sans-serif')&quot;, &quot;'normal normal 500 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('600 10px sans-serif')&quot;, &quot;'normal normal 600 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('700 10px sans-serif')&quot;, &quot;'normal normal bold 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('bold 10px sans-serif')&quot;, &quot;'normal normal bold 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('800 10px sans-serif')&quot;, &quot;'normal normal 800 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('900 10px sans-serif')&quot;, &quot;'normal normal 900 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('italic 10px sans-serif')&quot;, &quot;'italic normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('small-caps 10px sans-serif')&quot;, &quot;'normal small-caps normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('italic small-caps 10px sans-serif')&quot;, &quot;'italic small-caps normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('italic small-caps bold 10px sans-serif')&quot;, &quot;'italic small-caps bold 10px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedFont('10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('10px SANS-SERIF')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('12px sans-serif')&quot;, &quot;'normal normal normal 12px/14px sans-serif'&quot;);

+shouldBe(&quot;computedFont('12px  sans-serif')&quot;, &quot;'normal normal normal 12px/14px sans-serif'&quot;);

+shouldBe(&quot;computedFont('10px sans-serif, sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif, sans-serif'&quot;);

+shouldBe(&quot;computedFont('10px sans-serif, serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif, serif'&quot;);

+shouldBe(&quot;computedFont('12px ahem')&quot;, &quot;'normal normal normal 12px/12px ahem'&quot;);

+shouldBe(&quot;computedFont('12px unlikely-font-name')&quot;, &quot;'normal normal normal 12px/14px unlikely-font-name'&quot;);

+shouldBe(&quot;computedFont('100 10px sans-serif')&quot;, &quot;'normal normal 100 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('200 10px sans-serif')&quot;, &quot;'normal normal 200 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('300 10px sans-serif')&quot;, &quot;'normal normal 300 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('400 10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('normal 10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('500 10px sans-serif')&quot;, &quot;'normal normal 500 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('600 10px sans-serif')&quot;, &quot;'normal normal 600 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('700 10px sans-serif')&quot;, &quot;'normal normal bold 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('bold 10px sans-serif')&quot;, &quot;'normal normal bold 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('800 10px sans-serif')&quot;, &quot;'normal normal 800 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('900 10px sans-serif')&quot;, &quot;'normal normal 900 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('italic 10px sans-serif')&quot;, &quot;'italic normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('small-caps 10px sans-serif')&quot;, &quot;'normal small-caps normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('italic small-caps 10px sans-serif')&quot;, &quot;'italic small-caps normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('italic small-caps bold 10px sans-serif')&quot;, &quot;'italic small-caps bold 10px/12px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedFont('10px/100% sans-serif')&quot;, &quot;'normal normal normal 10px/10px sans-serif'&quot;);

</span><span class="cx"> shouldBe(&quot;computedFont('10px/100px sans-serif')&quot;, &quot;'normal normal normal 10px/100px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedFont('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFont('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedFont('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFont('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

</ins><span class="cx"> 

</span><del>-shouldBe(&quot;computedFontCSSValue('10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('10px SANS-SERIF')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('12px sans-serif')&quot;, &quot;'normal normal normal 12px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('12px  sans-serif')&quot;, &quot;'normal normal normal 12px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('10px sans-serif, sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif, sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('10px sans-serif, serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif, serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('12px ahem')&quot;, &quot;'normal normal normal 12px/normal ahem'&quot;);

-shouldBe(&quot;computedFontCSSValue('12px unlikely-font-name')&quot;, &quot;'normal normal normal 12px/normal unlikely-font-name'&quot;);

-shouldBe(&quot;computedFontCSSValue('100 10px sans-serif')&quot;, &quot;'normal normal 100 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('200 10px sans-serif')&quot;, &quot;'normal normal 200 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('300 10px sans-serif')&quot;, &quot;'normal normal 300 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('400 10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('normal 10px sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('500 10px sans-serif')&quot;, &quot;'normal normal 500 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('600 10px sans-serif')&quot;, &quot;'normal normal 600 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('700 10px sans-serif')&quot;, &quot;'normal normal bold 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('bold 10px sans-serif')&quot;, &quot;'normal normal bold 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('800 10px sans-serif')&quot;, &quot;'normal normal 800 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('900 10px sans-serif')&quot;, &quot;'normal normal 900 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('italic 10px sans-serif')&quot;, &quot;'italic normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('small-caps 10px sans-serif')&quot;, &quot;'normal small-caps normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('italic small-caps 10px sans-serif')&quot;, &quot;'italic small-caps normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('italic small-caps bold 10px sans-serif')&quot;, &quot;'italic small-caps bold 10px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedFontCSSValue('10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('10px SANS-SERIF')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('12px sans-serif')&quot;, &quot;'normal normal normal 12px/14px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('12px  sans-serif')&quot;, &quot;'normal normal normal 12px/14px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('10px sans-serif, sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif, sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('10px sans-serif, serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif, serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('12px ahem')&quot;, &quot;'normal normal normal 12px/12px ahem'&quot;);

+shouldBe(&quot;computedFontCSSValue('12px unlikely-font-name')&quot;, &quot;'normal normal normal 12px/14px unlikely-font-name'&quot;);

+shouldBe(&quot;computedFontCSSValue('100 10px sans-serif')&quot;, &quot;'normal normal 100 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('200 10px sans-serif')&quot;, &quot;'normal normal 200 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('300 10px sans-serif')&quot;, &quot;'normal normal 300 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('400 10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('normal 10px sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('500 10px sans-serif')&quot;, &quot;'normal normal 500 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('600 10px sans-serif')&quot;, &quot;'normal normal 600 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('700 10px sans-serif')&quot;, &quot;'normal normal bold 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('bold 10px sans-serif')&quot;, &quot;'normal normal bold 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('800 10px sans-serif')&quot;, &quot;'normal normal 800 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('900 10px sans-serif')&quot;, &quot;'normal normal 900 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('italic 10px sans-serif')&quot;, &quot;'italic normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('small-caps 10px sans-serif')&quot;, &quot;'normal small-caps normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('italic small-caps 10px sans-serif')&quot;, &quot;'italic small-caps normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('italic small-caps bold 10px sans-serif')&quot;, &quot;'italic small-caps bold 10px/12px sans-serif'&quot;);

</ins><span class="cx"> shouldBe(&quot;computedFontCSSValue('10px/100% sans-serif')&quot;, &quot;'normal normal normal 10px/10px sans-serif'&quot;);

</span><span class="cx"> shouldBe(&quot;computedFontCSSValue('10px/100px sans-serif')&quot;, &quot;'normal normal normal 10px/100px sans-serif'&quot;);

</span><del>-shouldBe(&quot;computedFontCSSValue('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

-shouldBe(&quot;computedFontCSSValue('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/normal sans-serif'&quot;);

</del><ins>+shouldBe(&quot;computedFontCSSValue('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

+shouldBe(&quot;computedFontCSSValue('10px/normal sans-serif')&quot;, &quot;'normal normal normal 10px/12px sans-serif'&quot;);

</ins></span></pre></div>

<a id="trunkLayoutTestsfastcsslineheighttextautosizingexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -4,7 +4,7 @@

</span><span class="cx"> 

</span><span class="cx"> 

<span class="cx"> Case without text size adjust.

</span><del>-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is &quot;normal&quot;

</del><ins>+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is &quot;23px&quot;

</ins><span class="cx"> PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size') is &quot;20px&quot;

</span><span class="cx"> testDivNoAdjust.style['line-height'] = '1.6'

</span><span class="cx"> PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is &quot;32px&quot;

</span></span></pre></div>

<a id="trunkLayoutTestsfastcsslineheighttextautosizinghtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/line-height-text-autosizing.html (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/css/line-height-text-autosizing.html        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/css/line-height-text-autosizing.html        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -20,7 +20,7 @@

</span><span class="cx"> 

</span><span class="cx"> debug(&quot;Case without text size adjust.&quot;);

</span><span class="cx"> var testDivNoAdjust = document.getElementById(&quot;testDivNoAdjust&quot;);

</span><del>-shouldBeEqualToString(&quot;window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')&quot;, &quot;normal&quot;);

</del><ins>+shouldBeEqualToString(&quot;window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')&quot;, &quot;23px&quot;);

</ins><span class="cx"> shouldBeEqualToString(&quot;window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size')&quot;, &quot;20px&quot;);

</span><span class="cx"> evalAndLog(&quot;testDivNoAdjust.style['line-height'] = '1.6'&quot;);

</span><span class="cx"> // font-size * line-height == 20px * 1.6 == 32px

</span></span></pre></div>

<a id="trunkLayoutTestsfastrubyrubylineheightexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/ruby/ruby-line-height-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/ruby/ruby-line-height-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/ruby/ruby-line-height-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -6,10 +6,10 @@

<span class="cx"> PASS [object HTMLParagraphElement] is non-null.

</span><span class="cx"> PASS getLineHeight('p') is &quot;48px&quot;

<span class="cx"> PASS [object HTMLElement] is non-null.

<del>-FAIL getLineHeight('r') should be normal. Was 48px.

</del><ins>+PASS getLineHeight('r') is &quot;48px&quot;

</ins><span class="cx"> PASS [object HTMLElement] is non-null.

</span><del>-PASS getLineHeight('t') is &quot;normal&quot;

</del><ins>+PASS getLineHeight('t') is &quot;10px&quot;

</ins><span class="cx"> PASS successfullyParsed is true

</span><span class="cx"> 

</span><span class="cx"> TEST COMPLETE

<del>-The line height of this is three times normal&quot;line-height: 48px;&quot;, but the ruby should have 'line-height: normal'.

</del><ins>+The line height of this is three times normal&quot;line-height: 48px;&quot;.

</ins></span></pre></div>

<a id="trunkLayoutTestsfastrubyscripttestsrubylineheightjs"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/ruby/script-tests/ruby-line-height.js (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/fast/ruby/script-tests/ruby-line-height.js        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/fast/ruby/script-tests/ruby-line-height.js        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -9,9 +9,9 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> var div = document.createElement(&quot;div&quot;);

</span><del>-div.innerHTML = &quot;&lt;p style='line-height: 300%' id='p'&gt;The line height of this is &lt;ruby id='r'&gt;three times normal&lt;rt id='t'&gt;&amp;quot;line-height: 48px;&amp;quot;&lt;/rt&gt;&lt;/ruby&gt;, but the ruby should have 'line-height: normal'.&lt;/p&gt;&quot;;

</del><ins>+div.innerHTML = &quot;&lt;p style='line-height: 300%' id='p'&gt;The line height of this is &lt;ruby id='r'&gt;three times normal&lt;rt id='t'&gt;&amp;quot;line-height: 48px;&amp;quot;&lt;/rt&gt;&lt;/ruby&gt;.&lt;/p&gt;&quot;;

</ins><span class="cx"> document.body.appendChild(div);

</span><span class="cx"> 

</span><span class="cx"> shouldBeEqualToString(&quot;getLineHeight('p')&quot;, &quot;48px&quot;);

</span><del>-shouldBeEqualToString(&quot;getLineHeight('r')&quot;, &quot;normal&quot;);

-shouldBeEqualToString(&quot;getLineHeight('t')&quot;, &quot;normal&quot;);

</del><ins>+shouldBeEqualToString(&quot;getLineHeight('r')&quot;, &quot;48px&quot;);

+shouldBeEqualToString(&quot;getLineHeight('t')&quot;, &quot;10px&quot;);

</ins></span></pre></div>

<a id="trunkLayoutTestsmediatracktrackcuerenderingonresizeexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -4,6 +4,6 @@

</span><span class="cx"> EVENT(seeked)

</span><span class="cx"> 

</span><span class="cx"> ** Line height of the cue element should be 'normal' **

</span><del>-EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == 'normal') OK

</del><ins>+EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == '14px') OK

</ins><span class="cx"> END OF TEST

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkLayoutTestsmediatracktrackcuerenderingonresizehtml"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -25,7 +25,7 @@

</span><span class="cx">             multiLineCueDisplayElement = textTrackDisplayElement(video, 'display', 0);

</span><span class="cx"> 

</span><span class="cx">             consoleWrite(&quot;&lt;br&gt;** Line height of the cue element should be 'normal' **&quot;);

</span><del>-            testExpected(&quot;getComputedStyle(multiLineCueDisplayElement).lineHeight&quot;, &quot;normal&quot;);

</del><ins>+            testExpected(&quot;getComputedStyle(multiLineCueDisplayElement).lineHeight&quot;, &quot;14px&quot;);

</ins><span class="cx"> 

</span><span class="cx">             endTest();

</span><span class="cx">         }

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmaceditingattributedstringanchorelementexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/anchor-element-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/editing/attributed-string/anchor-element-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/platform/mac/editing/attributed-string/anchor-element-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -10,7 +10,7 @@

</span><span class="cx">     HeadIndent: 0

</span><span class="cx">     TailIndent: 0

</span><span class="cx">     FirstLineHeadIndent: 0

</span><del>-    LineHeight: 0/0

</del><ins>+    LineHeight: 18/0

</ins><span class="cx">     LineHeightMultiple: 0

</span><span class="cx">     LineBreakMode: 0

</span><span class="cx">     Tabs: ()

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmaceditingattributedstringbasicexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/basic-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/editing/attributed-string/basic-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/platform/mac/editing/attributed-string/basic-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -11,7 +11,7 @@

</span><span class="cx">     HeadIndent: 0

</span><span class="cx">     TailIndent: 0

</span><span class="cx">     FirstLineHeadIndent: 0

</span><del>-    LineHeight: 0/0

</del><ins>+    LineHeight: 18/0

</ins><span class="cx">     LineHeightMultiple: 0

</span><span class="cx">     LineBreakMode: 0

</span><span class="cx">     Tabs: ()

</span></span></pre></div>

<a id="trunkLayoutTestsplatformmaceditingattributedstringfontsizeexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/font-size-expected.txt (179167 => 179168)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/platform/mac/editing/attributed-string/font-size-expected.txt        2015-01-27 06:04:43 UTC (rev 179167)

+++ trunk/LayoutTests/platform/mac/editing/attributed-string/font-size-expected.txt        2015-01-27 06:12:40 UTC (rev 179168)

</span><span class="lines">@@ -19,7 +19,7 @@

</span><span class="cx">     HeadIndent: 0

</span><span class="cx">     TailIndent: 0

</span><span class="cx">     FirstLineHeadIndent: 0

</span><del>-    LineHeight: 0/0

</del><ins>+    LineHeight: 15/0

</ins><span class="cx">     LineHeightMultiple: 0

</span><span class="cx">     LineBreakMode: 0

</span><span class="cx">     Tabs: ()

</span><span class="lines">@@ -31,111 +31,362 @@

</span><span class="cx">     TighteningFactor: 0.05

</span><span class="cx">     HeaderLevel: 0

</span><span class="cx"> [small element]

</span><del>-    NSColor: #000000 (NSDeviceRGBColorSpace)

</del><span class="cx">     NSFont: Times-Roman 13.00 pt.

</span><del>-    NSKern: 0pt

-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

-    NSStrokeWidth: 0

</del><ins>+NSParagraphStyle:

+Alignment 4

+    LineSpacing: 0

+    ParagraphSpacing: 0

+    ParagraphSpacingBefore: 0

+    HeadIndent: 0

+    TailIndent: 0

+    FirstLineHeadIndent: 0

+    LineHeight: 18/0

+    LineHeightMultiple: 0

+    LineBreakMode: 0

+    Tabs: ()

+    DefaultTabInterval: 36

+    Blocks: (null)

+    Lists: (null)

+    BaseWritingDirection: 0

+    HyphenationFactor: 0

+    TighteningFactor: 0.05

+    HeaderLevel: 0

</ins><span class="cx"> [ ]

</span><del>-    NSColor: #000000 (NSDeviceRGBColorSpace)