[webkit-changes] [179168] trunk

Mon, 26 Jan 2015 22:13:15 -0800

Title: [179168] trunk
Revision
179168
Author
[email protected]
Date
2015-01-26 22:12:40 -0800 (Mon, 26 Jan 2015)

Log Message

The computed value of line-height:normal is incorrect
https://bugs.webkit.org/show_bug.cgi?id=133744

Patch by Sylvain Galineau <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (179167 => 179168)


--- trunk/LayoutTests/ChangeLog	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/ChangeLog	2015-01-27 06:12:40 UTC (rev 179168)
@@ -1,3 +1,47 @@
+2015-01-26  Sylvain Galineau  <[email protected]>
+
+        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:
+
 2015-01-26  Brent Fulgham  <[email protected]>
 
         [Win] Windows gardening (removing more skips).

Modified: trunk/LayoutTests/css3/calc/line-height-expected.txt (179167 => 179168)


--- 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)
@@ -4,7 +4,7 @@
 
 
 PASS getComputedStyle(document.getElementById("calc-percent"), null).lineHeight is getComputedStyle(document.getElementById("control"), null).lineHeight
-FAIL getComputedStyle(document.getElementById("calc-percent-pixels"), null).lineHeight should be 32px. Was normal.
+FAIL getComputedStyle(document.getElementById("calc-percent-pixels"), null).lineHeight should be 32px. Was 18px.
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt (179167 => 179168)


--- 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)
@@ -33,7 +33,7 @@
 |   face="Verdana"
 |   "hello "
 | <br>
-|   style="font-family: Helvetica;"
+|   style="font-family: Helvetica; line-height: 18px;"
 | <font>
 |   face="Verdana"
 |   "worldWebKit<#selection-caret>"

Modified: trunk/LayoutTests/fast/css/font-calculated-value-expected.txt (179167 => 179168)


--- 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)
@@ -6,7 +6,7 @@
 PASS testDiv.style['font'] is ""
 testDiv.style['font'] = 'italic small-caps calc(100 * 9) 12px arial'
 PASS testDiv.style['font'] is "italic small-caps 900 12px arial"
-PASS window.getComputedStyle(testDiv).getPropertyValue('font') is "italic small-caps 900 12px/normal arial"
+PASS window.getComputedStyle(testDiv).getPropertyValue('font') is "italic small-caps 900 12px/14px arial"
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/css/font-calculated-value.html (179167 => 179168)


--- 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)
@@ -10,7 +10,7 @@
 shouldBeEmptyString("testDiv.style['font']");
 evalAndLog("testDiv.style['font'] = 'italic small-caps calc(100 * 9) 12px arial'");
 shouldBeEqualToString("testDiv.style['font']", "italic small-caps 900 12px arial");
-shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('font')", "italic small-caps 900 12px/normal arial");
+shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('font')", "italic small-caps 900 12px/14px arial");
 
 </script>
 <script src=""

Modified: trunk/LayoutTests/fast/css/font-shorthand-from-longhands-expected.txt (179167 => 179168)


--- 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)
@@ -4,23 +4,23 @@
 
 
 PASS style.font is ''
-PASS computedStyle.font is 'normal normal normal 20px/normal foobar'
+PASS computedStyle.font is 'normal normal normal 20px/23px foobar'
 PASS computedStyle.fontSize is '20px'
 PASS checkFontStyleValue() is true
 PASS style.font is '20px sans-serif'
-PASS computedStyle.font is 'normal normal normal 20px/normal sans-serif'
+PASS computedStyle.font is 'normal normal normal 20px/23px sans-serif'
 PASS computedStyle.fontFamily is 'sans-serif'
 PASS checkFontStyleValue() is true
 PASS style.font is 'italic 20px sans-serif'
-PASS computedStyle.font is 'italic normal normal 20px/normal sans-serif'
+PASS computedStyle.font is 'italic normal normal 20px/23px sans-serif'
 PASS computedStyle.fontStyle is 'italic'
 PASS checkFontStyleValue() is true
 PASS style.font is 'italic small-caps 20px sans-serif'
-PASS computedStyle.font is 'italic small-caps normal 20px/normal sans-serif'
+PASS computedStyle.font is 'italic small-caps normal 20px/23px sans-serif'
 PASS computedStyle.fontVariant is 'small-caps'
 PASS checkFontStyleValue() is true
 PASS style.font is 'italic small-caps bold 20px sans-serif'
-PASS computedStyle.font is 'italic small-caps bold 20px/normal sans-serif'
+PASS computedStyle.font is 'italic small-caps bold 20px/23px sans-serif'
 PASS computedStyle.fontWeight is 'bold'
 PASS checkFontStyleValue() is true
 PASS style.font is 'italic small-caps bold 20px/40px sans-serif'
@@ -28,14 +28,14 @@
 PASS computedStyle.lineHeight is '40px'
 PASS checkFontStyleValue() is true
 PASS style.font is ''
-PASS computedStyle.font is 'normal normal normal 16px/normal foobar'
+PASS computedStyle.font is 'normal normal normal 16px/18px foobar'
 PASS checkFontStyleValue() is true
 PASS style.font is ''
-PASS computedStyle.font is 'normal normal bold 16px/normal foobar'
+PASS computedStyle.font is 'normal normal bold 16px/18px foobar'
 PASS computedStyle.fontWeight is 'bold'
 PASS checkFontStyleValue() is true
 PASS style.font is 'bold 40px sans-serif'
-PASS computedStyle.font is 'normal normal bold 40px/normal sans-serif'
+PASS computedStyle.font is 'normal normal bold 40px/46px sans-serif'
 PASS computedStyle.fontSize is '40px'
 PASS computedStyle.fontFamily is 'sans-serif'
 PASS checkFontStyleValue() is true

Modified: trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html (179167 => 179168)


--- 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)
@@ -36,32 +36,32 @@
 style.fontSize = "20px";
 // We need at least the font-family to build the shorthand.
 shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'normal normal normal 20px/normal foobar'");
+shouldBe("computedStyle.font", "'normal normal normal 20px/23px foobar'");
 shouldBe("computedStyle.fontSize", "'20px'");
 shouldBe("checkFontStyleValue()", "true");
 
 style.fontSize = "20px";
 style.fontFamily = "sans-serif";
 shouldBe("style.font", "'20px sans-serif'");
-shouldBe("computedStyle.font", "'normal normal normal 20px/normal sans-serif'");
+shouldBe("computedStyle.font", "'normal normal normal 20px/23px sans-serif'");
 shouldBe("computedStyle.fontFamily", "'sans-serif'");
 shouldBe("checkFontStyleValue()", "true");
 
 style.fontStyle = "italic";
 shouldBe("style.font", "'italic 20px sans-serif'");
-shouldBe("computedStyle.font", "'italic normal normal 20px/normal sans-serif'");
+shouldBe("computedStyle.font", "'italic normal normal 20px/23px sans-serif'");
 shouldBe("computedStyle.fontStyle", "'italic'");
 shouldBe("checkFontStyleValue()", "true");
 
 style.fontVariant = "small-caps";
 shouldBe("style.font", "'italic small-caps 20px sans-serif'");
-shouldBe("computedStyle.font", "'italic small-caps normal 20px/normal sans-serif'");
+shouldBe("computedStyle.font", "'italic small-caps normal 20px/23px sans-serif'");
 shouldBe("computedStyle.fontVariant", "'small-caps'");
 shouldBe("checkFontStyleValue()", "true");
 
 style.fontWeight = "bold";
 shouldBe("style.font", "'italic small-caps bold 20px sans-serif'");
-shouldBe("computedStyle.font", "'italic small-caps bold 20px/normal sans-serif'");
+shouldBe("computedStyle.font", "'italic small-caps bold 20px/23px sans-serif'");
 shouldBe("computedStyle.fontWeight", "'bold'");
 shouldBe("checkFontStyleValue()", "true");
 
@@ -73,13 +73,13 @@
 
 style.font = "";
 shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'normal normal normal 16px/normal foobar'");
+shouldBe("computedStyle.font", "'normal normal normal 16px/18px foobar'");
 shouldBe("checkFontStyleValue()", "true");
 
 style.fontWeight = "bold";
 // It is normal to return null as the font-size is mandatory to build the shorthand.
 shouldBe("style.font", "''");
-shouldBe("computedStyle.font", "'normal normal bold 16px/normal foobar'");
+shouldBe("computedStyle.font", "'normal normal bold 16px/18px foobar'");
 shouldBe("computedStyle.fontWeight", "'bold'");
 shouldBe("checkFontStyleValue()", "true");
 
@@ -87,7 +87,7 @@
 style.fontFamily = "sans-serif";
 style.fontWeight = "bold";
 shouldBe("style.font", "'bold 40px sans-serif'");
-shouldBe("computedStyle.font", "'normal normal bold 40px/normal sans-serif'");
+shouldBe("computedStyle.font", "'normal normal bold 40px/46px sans-serif'");
 shouldBe("computedStyle.fontSize", "'40px'");
 shouldBe("computedStyle.fontFamily", "'sans-serif'");
 shouldBe("checkFontStyleValue()", "true");

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt (179167 => 179168)


--- 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)
@@ -50,7 +50,7 @@
 image-rendering: auto;
 left: auto;
 letter-spacing: normal;
-line-height: normal;
+line-height: 18px;
 list-style-image: none;
 list-style-position: outside;
 list-style-type: disc;

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-expected.txt (179167 => 179168)


--- 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)
@@ -3,62 +3,62 @@
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-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'
+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'
 PASS computedFont('10px/100% sans-serif') is 'normal normal normal 10px/10px sans-serif'
 PASS computedFont('10px/100px sans-serif') is 'normal normal normal 10px/100px sans-serif'
-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'
+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'
 PASS computedFontCSSValue('10px/100% sans-serif') is 'normal normal normal 10px/10px sans-serif'
 PASS computedFontCSSValue('10px/100px sans-serif') is 'normal normal normal 10px/100px sans-serif'
-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'
+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'
 PASS successfullyParsed is true
 
 TEST COMPLETE

Modified: trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt (179167 => 179168)


--- 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)
@@ -49,7 +49,7 @@
 image-rendering: auto
 left: auto
 letter-spacing: normal
-line-height: normal
+line-height: 18px
 list-style-image: none
 list-style-position: outside
 list-style-type: disc

Modified: trunk/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js (179167 => 179168)


--- 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)
@@ -18,60 +18,60 @@
     return cssValue.cssText;
 }
 
-shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFont('12px  sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal 10px/normal sans-serif, sans-serif'");
-shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal 10px/normal sans-serif, serif'");
-shouldBe("computedFont('12px ahem')", "'normal normal normal 12px/normal ahem'");
-shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal 12px/normal unlikely-font-name'");
-shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 10px/normal sans-serif'");
-shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 10px/normal sans-serif'");
-shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 10px/normal sans-serif'");
-shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 10px/normal sans-serif'");
-shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 10px/normal sans-serif'");
-shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 10px/normal sans-serif'");
-shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 10px/normal sans-serif'");
-shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/normal sans-serif'");
+shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('12px sans-serif')", "'normal normal normal 12px/14px sans-serif'");
+shouldBe("computedFont('12px  sans-serif')", "'normal normal normal 12px/14px sans-serif'");
+shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal 10px/12px sans-serif, sans-serif'");
+shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal 10px/12px sans-serif, serif'");
+shouldBe("computedFont('12px ahem')", "'normal normal normal 12px/12px ahem'");
+shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal 12px/14px unlikely-font-name'");
+shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 10px/12px sans-serif'");
+shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 10px/12px sans-serif'");
+shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 10px/12px sans-serif'");
+shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 10px/12px sans-serif'");
+shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 10px/12px sans-serif'");
+shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
+shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
+shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 10px/12px sans-serif'");
+shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 10px/12px sans-serif'");
+shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal 10px/12px sans-serif'");
+shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/12px sans-serif'");
+shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/12px sans-serif'");
 shouldBe("computedFont('10px/100% sans-serif')", "'normal normal normal 10px/10px sans-serif'");
 shouldBe("computedFont('10px/100px sans-serif')", "'normal normal normal 10px/100px sans-serif'");
-shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");
 
-shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFontCSSValue('12px  sans-serif')", "'normal normal normal 12px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal 10px/normal sans-serif, sans-serif'");
-shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal 10px/normal sans-serif, serif'");
-shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal 12px/normal ahem'");
-shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal 12px/normal unlikely-font-name'");
-shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal 12px/14px sans-serif'");
+shouldBe("computedFontCSSValue('12px  sans-serif')", "'normal normal normal 12px/14px sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal 10px/12px sans-serif, sans-serif'");
+shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal 10px/12px sans-serif, serif'");
+shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal 12px/12px ahem'");
+shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal 12px/14px unlikely-font-name'");
+shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/12px sans-serif'");
 shouldBe("computedFontCSSValue('10px/100% sans-serif')", "'normal normal normal 10px/10px sans-serif'");
 shouldBe("computedFontCSSValue('10px/100px sans-serif')", "'normal normal normal 10px/100px sans-serif'");
-shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
-shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
+shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");
+shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");

Modified: trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt (179167 => 179168)


--- 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)
@@ -4,7 +4,7 @@
 
 
 Case without text size adjust.
-PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "normal"
+PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "23px"
 PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size') is "20px"
 testDivNoAdjust.style['line-height'] = '1.6'
 PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "32px"

Modified: trunk/LayoutTests/fast/css/line-height-text-autosizing.html (179167 => 179168)


--- 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)
@@ -20,7 +20,7 @@
 
 debug("Case without text size adjust.");
 var testDivNoAdjust = document.getElementById("testDivNoAdjust");
-shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "normal");
+shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "23px");
 shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size')", "20px");
 evalAndLog("testDivNoAdjust.style['line-height'] = '1.6'");
 // font-size * line-height == 20px * 1.6 == 32px

Modified: trunk/LayoutTests/fast/ruby/ruby-line-height-expected.txt (179167 => 179168)


--- 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)
@@ -6,10 +6,10 @@
 PASS [object HTMLParagraphElement] is non-null.
 PASS getLineHeight('p') is "48px"
 PASS [object HTMLElement] is non-null.
-FAIL getLineHeight('r') should be normal. Was 48px.
+PASS getLineHeight('r') is "48px"
 PASS [object HTMLElement] is non-null.
-PASS getLineHeight('t') is "normal"
+PASS getLineHeight('t') is "10px"
 PASS successfullyParsed is true
 
 TEST COMPLETE
-The line height of this is three times normal"line-height: 48px;", but the ruby should have 'line-height: normal'.
+The line height of this is three times normal"line-height: 48px;".

Modified: trunk/LayoutTests/fast/ruby/script-tests/ruby-line-height.js (179167 => 179168)


--- 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)
@@ -9,9 +9,9 @@
 }
 
 var div = document.createElement("div");
-div.innerHTML = "<p style='line-height: 300%' id='p'>The line height of this is <ruby id='r'>three times normal<rt id='t'>&quot;line-height: 48px;&quot;</rt></ruby>, but the ruby should have 'line-height: normal'.</p>";
+div.innerHTML = "<p style='line-height: 300%' id='p'>The line height of this is <ruby id='r'>three times normal<rt id='t'>&quot;line-height: 48px;&quot;</rt></ruby>.</p>";
 document.body.appendChild(div);
 
 shouldBeEqualToString("getLineHeight('p')", "48px");
-shouldBeEqualToString("getLineHeight('r')", "normal");
-shouldBeEqualToString("getLineHeight('t')", "normal");
+shouldBeEqualToString("getLineHeight('r')", "48px");
+shouldBeEqualToString("getLineHeight('t')", "10px");

Modified: trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt (179167 => 179168)


--- 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)
@@ -4,6 +4,6 @@
 EVENT(seeked)
 
 ** Line height of the cue element should be 'normal' **
-EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == 'normal') OK
+EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == '14px') OK
 END OF TEST

Modified: trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html (179167 => 179168)


--- 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)
@@ -25,7 +25,7 @@
             multiLineCueDisplayElement = textTrackDisplayElement(video, 'display', 0);
 
             consoleWrite("<br>** Line height of the cue element should be 'normal' **");
-            testExpected("getComputedStyle(multiLineCueDisplayElement).lineHeight", "normal");
+            testExpected("getComputedStyle(multiLineCueDisplayElement).lineHeight", "14px");
 
             endTest();
         }

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/anchor-element-expected.txt (179167 => 179168)


--- 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)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/basic-expected.txt (179167 => 179168)


--- 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)
@@ -11,7 +11,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/font-size-expected.txt (179167 => 179168)


--- 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)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 15/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -31,111 +31,362 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [small element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 10/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [xx-small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 9.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 13/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [x-small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 10.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 15/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ normal ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 22/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 18.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 28/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [x-large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 24.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 37/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [xx-large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 32.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 8/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [5pt]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 7.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 23/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [15pt]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 20.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/font-weight-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac/editing/attributed-string/font-weight-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac/editing/attributed-string/font-weight-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/letter-spacing-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac/editing/attributed-string/letter-spacing-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac/editing/attributed-string/letter-spacing-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/text-decorations-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac/editing/attributed-string/text-decorations-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac/editing/attributed-string/text-decorations-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -12,7 +12,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac/editing/attributed-string/vertical-align-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac/editing/attributed-string/vertical-align-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac/editing/attributed-string/vertical-align-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 15/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -26,55 +26,80 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [sup element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
     NSSuperScript: 1
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 15/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [sub element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
     NSSuperScript: -1
+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
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
 [vertical align super]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
     NSSuperScript: 1
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
 [vertical align sub]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0
     NSSuperScript: -1
 [ vertical align 50% ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
-    NSKern: 0pt
-    NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
-    NSStrokeWidth: 0

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -11,7 +11,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 15/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -32,38 +32,361 @@
     HeaderLevel: 0
 [small element]
     NSFont: Times-Roman 13.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 10/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [xx-small]
     NSFont: Times-Roman 9.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 13/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [x-small]
     NSFont: Times-Roman 10.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 15/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [small]
     NSFont: Times-Roman 13.00 pt.
+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
 [ normal ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 22/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [large]
     NSFont: Times-Roman 18.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 28/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [x-large]
     NSFont: Times-Roman 24.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 37/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [xx-large]
     NSFont: Times-Roman 32.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 8/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [5pt]
     NSFont: Times-Roman 7.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 23/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [15pt]
     NSFont: Times-Roman 20.00 pt.
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -12,7 +12,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 18/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()

Modified: trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt (179167 => 179168)


--- trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 0/0
+    LineHeight: 15/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -28,11 +28,68 @@
 [sup element]
     NSFont: Times-Roman 13.00 pt.
     NSSuperScript: 1
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
+NSParagraphStyle:
+Alignment 4
+    LineSpacing: 0
+    ParagraphSpacing: 0
+    ParagraphSpacingBefore: 0
+    HeadIndent: 0
+    TailIndent: 0
+    FirstLineHeadIndent: 0
+    LineHeight: 15/0
+    LineHeightMultiple: 0
+    LineBreakMode: 0
+    Tabs: ()
+    DefaultTabInterval: 36
+    Blocks: (null)
+    Lists: (null)
+    BaseWritingDirection: 0
+    HyphenationFactor: 0
+    TighteningFactor: 0.05
+    HeaderLevel: 0
 [sub element]
     NSFont: Times-Roman 13.00 pt.
     NSSuperScript: -1
+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
 [ ]
     NSFont: Times-Roman 16.00 pt.
 [vertical align super]

Modified: trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt (179167 => 179168)


--- trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt	2015-01-27 06:12:40 UTC (rev 179168)
@@ -98,7 +98,7 @@
 rect: style.getPropertyCSSValue(left) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(letter-spacing) : normal
 rect: style.getPropertyCSSValue(letter-spacing) : [object CSSPrimitiveValue]
-rect: style.getPropertyValue(line-height) : normal
+rect: style.getPropertyValue(line-height) : 18px
 rect: style.getPropertyCSSValue(line-height) : [object CSSPrimitiveValue]
 rect: style.getPropertyValue(list-style-image) : none
 rect: style.getPropertyCSSValue(list-style-image) : [object CSSPrimitiveValue]
@@ -610,7 +610,7 @@
 g: style.getPropertyCSSValue(left) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(letter-spacing) : normal
 g: style.getPropertyCSSValue(letter-spacing) : [object CSSPrimitiveValue]
-g: style.getPropertyValue(line-height) : normal
+g: style.getPropertyValue(line-height) : 18px
 g: style.getPropertyCSSValue(line-height) : [object CSSPrimitiveValue]
 g: style.getPropertyValue(list-style-image) : none
 g: style.getPropertyCSSValue(list-style-image) : [object CSSPrimitiveValue]

Modified: trunk/Source/WebCore/ChangeLog (179167 => 179168)


--- trunk/Source/WebCore/ChangeLog	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/Source/WebCore/ChangeLog	2015-01-27 06:12:40 UTC (rev 179168)
@@ -1,3 +1,18 @@
+2015-01-26  Sylvain Galineau  <[email protected]>
+
+        The computed value of line-height:normal is incorrect
+        https://bugs.webkit.org/show_bug.cgi?id=133744
+
+        Reviewed by Dean Jackson.
+
+        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).
+
 2015-01-26  Chris Dumez  <[email protected]>
 
         Document.dir should reflect the 'dir' attribute of the root html element

Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (179167 => 179168)


--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2015-01-27 06:04:43 UTC (rev 179167)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp	2015-01-27 06:12:40 UTC (rev 179168)
@@ -1512,8 +1512,8 @@
 static Ref<CSSPrimitiveValue> lineHeightFromStyle(RenderStyle* style)
 {
     Length length = style->lineHeight();
-    if (length.isNegative())
-        return cssValuePool().createIdentifierValue(CSSValueNormal);
+    if (length.isNegative()) // If true, line-height not set; use the font's line spacing.
+        return zoomAdjustedPixelValue(style->fontMetrics().floatLineSpacing(), style);
     if (length.isPercentNotCalculated()) {
         // This is imperfect, because it doesn't include the zoom factor and the real computation
         // for how high to be in pixels does include things like minimum font size and the zoom factor.

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to