Changeset 179168 in webkit


Ignore:
Timestamp:
Jan 26, 2015 10:12:40 PM (9 years ago)
Author:
dino@apple.com
Message:

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

Patch by Sylvain Galineau <​galineau@adobe.com> 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:
Location:
trunk
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r179167 r179168  
     12015-01-26  Sylvain Galineau  <galineau@adobe.com>
     2
     3        The computed value of line-height:normal is incorrect
     4        https://bugs.webkit.org/show_bug.cgi?id=133744
     5
     6        Reviewed by Dean Jackson.
     7
     8        line-height:normal now computes to a length value.
     9        This patch updates the tests to reflect the new computed value, as needed.
     10
     11        * css3/calc/line-height-expected.txt:
     12        * editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt:
     13        * fast/css/font-calculated-value-expected.txt:
     14        * fast/css/font-calculated-value.html:
     15        * fast/css/font-shorthand-from-longhands-expected.txt:
     16        * fast/css/font-shorthand-from-longhands.html:
     17        * fast/css/getComputedStyle/computed-style-expected.txt:
     18        * fast/css/getComputedStyle/computed-style-font-expected.txt:
     19        * fast/css/getComputedStyle/computed-style-without-renderer-expected.txt:
     20        * fast/css/getComputedStyle/script-tests/computed-style-font.js:
     21        * fast/css/line-height-text-autosizing-expected.txt:
     22        * fast/css/line-height-text-autosizing.html:
     23        * fast/ruby/ruby-line-height-expected.txt:
     24        * fast/ruby/script-tests/ruby-line-height.js:
     25        * media/track/track-cue-rendering-on-resize-expected.txt:
     26        * media/track/track-cue-rendering-on-resize.html:
     27        * platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt:
     28        * platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt:
     29        * platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt:
     30        * platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt:
     31        * platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt:
     32        * platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt:
     33        * platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt:
     34        * platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt:
     35        * platform/mac/editing/attributed-string/anchor-element-expected.txt:
     36        * platform/mac/editing/attributed-string/basic-expected.txt:
     37        * platform/mac/editing/attributed-string/font-size-expected.txt:
     38        * platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt:
     39        * platform/mac/editing/attributed-string/font-weight-expected.txt:
     40        * platform/mac/editing/attributed-string/letter-spacing-expected.txt:
     41        * platform/mac/editing/attributed-string/text-decorations-expected.txt:
     42        * platform/mac/editing/attributed-string/vertical-align-expected.txt:
     43        * svg/css/getComputedStyle-basic-expected.txt:
     44
    1452015-01-26  Brent Fulgham  <bfulgham@apple.com>
    246

  • trunk/LayoutTests/css3/calc/line-height-expected.txt

    r107688 r179168  
    55
    66PASS getComputedStyle(document.getElementById("calc-percent"), null).lineHeight is getComputedStyle(document.getElementById("control"), null).lineHeight
    7 FAIL getComputedStyle(document.getElementById("calc-percent-pixels"), null).lineHeight should be 32px. Was normal.
     7FAIL getComputedStyle(document.getElementById("calc-percent-pixels"), null).lineHeight should be 32px. Was 18px.
    88PASS successfullyParsed is true
    99

  • trunk/LayoutTests/editing/pasteboard/simplfiying-markup-should-not-strip-content-expected.txt

    r152185 r179168  
    3434|   "hello "
    3535| <br>
    36 |   style="font-family: Helvetica;"
     36|   style="font-family: Helvetica; line-height: 18px;"
    3737| <font>
    3838|   face="Verdana"

  • trunk/LayoutTests/fast/css/font-calculated-value-expected.txt

    r176454 r179168  
    77testDiv.style['font'] = 'italic small-caps calc(100 * 9) 12px arial'
    88PASS testDiv.style['font'] is "italic small-caps 900 12px arial"
    9 PASS window.getComputedStyle(testDiv).getPropertyValue('font') is "italic small-caps 900 12px/normal arial"
     9PASS window.getComputedStyle(testDiv).getPropertyValue('font') is "italic small-caps 900 12px/14px arial"
    1010PASS successfullyParsed is true
    1111

  • trunk/LayoutTests/fast/css/font-calculated-value.html

    r176454 r179168  
    1111evalAndLog("testDiv.style['font'] = 'italic small-caps calc(100 * 9) 12px arial'");
    1212shouldBeEqualToString("testDiv.style['font']", "italic small-caps 900 12px arial");
    13 shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('font')", "italic small-caps 900 12px/normal arial");
     13shouldBeEqualToString("window.getComputedStyle(testDiv).getPropertyValue('font')", "italic small-caps 900 12px/14px arial");
    1414
    1515</script>

  • trunk/LayoutTests/fast/css/font-shorthand-from-longhands-expected.txt

    r139313 r179168  
    55
    66PASS style.font is ''
    7 PASS computedStyle.font is 'normal normal normal 20px/normal foobar'
     7PASS computedStyle.font is 'normal normal normal 20px/23px foobar'
    88PASS computedStyle.fontSize is '20px'
    99PASS checkFontStyleValue() is true
    1010PASS style.font is '20px sans-serif'
    11 PASS computedStyle.font is 'normal normal normal 20px/normal sans-serif'
     11PASS computedStyle.font is 'normal normal normal 20px/23px sans-serif'
    1212PASS computedStyle.fontFamily is 'sans-serif'
    1313PASS checkFontStyleValue() is true
    1414PASS style.font is 'italic 20px sans-serif'
    15 PASS computedStyle.font is 'italic normal normal 20px/normal sans-serif'
     15PASS computedStyle.font is 'italic normal normal 20px/23px sans-serif'
    1616PASS computedStyle.fontStyle is 'italic'
    1717PASS checkFontStyleValue() is true
    1818PASS style.font is 'italic small-caps 20px sans-serif'
    19 PASS computedStyle.font is 'italic small-caps normal 20px/normal sans-serif'
     19PASS computedStyle.font is 'italic small-caps normal 20px/23px sans-serif'
    2020PASS computedStyle.fontVariant is 'small-caps'
    2121PASS checkFontStyleValue() is true
    2222PASS style.font is 'italic small-caps bold 20px sans-serif'
    23 PASS computedStyle.font is 'italic small-caps bold 20px/normal sans-serif'
     23PASS computedStyle.font is 'italic small-caps bold 20px/23px sans-serif'
    2424PASS computedStyle.fontWeight is 'bold'
    2525PASS checkFontStyleValue() is true
    … …  
    2929PASS checkFontStyleValue() is true
    3030PASS style.font is ''
    31 PASS computedStyle.font is 'normal normal normal 16px/normal foobar'
     31PASS computedStyle.font is 'normal normal normal 16px/18px foobar'
    3232PASS checkFontStyleValue() is true
    3333PASS style.font is ''
    34 PASS computedStyle.font is 'normal normal bold 16px/normal foobar'
     34PASS computedStyle.font is 'normal normal bold 16px/18px foobar'
    3535PASS computedStyle.fontWeight is 'bold'
    3636PASS checkFontStyleValue() is true
    3737PASS style.font is 'bold 40px sans-serif'
    38 PASS computedStyle.font is 'normal normal bold 40px/normal sans-serif'
     38PASS computedStyle.font is 'normal normal bold 40px/46px sans-serif'
    3939PASS computedStyle.fontSize is '40px'
    4040PASS computedStyle.fontFamily is 'sans-serif'

  • trunk/LayoutTests/fast/css/font-shorthand-from-longhands.html

    r155263 r179168  
    3737// We need at least the font-family to build the shorthand.
    3838shouldBe("style.font", "''");
    39 shouldBe("computedStyle.font", "'normal normal normal 20px/normal foobar'");
     39shouldBe("computedStyle.font", "'normal normal normal 20px/23px foobar'");
    4040shouldBe("computedStyle.fontSize", "'20px'");
    4141shouldBe("checkFontStyleValue()", "true");
    … …  
    4444style.fontFamily = "sans-serif";
    4545shouldBe("style.font", "'20px sans-serif'");
    46 shouldBe("computedStyle.font", "'normal normal normal 20px/normal sans-serif'");
     46shouldBe("computedStyle.font", "'normal normal normal 20px/23px sans-serif'");
    4747shouldBe("computedStyle.fontFamily", "'sans-serif'");
    4848shouldBe("checkFontStyleValue()", "true");
    … …  
    5050style.fontStyle = "italic";
    5151shouldBe("style.font", "'italic 20px sans-serif'");
    52 shouldBe("computedStyle.font", "'italic normal normal 20px/normal sans-serif'");
     52shouldBe("computedStyle.font", "'italic normal normal 20px/23px sans-serif'");
    5353shouldBe("computedStyle.fontStyle", "'italic'");
    5454shouldBe("checkFontStyleValue()", "true");
    … …  
    5656style.fontVariant = "small-caps";
    5757shouldBe("style.font", "'italic small-caps 20px sans-serif'");
    58 shouldBe("computedStyle.font", "'italic small-caps normal 20px/normal sans-serif'");
     58shouldBe("computedStyle.font", "'italic small-caps normal 20px/23px sans-serif'");
    5959shouldBe("computedStyle.fontVariant", "'small-caps'");
    6060shouldBe("checkFontStyleValue()", "true");
    … …  
    6262style.fontWeight = "bold";
    6363shouldBe("style.font", "'italic small-caps bold 20px sans-serif'");
    64 shouldBe("computedStyle.font", "'italic small-caps bold 20px/normal sans-serif'");
     64shouldBe("computedStyle.font", "'italic small-caps bold 20px/23px sans-serif'");
    6565shouldBe("computedStyle.fontWeight", "'bold'");
    6666shouldBe("checkFontStyleValue()", "true");
    … …  
    7474style.font = "";
    7575shouldBe("style.font", "''");
    76 shouldBe("computedStyle.font", "'normal normal normal 16px/normal foobar'");
     76shouldBe("computedStyle.font", "'normal normal normal 16px/18px foobar'");
    7777shouldBe("checkFontStyleValue()", "true");
    7878
    … …  
    8080// It is normal to return null as the font-size is mandatory to build the shorthand.
    8181shouldBe("style.font", "''");
    82 shouldBe("computedStyle.font", "'normal normal bold 16px/normal foobar'");
     82shouldBe("computedStyle.font", "'normal normal bold 16px/18px foobar'");
    8383shouldBe("computedStyle.fontWeight", "'bold'");
    8484shouldBe("checkFontStyleValue()", "true");
    … …  
    8888style.fontWeight = "bold";
    8989shouldBe("style.font", "'bold 40px sans-serif'");
    90 shouldBe("computedStyle.font", "'normal normal bold 40px/normal sans-serif'");
     90shouldBe("computedStyle.font", "'normal normal bold 40px/46px sans-serif'");
    9191shouldBe("computedStyle.fontSize", "'40px'");
    9292shouldBe("computedStyle.fontFamily", "'sans-serif'");

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-expected.txt

    r176258 r179168  
    5151left: auto;
    5252letter-spacing: normal;
    53 line-height: normal;
     53line-height: 18px;
    5454list-style-image: none;
    5555list-style-position: outside;

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-font-expected.txt

    r95714 r179168  
    44
    55
    6 PASS computedFont('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    7 PASS computedFont('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    8 PASS computedFont('10px SANS-SERIF') is 'normal normal normal 10px/normal sans-serif'
    9 PASS computedFont('12px sans-serif') is 'normal normal normal 12px/normal sans-serif'
    10 PASS computedFont('12px  sans-serif') is 'normal normal normal 12px/normal sans-serif'
    11 PASS computedFont('10px sans-serif, sans-serif') is 'normal normal normal 10px/normal sans-serif, sans-serif'
    12 PASS computedFont('10px sans-serif, serif') is 'normal normal normal 10px/normal sans-serif, serif'
    13 PASS computedFont('12px ahem') is 'normal normal normal 12px/normal ahem'
    14 PASS computedFont('12px unlikely-font-name') is 'normal normal normal 12px/normal unlikely-font-name'
    15 PASS computedFont('100 10px sans-serif') is 'normal normal 100 10px/normal sans-serif'
    16 PASS computedFont('200 10px sans-serif') is 'normal normal 200 10px/normal sans-serif'
    17 PASS computedFont('300 10px sans-serif') is 'normal normal 300 10px/normal sans-serif'
    18 PASS computedFont('400 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    19 PASS computedFont('normal 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    20 PASS computedFont('500 10px sans-serif') is 'normal normal 500 10px/normal sans-serif'
    21 PASS computedFont('600 10px sans-serif') is 'normal normal 600 10px/normal sans-serif'
    22 PASS computedFont('700 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'
    23 PASS computedFont('bold 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'
    24 PASS computedFont('800 10px sans-serif') is 'normal normal 800 10px/normal sans-serif'
    25 PASS computedFont('900 10px sans-serif') is 'normal normal 900 10px/normal sans-serif'
    26 PASS computedFont('italic 10px sans-serif') is 'italic normal normal 10px/normal sans-serif'
    27 PASS computedFont('small-caps 10px sans-serif') is 'normal small-caps normal 10px/normal sans-serif'
    28 PASS computedFont('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/normal sans-serif'
    29 PASS computedFont('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/normal sans-serif'
     6PASS computedFont('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     7PASS computedFont('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     8PASS computedFont('10px SANS-SERIF') is 'normal normal normal 10px/12px sans-serif'
     9PASS computedFont('12px sans-serif') is 'normal normal normal 12px/14px sans-serif'
     10PASS computedFont('12px  sans-serif') is 'normal normal normal 12px/14px sans-serif'
     11PASS computedFont('10px sans-serif, sans-serif') is 'normal normal normal 10px/12px sans-serif, sans-serif'
     12PASS computedFont('10px sans-serif, serif') is 'normal normal normal 10px/12px sans-serif, serif'
     13PASS computedFont('12px ahem') is 'normal normal normal 12px/12px ahem'
     14PASS computedFont('12px unlikely-font-name') is 'normal normal normal 12px/14px unlikely-font-name'
     15PASS computedFont('100 10px sans-serif') is 'normal normal 100 10px/12px sans-serif'
     16PASS computedFont('200 10px sans-serif') is 'normal normal 200 10px/12px sans-serif'
     17PASS computedFont('300 10px sans-serif') is 'normal normal 300 10px/12px sans-serif'
     18PASS computedFont('400 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     19PASS computedFont('normal 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     20PASS computedFont('500 10px sans-serif') is 'normal normal 500 10px/12px sans-serif'
     21PASS computedFont('600 10px sans-serif') is 'normal normal 600 10px/12px sans-serif'
     22PASS computedFont('700 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'
     23PASS computedFont('bold 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'
     24PASS computedFont('800 10px sans-serif') is 'normal normal 800 10px/12px sans-serif'
     25PASS computedFont('900 10px sans-serif') is 'normal normal 900 10px/12px sans-serif'
     26PASS computedFont('italic 10px sans-serif') is 'italic normal normal 10px/12px sans-serif'
     27PASS computedFont('small-caps 10px sans-serif') is 'normal small-caps normal 10px/12px sans-serif'
     28PASS computedFont('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/12px sans-serif'
     29PASS computedFont('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/12px sans-serif'
    3030PASS computedFont('10px/100% sans-serif') is 'normal normal normal 10px/10px sans-serif'
    3131PASS computedFont('10px/100px sans-serif') is 'normal normal normal 10px/100px sans-serif'
    32 PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'
    33 PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'
    34 PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    35 PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    36 PASS computedFontCSSValue('10px SANS-SERIF') is 'normal normal normal 10px/normal sans-serif'
    37 PASS computedFontCSSValue('12px sans-serif') is 'normal normal normal 12px/normal sans-serif'
    38 PASS computedFontCSSValue('12px  sans-serif') is 'normal normal normal 12px/normal sans-serif'
    39 PASS computedFontCSSValue('10px sans-serif, sans-serif') is 'normal normal normal 10px/normal sans-serif, sans-serif'
    40 PASS computedFontCSSValue('10px sans-serif, serif') is 'normal normal normal 10px/normal sans-serif, serif'
    41 PASS computedFontCSSValue('12px ahem') is 'normal normal normal 12px/normal ahem'
    42 PASS computedFontCSSValue('12px unlikely-font-name') is 'normal normal normal 12px/normal unlikely-font-name'
    43 PASS computedFontCSSValue('100 10px sans-serif') is 'normal normal 100 10px/normal sans-serif'
    44 PASS computedFontCSSValue('200 10px sans-serif') is 'normal normal 200 10px/normal sans-serif'
    45 PASS computedFontCSSValue('300 10px sans-serif') is 'normal normal 300 10px/normal sans-serif'
    46 PASS computedFontCSSValue('400 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    47 PASS computedFontCSSValue('normal 10px sans-serif') is 'normal normal normal 10px/normal sans-serif'
    48 PASS computedFontCSSValue('500 10px sans-serif') is 'normal normal 500 10px/normal sans-serif'
    49 PASS computedFontCSSValue('600 10px sans-serif') is 'normal normal 600 10px/normal sans-serif'
    50 PASS computedFontCSSValue('700 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'
    51 PASS computedFontCSSValue('bold 10px sans-serif') is 'normal normal bold 10px/normal sans-serif'
    52 PASS computedFontCSSValue('800 10px sans-serif') is 'normal normal 800 10px/normal sans-serif'
    53 PASS computedFontCSSValue('900 10px sans-serif') is 'normal normal 900 10px/normal sans-serif'
    54 PASS computedFontCSSValue('italic 10px sans-serif') is 'italic normal normal 10px/normal sans-serif'
    55 PASS computedFontCSSValue('small-caps 10px sans-serif') is 'normal small-caps normal 10px/normal sans-serif'
    56 PASS computedFontCSSValue('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/normal sans-serif'
    57 PASS computedFontCSSValue('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/normal sans-serif'
     32PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'
     33PASS computedFont('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'
     34PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     35PASS computedFontCSSValue('10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     36PASS computedFontCSSValue('10px SANS-SERIF') is 'normal normal normal 10px/12px sans-serif'
     37PASS computedFontCSSValue('12px sans-serif') is 'normal normal normal 12px/14px sans-serif'
     38PASS computedFontCSSValue('12px  sans-serif') is 'normal normal normal 12px/14px sans-serif'
     39PASS computedFontCSSValue('10px sans-serif, sans-serif') is 'normal normal normal 10px/12px sans-serif, sans-serif'
     40PASS computedFontCSSValue('10px sans-serif, serif') is 'normal normal normal 10px/12px sans-serif, serif'
     41PASS computedFontCSSValue('12px ahem') is 'normal normal normal 12px/12px ahem'
     42PASS computedFontCSSValue('12px unlikely-font-name') is 'normal normal normal 12px/14px unlikely-font-name'
     43PASS computedFontCSSValue('100 10px sans-serif') is 'normal normal 100 10px/12px sans-serif'
     44PASS computedFontCSSValue('200 10px sans-serif') is 'normal normal 200 10px/12px sans-serif'
     45PASS computedFontCSSValue('300 10px sans-serif') is 'normal normal 300 10px/12px sans-serif'
     46PASS computedFontCSSValue('400 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     47PASS computedFontCSSValue('normal 10px sans-serif') is 'normal normal normal 10px/12px sans-serif'
     48PASS computedFontCSSValue('500 10px sans-serif') is 'normal normal 500 10px/12px sans-serif'
     49PASS computedFontCSSValue('600 10px sans-serif') is 'normal normal 600 10px/12px sans-serif'
     50PASS computedFontCSSValue('700 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'
     51PASS computedFontCSSValue('bold 10px sans-serif') is 'normal normal bold 10px/12px sans-serif'
     52PASS computedFontCSSValue('800 10px sans-serif') is 'normal normal 800 10px/12px sans-serif'
     53PASS computedFontCSSValue('900 10px sans-serif') is 'normal normal 900 10px/12px sans-serif'
     54PASS computedFontCSSValue('italic 10px sans-serif') is 'italic normal normal 10px/12px sans-serif'
     55PASS computedFontCSSValue('small-caps 10px sans-serif') is 'normal small-caps normal 10px/12px sans-serif'
     56PASS computedFontCSSValue('italic small-caps 10px sans-serif') is 'italic small-caps normal 10px/12px sans-serif'
     57PASS computedFontCSSValue('italic small-caps bold 10px sans-serif') is 'italic small-caps bold 10px/12px sans-serif'
    5858PASS computedFontCSSValue('10px/100% sans-serif') is 'normal normal normal 10px/10px sans-serif'
    5959PASS computedFontCSSValue('10px/100px sans-serif') is 'normal normal normal 10px/100px sans-serif'
    60 PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'
    61 PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/normal sans-serif'
     60PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'
     61PASS computedFontCSSValue('10px/normal sans-serif') is 'normal normal normal 10px/12px sans-serif'
    6262PASS successfullyParsed is true
    6363

  • trunk/LayoutTests/fast/css/getComputedStyle/computed-style-without-renderer-expected.txt

    r176258 r179168  
    5050left: auto
    5151letter-spacing: normal
    52 line-height: normal
     52line-height: 18px
    5353list-style-image: none
    5454list-style-position: outside

  • trunk/LayoutTests/fast/css/getComputedStyle/script-tests/computed-style-font.js

    r98407 r179168  
    1919}
    2020
    21 shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    22 shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    23 shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal 10px/normal sans-serif'");
    24 shouldBe("computedFont('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
    25 shouldBe("computedFont('12px  sans-serif')", "'normal normal normal 12px/normal sans-serif'");
    26 shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal 10px/normal sans-serif, sans-serif'");
    27 shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal 10px/normal sans-serif, serif'");
    28 shouldBe("computedFont('12px ahem')", "'normal normal normal 12px/normal ahem'");
    29 shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal 12px/normal unlikely-font-name'");
    30 shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 10px/normal sans-serif'");
    31 shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 10px/normal sans-serif'");
    32 shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 10px/normal sans-serif'");
    33 shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    34 shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    35 shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 10px/normal sans-serif'");
    36 shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 10px/normal sans-serif'");
    37 shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
    38 shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
    39 shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 10px/normal sans-serif'");
    40 shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 10px/normal sans-serif'");
    41 shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal 10px/normal sans-serif'");
    42 shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal 10px/normal sans-serif'");
    43 shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/normal sans-serif'");
    44 shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/normal sans-serif'");
     21shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     22shouldBe("computedFont('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     23shouldBe("computedFont('10px SANS-SERIF')", "'normal normal normal 10px/12px sans-serif'");
     24shouldBe("computedFont('12px sans-serif')", "'normal normal normal 12px/14px sans-serif'");
     25shouldBe("computedFont('12px  sans-serif')", "'normal normal normal 12px/14px sans-serif'");
     26shouldBe("computedFont('10px sans-serif, sans-serif')", "'normal normal normal 10px/12px sans-serif, sans-serif'");
     27shouldBe("computedFont('10px sans-serif, serif')", "'normal normal normal 10px/12px sans-serif, serif'");
     28shouldBe("computedFont('12px ahem')", "'normal normal normal 12px/12px ahem'");
     29shouldBe("computedFont('12px unlikely-font-name')", "'normal normal normal 12px/14px unlikely-font-name'");
     30shouldBe("computedFont('100 10px sans-serif')", "'normal normal 100 10px/12px sans-serif'");
     31shouldBe("computedFont('200 10px sans-serif')", "'normal normal 200 10px/12px sans-serif'");
     32shouldBe("computedFont('300 10px sans-serif')", "'normal normal 300 10px/12px sans-serif'");
     33shouldBe("computedFont('400 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     34shouldBe("computedFont('normal 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     35shouldBe("computedFont('500 10px sans-serif')", "'normal normal 500 10px/12px sans-serif'");
     36shouldBe("computedFont('600 10px sans-serif')", "'normal normal 600 10px/12px sans-serif'");
     37shouldBe("computedFont('700 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
     38shouldBe("computedFont('bold 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
     39shouldBe("computedFont('800 10px sans-serif')", "'normal normal 800 10px/12px sans-serif'");
     40shouldBe("computedFont('900 10px sans-serif')", "'normal normal 900 10px/12px sans-serif'");
     41shouldBe("computedFont('italic 10px sans-serif')", "'italic normal normal 10px/12px sans-serif'");
     42shouldBe("computedFont('small-caps 10px sans-serif')", "'normal small-caps normal 10px/12px sans-serif'");
     43shouldBe("computedFont('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/12px sans-serif'");
     44shouldBe("computedFont('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/12px sans-serif'");
    4545shouldBe("computedFont('10px/100% sans-serif')", "'normal normal normal 10px/10px sans-serif'");
    4646shouldBe("computedFont('10px/100px sans-serif')", "'normal normal normal 10px/100px sans-serif'");
    47 shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    48 shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
     47shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     48shouldBe("computedFont('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");
    4949
    50 shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    51 shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    52 shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal 10px/normal sans-serif'");
    53 shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal 12px/normal sans-serif'");
    54 shouldBe("computedFontCSSValue('12px  sans-serif')", "'normal normal normal 12px/normal sans-serif'");
    55 shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal 10px/normal sans-serif, sans-serif'");
    56 shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal 10px/normal sans-serif, serif'");
    57 shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal 12px/normal ahem'");
    58 shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal 12px/normal unlikely-font-name'");
    59 shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 10px/normal sans-serif'");
    60 shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 10px/normal sans-serif'");
    61 shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 10px/normal sans-serif'");
    62 shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    63 shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    64 shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 10px/normal sans-serif'");
    65 shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 10px/normal sans-serif'");
    66 shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
    67 shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold 10px/normal sans-serif'");
    68 shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 10px/normal sans-serif'");
    69 shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 10px/normal sans-serif'");
    70 shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal 10px/normal sans-serif'");
    71 shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal 10px/normal sans-serif'");
    72 shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/normal sans-serif'");
    73 shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/normal sans-serif'");
     50shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     51shouldBe("computedFontCSSValue('10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     52shouldBe("computedFontCSSValue('10px SANS-SERIF')", "'normal normal normal 10px/12px sans-serif'");
     53shouldBe("computedFontCSSValue('12px sans-serif')", "'normal normal normal 12px/14px sans-serif'");
     54shouldBe("computedFontCSSValue('12px  sans-serif')", "'normal normal normal 12px/14px sans-serif'");
     55shouldBe("computedFontCSSValue('10px sans-serif, sans-serif')", "'normal normal normal 10px/12px sans-serif, sans-serif'");
     56shouldBe("computedFontCSSValue('10px sans-serif, serif')", "'normal normal normal 10px/12px sans-serif, serif'");
     57shouldBe("computedFontCSSValue('12px ahem')", "'normal normal normal 12px/12px ahem'");
     58shouldBe("computedFontCSSValue('12px unlikely-font-name')", "'normal normal normal 12px/14px unlikely-font-name'");
     59shouldBe("computedFontCSSValue('100 10px sans-serif')", "'normal normal 100 10px/12px sans-serif'");
     60shouldBe("computedFontCSSValue('200 10px sans-serif')", "'normal normal 200 10px/12px sans-serif'");
     61shouldBe("computedFontCSSValue('300 10px sans-serif')", "'normal normal 300 10px/12px sans-serif'");
     62shouldBe("computedFontCSSValue('400 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     63shouldBe("computedFontCSSValue('normal 10px sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     64shouldBe("computedFontCSSValue('500 10px sans-serif')", "'normal normal 500 10px/12px sans-serif'");
     65shouldBe("computedFontCSSValue('600 10px sans-serif')", "'normal normal 600 10px/12px sans-serif'");
     66shouldBe("computedFontCSSValue('700 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
     67shouldBe("computedFontCSSValue('bold 10px sans-serif')", "'normal normal bold 10px/12px sans-serif'");
     68shouldBe("computedFontCSSValue('800 10px sans-serif')", "'normal normal 800 10px/12px sans-serif'");
     69shouldBe("computedFontCSSValue('900 10px sans-serif')", "'normal normal 900 10px/12px sans-serif'");
     70shouldBe("computedFontCSSValue('italic 10px sans-serif')", "'italic normal normal 10px/12px sans-serif'");
     71shouldBe("computedFontCSSValue('small-caps 10px sans-serif')", "'normal small-caps normal 10px/12px sans-serif'");
     72shouldBe("computedFontCSSValue('italic small-caps 10px sans-serif')", "'italic small-caps normal 10px/12px sans-serif'");
     73shouldBe("computedFontCSSValue('italic small-caps bold 10px sans-serif')", "'italic small-caps bold 10px/12px sans-serif'");
    7474shouldBe("computedFontCSSValue('10px/100% sans-serif')", "'normal normal normal 10px/10px sans-serif'");
    7575shouldBe("computedFontCSSValue('10px/100px sans-serif')", "'normal normal normal 10px/100px sans-serif'");
    76 shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
    77 shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/normal sans-serif'");
     76shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");
     77shouldBe("computedFontCSSValue('10px/normal sans-serif')", "'normal normal normal 10px/12px sans-serif'");

  • trunk/LayoutTests/fast/css/line-height-text-autosizing-expected.txt

    r176490 r179168  
    55
    66Case without text size adjust.
    7 PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "normal"
     7PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height') is "23px"
    88PASS window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size') is "20px"
    99testDivNoAdjust.style['line-height'] = '1.6'

  • trunk/LayoutTests/fast/css/line-height-text-autosizing.html

    r176490 r179168  
    2121debug("Case without text size adjust.");
    2222var testDivNoAdjust = document.getElementById("testDivNoAdjust");
    23 shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "normal");
     23shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('line-height')", "23px");
    2424shouldBeEqualToString("window.getComputedStyle(testDivNoAdjust).getPropertyValue('font-size')", "20px");
    2525evalAndLog("testDivNoAdjust.style['line-height'] = '1.6'");

  • trunk/LayoutTests/fast/ruby/ruby-line-height-expected.txt

    r137477 r179168  
    77PASS getLineHeight('p') is "48px"
    88PASS [object HTMLElement] is non-null.
    9 FAIL getLineHeight('r') should be normal. Was 48px.
     9PASS getLineHeight('r') is "48px"
    1010PASS [object HTMLElement] is non-null.
    11 PASS getLineHeight('t') is "normal"
     11PASS getLineHeight('t') is "10px"
    1212PASS successfullyParsed is true
    1313
    1414TEST COMPLETE
    15 The line height of this is three times normal"line-height: 48px;", but the ruby should have 'line-height: normal'.
     15The line height of this is three times normal"line-height: 48px;".

  • trunk/LayoutTests/fast/ruby/script-tests/ruby-line-height.js

    r98407 r179168  
    1010
    1111var div = document.createElement("div");
    12 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>";
     12div.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>";
    1313document.body.appendChild(div);
    1414
    1515shouldBeEqualToString("getLineHeight('p')", "48px");
    16 shouldBeEqualToString("getLineHeight('r')", "normal");
    17 shouldBeEqualToString("getLineHeight('t')", "normal");
     16shouldBeEqualToString("getLineHeight('r')", "48px");
     17shouldBeEqualToString("getLineHeight('t')", "10px");

  • trunk/LayoutTests/media/track/track-cue-rendering-on-resize-expected.txt

    r158743 r179168  
    55
    66** Line height of the cue element should be 'normal' **
    7 EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == 'normal') OK
     7EXPECTED (getComputedStyle(multiLineCueDisplayElement).lineHeight == '14px') OK
    88END OF TEST
    99

  • trunk/LayoutTests/media/track/track-cue-rendering-on-resize.html

    r154815 r179168  
    2626
    2727            consoleWrite("<br>** Line height of the cue element should be 'normal' **");
    28             testExpected("getComputedStyle(multiLineCueDisplayElement).lineHeight", "normal");
     28            testExpected("getComputedStyle(multiLineCueDisplayElement).lineHeight", "14px");
    2929
    3030            endTest();

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/anchor-element-expected.txt

    r176048 r179168  
    1111    TailIndent: 0
    1212    FirstLineHeadIndent: 0
    13     LineHeight: 0/0
     13    LineHeight: 18/0
    1414    LineHeightMultiple: 0
    1515    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/basic-expected.txt

    r176048 r179168  
    1212    TailIndent: 0
    1313    FirstLineHeadIndent: 0
    14     LineHeight: 0/0
     14    LineHeight: 18/0
    1515    LineHeightMultiple: 0
    1616    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-size-expected.txt

    r176048 r179168  
    2020    TailIndent: 0
    2121    FirstLineHeadIndent: 0
    22     LineHeight: 0/0
     22    LineHeight: 15/0
    2323    LineHeightMultiple: 0
    2424    LineBreakMode: 0
    … …  
    3333[small element]
    3434    NSFont: Times-Roman 13.00 pt.
    35 [ ]
    36     NSFont: Times-Roman 16.00 pt.
     35NSParagraphStyle:
     36Alignment 4
     37    LineSpacing: 0
     38    ParagraphSpacing: 0
     39    ParagraphSpacingBefore: 0
     40    HeadIndent: 0
     41    TailIndent: 0
     42    FirstLineHeadIndent: 0
     43    LineHeight: 18/0
     44    LineHeightMultiple: 0
     45    LineBreakMode: 0
     46    Tabs: ()
     47    DefaultTabInterval: 36
     48    Blocks: (null)
     49    Lists: (null)
     50    BaseWritingDirection: 0
     51    HyphenationFactor: 0
     52    TighteningFactor: 0.05
     53    HeaderLevel: 0
     54[ ]
     55    NSFont: Times-Roman 16.00 pt.
     56NSParagraphStyle:
     57Alignment 4
     58    LineSpacing: 0
     59    ParagraphSpacing: 0
     60    ParagraphSpacingBefore: 0
     61    HeadIndent: 0
     62    TailIndent: 0
     63    FirstLineHeadIndent: 0
     64    LineHeight: 10/0
     65    LineHeightMultiple: 0
     66    LineBreakMode: 0
     67    Tabs: ()
     68    DefaultTabInterval: 36
     69    Blocks: (null)
     70    Lists: (null)
     71    BaseWritingDirection: 0
     72    HyphenationFactor: 0
     73    TighteningFactor: 0.05
     74    HeaderLevel: 0
    3775[xx-small]
    3876    NSFont: Times-Roman 9.00 pt.
    39 [ ]
    40     NSFont: Times-Roman 16.00 pt.
     77NSParagraphStyle:
     78Alignment 4
     79    LineSpacing: 0
     80    ParagraphSpacing: 0
     81    ParagraphSpacingBefore: 0
     82    HeadIndent: 0
     83    TailIndent: 0
     84    FirstLineHeadIndent: 0
     85    LineHeight: 18/0
     86    LineHeightMultiple: 0
     87    LineBreakMode: 0
     88    Tabs: ()
     89    DefaultTabInterval: 36
     90    Blocks: (null)
     91    Lists: (null)
     92    BaseWritingDirection: 0
     93    HyphenationFactor: 0
     94    TighteningFactor: 0.05
     95    HeaderLevel: 0
     96[ ]
     97    NSFont: Times-Roman 16.00 pt.
     98NSParagraphStyle:
     99Alignment 4
     100    LineSpacing: 0
     101    ParagraphSpacing: 0
     102    ParagraphSpacingBefore: 0
     103    HeadIndent: 0
     104    TailIndent: 0
     105    FirstLineHeadIndent: 0
     106    LineHeight: 13/0
     107    LineHeightMultiple: 0
     108    LineBreakMode: 0
     109    Tabs: ()
     110    DefaultTabInterval: 36
     111    Blocks: (null)
     112    Lists: (null)
     113    BaseWritingDirection: 0
     114    HyphenationFactor: 0
     115    TighteningFactor: 0.05
     116    HeaderLevel: 0
    41117[x-small]
    42118    NSFont: Times-Roman 10.00 pt.
    43 [ ]
    44     NSFont: Times-Roman 16.00 pt.
     119NSParagraphStyle:
     120Alignment 4
     121    LineSpacing: 0
     122    ParagraphSpacing: 0
     123    ParagraphSpacingBefore: 0
     124    HeadIndent: 0
     125    TailIndent: 0
     126    FirstLineHeadIndent: 0
     127    LineHeight: 18/0
     128    LineHeightMultiple: 0
     129    LineBreakMode: 0
     130    Tabs: ()
     131    DefaultTabInterval: 36
     132    Blocks: (null)
     133    Lists: (null)
     134    BaseWritingDirection: 0
     135    HyphenationFactor: 0
     136    TighteningFactor: 0.05
     137    HeaderLevel: 0
     138[ ]
     139    NSFont: Times-Roman 16.00 pt.
     140NSParagraphStyle:
     141Alignment 4
     142    LineSpacing: 0
     143    ParagraphSpacing: 0
     144    ParagraphSpacingBefore: 0
     145    HeadIndent: 0
     146    TailIndent: 0
     147    FirstLineHeadIndent: 0
     148    LineHeight: 15/0
     149    LineHeightMultiple: 0
     150    LineBreakMode: 0
     151    Tabs: ()
     152    DefaultTabInterval: 36
     153    Blocks: (null)
     154    Lists: (null)
     155    BaseWritingDirection: 0
     156    HyphenationFactor: 0
     157    TighteningFactor: 0.05
     158    HeaderLevel: 0
    45159[small]
    46160    NSFont: Times-Roman 13.00 pt.
     161NSParagraphStyle:
     162Alignment 4
     163    LineSpacing: 0
     164    ParagraphSpacing: 0
     165    ParagraphSpacingBefore: 0
     166    HeadIndent: 0
     167    TailIndent: 0
     168    FirstLineHeadIndent: 0
     169    LineHeight: 18/0
     170    LineHeightMultiple: 0
     171    LineBreakMode: 0
     172    Tabs: ()
     173    DefaultTabInterval: 36
     174    Blocks: (null)
     175    Lists: (null)
     176    BaseWritingDirection: 0
     177    HyphenationFactor: 0
     178    TighteningFactor: 0.05
     179    HeaderLevel: 0
    47180[ normal ]
    48181    NSFont: Times-Roman 16.00 pt.
     182NSParagraphStyle:
     183Alignment 4
     184    LineSpacing: 0
     185    ParagraphSpacing: 0
     186    ParagraphSpacingBefore: 0
     187    HeadIndent: 0
     188    TailIndent: 0
     189    FirstLineHeadIndent: 0
     190    LineHeight: 22/0
     191    LineHeightMultiple: 0
     192    LineBreakMode: 0
     193    Tabs: ()
     194    DefaultTabInterval: 36
     195    Blocks: (null)
     196    Lists: (null)
     197    BaseWritingDirection: 0
     198    HyphenationFactor: 0
     199    TighteningFactor: 0.05
     200    HeaderLevel: 0
    49201[large]
    50202    NSFont: Times-Roman 18.00 pt.
    51 [ ]
    52     NSFont: Times-Roman 16.00 pt.
     203NSParagraphStyle:
     204Alignment 4
     205    LineSpacing: 0
     206    ParagraphSpacing: 0
     207    ParagraphSpacingBefore: 0
     208    HeadIndent: 0
     209    TailIndent: 0
     210    FirstLineHeadIndent: 0
     211    LineHeight: 18/0
     212    LineHeightMultiple: 0
     213    LineBreakMode: 0
     214    Tabs: ()
     215    DefaultTabInterval: 36
     216    Blocks: (null)
     217    Lists: (null)
     218    BaseWritingDirection: 0
     219    HyphenationFactor: 0
     220    TighteningFactor: 0.05
     221    HeaderLevel: 0
     222[ ]
     223    NSFont: Times-Roman 16.00 pt.
     224NSParagraphStyle:
     225Alignment 4
     226    LineSpacing: 0
     227    ParagraphSpacing: 0
     228    ParagraphSpacingBefore: 0
     229    HeadIndent: 0
     230    TailIndent: 0
     231    FirstLineHeadIndent: 0
     232    LineHeight: 28/0
     233    LineHeightMultiple: 0
     234    LineBreakMode: 0
     235    Tabs: ()
     236    DefaultTabInterval: 36
     237    Blocks: (null)
     238    Lists: (null)
     239    BaseWritingDirection: 0
     240    HyphenationFactor: 0
     241    TighteningFactor: 0.05
     242    HeaderLevel: 0
    53243[x-large]
    54244    NSFont: Times-Roman 24.00 pt.
    55 [ ]
    56     NSFont: Times-Roman 16.00 pt.
     245NSParagraphStyle:
     246Alignment 4
     247    LineSpacing: 0
     248    ParagraphSpacing: 0
     249    ParagraphSpacingBefore: 0
     250    HeadIndent: 0
     251    TailIndent: 0
     252    FirstLineHeadIndent: 0
     253    LineHeight: 18/0
     254    LineHeightMultiple: 0
     255    LineBreakMode: 0
     256    Tabs: ()
     257    DefaultTabInterval: 36
     258    Blocks: (null)
     259    Lists: (null)
     260    BaseWritingDirection: 0
     261    HyphenationFactor: 0
     262    TighteningFactor: 0.05
     263    HeaderLevel: 0
     264[ ]
     265    NSFont: Times-Roman 16.00 pt.
     266NSParagraphStyle:
     267Alignment 4
     268    LineSpacing: 0
     269    ParagraphSpacing: 0
     270    ParagraphSpacingBefore: 0
     271    HeadIndent: 0
     272    TailIndent: 0
     273    FirstLineHeadIndent: 0
     274    LineHeight: 37/0
     275    LineHeightMultiple: 0
     276    LineBreakMode: 0
     277    Tabs: ()
     278    DefaultTabInterval: 36
     279    Blocks: (null)
     280    Lists: (null)
     281    BaseWritingDirection: 0
     282    HyphenationFactor: 0
     283    TighteningFactor: 0.05
     284    HeaderLevel: 0
    57285[xx-large]
    58286    NSFont: Times-Roman 32.00 pt.
    59 [ ]
    60     NSFont: Times-Roman 16.00 pt.
     287NSParagraphStyle:
     288Alignment 4
     289    LineSpacing: 0
     290    ParagraphSpacing: 0
     291    ParagraphSpacingBefore: 0
     292    HeadIndent: 0
     293    TailIndent: 0
     294    FirstLineHeadIndent: 0
     295    LineHeight: 18/0
     296    LineHeightMultiple: 0
     297    LineBreakMode: 0
     298    Tabs: ()
     299    DefaultTabInterval: 36
     300    Blocks: (null)
     301    Lists: (null)
     302    BaseWritingDirection: 0
     303    HyphenationFactor: 0
     304    TighteningFactor: 0.05
     305    HeaderLevel: 0
     306[ ]
     307    NSFont: Times-Roman 16.00 pt.
     308NSParagraphStyle:
     309Alignment 4
     310    LineSpacing: 0
     311    ParagraphSpacing: 0
     312    ParagraphSpacingBefore: 0
     313    HeadIndent: 0
     314    TailIndent: 0
     315    FirstLineHeadIndent: 0
     316    LineHeight: 8/0
     317    LineHeightMultiple: 0
     318    LineBreakMode: 0
     319    Tabs: ()
     320    DefaultTabInterval: 36
     321    Blocks: (null)
     322    Lists: (null)
     323    BaseWritingDirection: 0
     324    HyphenationFactor: 0
     325    TighteningFactor: 0.05
     326    HeaderLevel: 0
    61327[5pt]
    62328    NSFont: Times-Roman 7.00 pt.
    63 [ ]
    64     NSFont: Times-Roman 16.00 pt.
     329NSParagraphStyle:
     330Alignment 4
     331    LineSpacing: 0
     332    ParagraphSpacing: 0
     333    ParagraphSpacingBefore: 0
     334    HeadIndent: 0
     335    TailIndent: 0
     336    FirstLineHeadIndent: 0
     337    LineHeight: 18/0
     338    LineHeightMultiple: 0
     339    LineBreakMode: 0
     340    Tabs: ()
     341    DefaultTabInterval: 36
     342    Blocks: (null)
     343    Lists: (null)
     344    BaseWritingDirection: 0
     345    HyphenationFactor: 0
     346    TighteningFactor: 0.05
     347    HeaderLevel: 0
     348[ ]
     349    NSFont: Times-Roman 16.00 pt.
     350NSParagraphStyle:
     351Alignment 4
     352    LineSpacing: 0
     353    ParagraphSpacing: 0
     354    ParagraphSpacingBefore: 0
     355    HeadIndent: 0
     356    TailIndent: 0
     357    FirstLineHeadIndent: 0
     358    LineHeight: 23/0
     359    LineHeightMultiple: 0
     360    LineBreakMode: 0
     361    Tabs: ()
     362    DefaultTabInterval: 36
     363    Blocks: (null)
     364    Lists: (null)
     365    BaseWritingDirection: 0
     366    HyphenationFactor: 0
     367    TighteningFactor: 0.05
     368    HeaderLevel: 0
    65369[15pt]
    66370    NSFont: Times-Roman 20.00 pt.
     371NSParagraphStyle:
     372Alignment 4
     373    LineSpacing: 0
     374    ParagraphSpacing: 0
     375    ParagraphSpacingBefore: 0
     376    HeadIndent: 0
     377    TailIndent: 0
     378    FirstLineHeadIndent: 0
     379    LineHeight: 18/0
     380    LineHeightMultiple: 0
     381    LineBreakMode: 0
     382    Tabs: ()
     383    DefaultTabInterval: 36
     384    Blocks: (null)
     385    Lists: (null)
     386    BaseWritingDirection: 0
     387    HyphenationFactor: 0
     388    TighteningFactor: 0.05
     389    HeaderLevel: 0
    67390[ ]
    68391    NSFont: Times-Roman 16.00 pt.

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt

    r176048 r179168  
    1515    TailIndent: 0
    1616    FirstLineHeadIndent: 0
    17     LineHeight: 0/0
     17    LineHeight: 18/0
    1818    LineHeightMultiple: 0
    1919    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/font-weight-expected.txt

    r176048 r179168  
    2020    TailIndent: 0
    2121    FirstLineHeadIndent: 0
    22     LineHeight: 0/0
     22    LineHeight: 18/0
    2323    LineHeightMultiple: 0
    2424    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/letter-spacing-expected.txt

    r176048 r179168  
    1111    TailIndent: 0
    1212    FirstLineHeadIndent: 0
    13     LineHeight: 0/0
     13    LineHeight: 18/0
    1414    LineHeightMultiple: 0
    1515    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/text-decorations-expected.txt

    r176048 r179168  
    1313    TailIndent: 0
    1414    FirstLineHeadIndent: 0
    15     LineHeight: 0/0
     15    LineHeight: 18/0
    1616    LineHeightMultiple: 0
    1717    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac-mavericks/platform/mac/editing/attributed-string/vertical-align-expected.txt

    r176048 r179168  
    1515    TailIndent: 0
    1616    FirstLineHeadIndent: 0
    17     LineHeight: 0/0
     17    LineHeight: 15/0
    1818    LineHeightMultiple: 0
    1919    LineBreakMode: 0
    … …  
    2929    NSFont: Times-Roman 13.00 pt.
    3030    NSSuperScript: 1
     31NSParagraphStyle:
     32Alignment 4
     33    LineSpacing: 0
     34    ParagraphSpacing: 0
     35    ParagraphSpacingBefore: 0
     36    HeadIndent: 0
     37    TailIndent: 0
     38    FirstLineHeadIndent: 0
     39    LineHeight: 18/0
     40    LineHeightMultiple: 0
     41    LineBreakMode: 0
     42    Tabs: ()
     43    DefaultTabInterval: 36
     44    Blocks: (null)
     45    Lists: (null)
     46    BaseWritingDirection: 0
     47    HyphenationFactor: 0
     48    TighteningFactor: 0.05
     49    HeaderLevel: 0
    3150[ ]
    3251    NSFont: Times-Roman 16.00 pt.
     52NSParagraphStyle:
     53Alignment 4
     54    LineSpacing: 0
     55    ParagraphSpacing: 0
     56    ParagraphSpacingBefore: 0
     57    HeadIndent: 0
     58    TailIndent: 0
     59    FirstLineHeadIndent: 0
     60    LineHeight: 15/0
     61    LineHeightMultiple: 0
     62    LineBreakMode: 0
     63    Tabs: ()
     64    DefaultTabInterval: 36
     65    Blocks: (null)
     66    Lists: (null)
     67    BaseWritingDirection: 0
     68    HyphenationFactor: 0
     69    TighteningFactor: 0.05
     70    HeaderLevel: 0
    3371[sub element]
    3472    NSFont: Times-Roman 13.00 pt.
    3573    NSSuperScript: -1
     74NSParagraphStyle:
     75Alignment 4
     76    LineSpacing: 0
     77    ParagraphSpacing: 0
     78    ParagraphSpacingBefore: 0
     79    HeadIndent: 0
     80    TailIndent: 0
     81    FirstLineHeadIndent: 0
     82    LineHeight: 18/0
     83    LineHeightMultiple: 0
     84    LineBreakMode: 0
     85    Tabs: ()
     86    DefaultTabInterval: 36
     87    Blocks: (null)
     88    Lists: (null)
     89    BaseWritingDirection: 0
     90    HyphenationFactor: 0
     91    TighteningFactor: 0.05
     92    HeaderLevel: 0
    3693[ ]
    3794    NSFont: Times-Roman 16.00 pt.

  • trunk/LayoutTests/platform/mac/editing/attributed-string/anchor-element-expected.txt

    r176048 r179168  
    1111    TailIndent: 0
    1212    FirstLineHeadIndent: 0
    13     LineHeight: 0/0
     13    LineHeight: 18/0
    1414    LineHeightMultiple: 0
    1515    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac/editing/attributed-string/basic-expected.txt

    r176048 r179168  
    1212    TailIndent: 0
    1313    FirstLineHeadIndent: 0
    14     LineHeight: 0/0
     14    LineHeight: 18/0
    1515    LineHeightMultiple: 0
    1616    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac/editing/attributed-string/font-size-expected.txt

    r176048 r179168  
    2020    TailIndent: 0
    2121    FirstLineHeadIndent: 0
    22     LineHeight: 0/0
     22    LineHeight: 15/0
    2323    LineHeightMultiple: 0
    2424    LineBreakMode: 0
    … …  
    3232    HeaderLevel: 0
    3333[small element]
    34     NSColor: #000000 (NSDeviceRGBColorSpace)
    3534    NSFont: Times-Roman 13.00 pt.
    36     NSKern: 0pt
    37     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    38     NSStrokeWidth: 0
    39 [ ]
    40     NSColor: #000000 (NSDeviceRGBColorSpace)
    41     NSFont: Times-Roman 16.00 pt.
    42     NSKern: 0pt
    43     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    44     NSStrokeWidth: 0
     35NSParagraphStyle:
     36Alignment 4
     37    LineSpacing: 0
     38    ParagraphSpacing: 0
     39    ParagraphSpacingBefore: 0
     40    HeadIndent: 0
     41    TailIndent: 0
     42    FirstLineHeadIndent: 0
     43    LineHeight: 18/0
     44    LineHeightMultiple: 0
     45    LineBreakMode: 0
     46    Tabs: ()
     47    DefaultTabInterval: 36
     48    Blocks: (null)
     49    Lists: (null)
     50    BaseWritingDirection: 0
     51    HyphenationFactor: 0
     52    TighteningFactor: 0.05
     53    HeaderLevel: 0
     54[ ]
     55    NSFont: Times-Roman 16.00 pt.
     56NSParagraphStyle:
     57Alignment 4
     58    LineSpacing: 0
     59    ParagraphSpacing: 0
     60    ParagraphSpacingBefore: 0
     61    HeadIndent: 0
     62    TailIndent: 0
     63    FirstLineHeadIndent: 0
     64    LineHeight: 10/0
     65    LineHeightMultiple: 0
     66    LineBreakMode: 0
     67    Tabs: ()
     68    DefaultTabInterval: 36
     69    Blocks: (null)
     70    Lists: (null)
     71    BaseWritingDirection: 0
     72    HyphenationFactor: 0
     73    TighteningFactor: 0.05
     74    HeaderLevel: 0
    4575[xx-small]
    46     NSColor: #000000 (NSDeviceRGBColorSpace)
    4776    NSFont: Times-Roman 9.00 pt.
    48     NSKern: 0pt
    49     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    50     NSStrokeWidth: 0
    51 [ ]
    52     NSColor: #000000 (NSDeviceRGBColorSpace)
    53     NSFont: Times-Roman 16.00 pt.
    54     NSKern: 0pt
    55     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    56     NSStrokeWidth: 0
     77NSParagraphStyle:
     78Alignment 4
     79    LineSpacing: 0
     80    ParagraphSpacing: 0
     81    ParagraphSpacingBefore: 0
     82    HeadIndent: 0
     83    TailIndent: 0
     84    FirstLineHeadIndent: 0
     85    LineHeight: 18/0
     86    LineHeightMultiple: 0
     87    LineBreakMode: 0
     88    Tabs: ()
     89    DefaultTabInterval: 36
     90    Blocks: (null)
     91    Lists: (null)
     92    BaseWritingDirection: 0
     93    HyphenationFactor: 0
     94    TighteningFactor: 0.05
     95    HeaderLevel: 0
     96[ ]
     97    NSFont: Times-Roman 16.00 pt.
     98NSParagraphStyle:
     99Alignment 4
     100    LineSpacing: 0
     101    ParagraphSpacing: 0
     102    ParagraphSpacingBefore: 0
     103    HeadIndent: 0
     104    TailIndent: 0
     105    FirstLineHeadIndent: 0
     106    LineHeight: 13/0
     107    LineHeightMultiple: 0
     108    LineBreakMode: 0
     109    Tabs: ()
     110    DefaultTabInterval: 36
     111    Blocks: (null)
     112    Lists: (null)
     113    BaseWritingDirection: 0
     114    HyphenationFactor: 0
     115    TighteningFactor: 0.05
     116    HeaderLevel: 0
    57117[x-small]
    58     NSColor: #000000 (NSDeviceRGBColorSpace)
    59118    NSFont: Times-Roman 10.00 pt.
    60     NSKern: 0pt
    61     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    62     NSStrokeWidth: 0
    63 [ ]
    64     NSColor: #000000 (NSDeviceRGBColorSpace)
    65     NSFont: Times-Roman 16.00 pt.
    66     NSKern: 0pt
    67     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    68     NSStrokeWidth: 0
     119NSParagraphStyle:
     120Alignment 4
     121    LineSpacing: 0
     122    ParagraphSpacing: 0
     123    ParagraphSpacingBefore: 0
     124    HeadIndent: 0
     125    TailIndent: 0
     126    FirstLineHeadIndent: 0
     127    LineHeight: 18/0
     128    LineHeightMultiple: 0
     129    LineBreakMode: 0
     130    Tabs: ()
     131    DefaultTabInterval: 36
     132    Blocks: (null)
     133    Lists: (null)
     134    BaseWritingDirection: 0
     135    HyphenationFactor: 0
     136    TighteningFactor: 0.05
     137    HeaderLevel: 0
     138[ ]
     139    NSFont: Times-Roman 16.00 pt.
     140NSParagraphStyle:
     141Alignment 4
     142    LineSpacing: 0
     143    ParagraphSpacing: 0
     144    ParagraphSpacingBefore: 0
     145    HeadIndent: 0
     146    TailIndent: 0
     147    FirstLineHeadIndent: 0
     148    LineHeight: 15/0
     149    LineHeightMultiple: 0
     150    LineBreakMode: 0
     151    Tabs: ()
     152    DefaultTabInterval: 36
     153    Blocks: (null)
     154    Lists: (null)
     155    BaseWritingDirection: 0
     156    HyphenationFactor: 0
     157    TighteningFactor: 0.05
     158    HeaderLevel: 0
    69159[small]
    70     NSColor: #000000 (NSDeviceRGBColorSpace)
    71160    NSFont: Times-Roman 13.00 pt.
    72     NSKern: 0pt
    73     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    74     NSStrokeWidth: 0
     161NSParagraphStyle:
     162Alignment 4
     163    LineSpacing: 0
     164    ParagraphSpacing: 0
     165    ParagraphSpacingBefore: 0
     166    HeadIndent: 0
     167    TailIndent: 0
     168    FirstLineHeadIndent: 0
     169    LineHeight: 18/0
     170    LineHeightMultiple: 0
     171    LineBreakMode: 0
     172    Tabs: ()
     173    DefaultTabInterval: 36
     174    Blocks: (null)
     175    Lists: (null)
     176    BaseWritingDirection: 0
     177    HyphenationFactor: 0
     178    TighteningFactor: 0.05
     179    HeaderLevel: 0
    75180[ normal ]
    76     NSColor: #000000 (NSDeviceRGBColorSpace)
    77     NSFont: Times-Roman 16.00 pt.
    78     NSKern: 0pt
    79     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    80     NSStrokeWidth: 0
     181    NSFont: Times-Roman 16.00 pt.
     182NSParagraphStyle:
     183Alignment 4
     184    LineSpacing: 0
     185    ParagraphSpacing: 0
     186    ParagraphSpacingBefore: 0
     187    HeadIndent: 0
     188    TailIndent: 0
     189    FirstLineHeadIndent: 0
     190    LineHeight: 22/0
     191    LineHeightMultiple: 0
     192    LineBreakMode: 0
     193    Tabs: ()
     194    DefaultTabInterval: 36
     195    Blocks: (null)
     196    Lists: (null)
     197    BaseWritingDirection: 0
     198    HyphenationFactor: 0
     199    TighteningFactor: 0.05
     200    HeaderLevel: 0
    81201[large]
    82     NSColor: #000000 (NSDeviceRGBColorSpace)
    83202    NSFont: Times-Roman 18.00 pt.
    84     NSKern: 0pt
    85     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    86     NSStrokeWidth: 0
    87 [ ]
    88     NSColor: #000000 (NSDeviceRGBColorSpace)
    89     NSFont: Times-Roman 16.00 pt.
    90     NSKern: 0pt
    91     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    92     NSStrokeWidth: 0
     203NSParagraphStyle:
     204Alignment 4
     205    LineSpacing: 0
     206    ParagraphSpacing: 0
     207    ParagraphSpacingBefore: 0
     208    HeadIndent: 0
     209    TailIndent: 0
     210    FirstLineHeadIndent: 0
     211    LineHeight: 18/0
     212    LineHeightMultiple: 0
     213    LineBreakMode: 0
     214    Tabs: ()
     215    DefaultTabInterval: 36
     216    Blocks: (null)
     217    Lists: (null)
     218    BaseWritingDirection: 0
     219    HyphenationFactor: 0
     220    TighteningFactor: 0.05
     221    HeaderLevel: 0
     222[ ]
     223    NSFont: Times-Roman 16.00 pt.
     224NSParagraphStyle:
     225Alignment 4
     226    LineSpacing: 0
     227    ParagraphSpacing: 0
     228    ParagraphSpacingBefore: 0
     229    HeadIndent: 0
     230    TailIndent: 0
     231    FirstLineHeadIndent: 0
     232    LineHeight: 28/0
     233    LineHeightMultiple: 0
     234    LineBreakMode: 0
     235    Tabs: ()
     236    DefaultTabInterval: 36
     237    Blocks: (null)
     238    Lists: (null)
     239    BaseWritingDirection: 0
     240    HyphenationFactor: 0
     241    TighteningFactor: 0.05
     242    HeaderLevel: 0
    93243[x-large]
    94     NSColor: #000000 (NSDeviceRGBColorSpace)
    95244    NSFont: Times-Roman 24.00 pt.
    96     NSKern: 0pt
    97     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    98     NSStrokeWidth: 0
    99 [ ]
    100     NSColor: #000000 (NSDeviceRGBColorSpace)
    101     NSFont: Times-Roman 16.00 pt.
    102     NSKern: 0pt
    103     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    104     NSStrokeWidth: 0
     245NSParagraphStyle:
     246Alignment 4
     247    LineSpacing: 0
     248    ParagraphSpacing: 0
     249    ParagraphSpacingBefore: 0
     250    HeadIndent: 0
     251    TailIndent: 0
     252    FirstLineHeadIndent: 0
     253    LineHeight: 18/0
     254    LineHeightMultiple: 0
     255    LineBreakMode: 0
     256    Tabs: ()
     257    DefaultTabInterval: 36
     258    Blocks: (null)
     259    Lists: (null)
     260    BaseWritingDirection: 0
     261    HyphenationFactor: 0
     262    TighteningFactor: 0.05
     263    HeaderLevel: 0
     264[ ]
     265    NSFont: Times-Roman 16.00 pt.
     266NSParagraphStyle:
     267Alignment 4
     268    LineSpacing: 0
     269    ParagraphSpacing: 0
     270    ParagraphSpacingBefore: 0
     271    HeadIndent: 0
     272    TailIndent: 0
     273    FirstLineHeadIndent: 0
     274    LineHeight: 37/0
     275    LineHeightMultiple: 0
     276    LineBreakMode: 0
     277    Tabs: ()
     278    DefaultTabInterval: 36
     279    Blocks: (null)
     280    Lists: (null)
     281    BaseWritingDirection: 0
     282    HyphenationFactor: 0
     283    TighteningFactor: 0.05
     284    HeaderLevel: 0
    105285[xx-large]
    106     NSColor: #000000 (NSDeviceRGBColorSpace)
    107286    NSFont: Times-Roman 32.00 pt.
    108     NSKern: 0pt
    109     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    110     NSStrokeWidth: 0
    111 [ ]
    112     NSColor: #000000 (NSDeviceRGBColorSpace)
    113     NSFont: Times-Roman 16.00 pt.
    114     NSKern: 0pt
    115     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    116     NSStrokeWidth: 0
     287NSParagraphStyle:
     288Alignment 4
     289    LineSpacing: 0
     290    ParagraphSpacing: 0
     291    ParagraphSpacingBefore: 0
     292    HeadIndent: 0
     293    TailIndent: 0
     294    FirstLineHeadIndent: 0
     295    LineHeight: 18/0
     296    LineHeightMultiple: 0
     297    LineBreakMode: 0
     298    Tabs: ()
     299    DefaultTabInterval: 36
     300    Blocks: (null)
     301    Lists: (null)
     302    BaseWritingDirection: 0
     303    HyphenationFactor: 0
     304    TighteningFactor: 0.05
     305    HeaderLevel: 0
     306[ ]
     307    NSFont: Times-Roman 16.00 pt.
     308NSParagraphStyle:
     309Alignment 4
     310    LineSpacing: 0
     311    ParagraphSpacing: 0
     312    ParagraphSpacingBefore: 0
     313    HeadIndent: 0
     314    TailIndent: 0
     315    FirstLineHeadIndent: 0
     316    LineHeight: 8/0
     317    LineHeightMultiple: 0
     318    LineBreakMode: 0
     319    Tabs: ()
     320    DefaultTabInterval: 36
     321    Blocks: (null)
     322    Lists: (null)
     323    BaseWritingDirection: 0
     324    HyphenationFactor: 0
     325    TighteningFactor: 0.05
     326    HeaderLevel: 0
    117327[5pt]
    118     NSColor: #000000 (NSDeviceRGBColorSpace)
    119328    NSFont: Times-Roman 7.00 pt.
    120     NSKern: 0pt
    121     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    122     NSStrokeWidth: 0
    123 [ ]
    124     NSColor: #000000 (NSDeviceRGBColorSpace)
    125     NSFont: Times-Roman 16.00 pt.
    126     NSKern: 0pt
    127     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    128     NSStrokeWidth: 0
     329NSParagraphStyle:
     330Alignment 4
     331    LineSpacing: 0
     332    ParagraphSpacing: 0
     333    ParagraphSpacingBefore: 0
     334    HeadIndent: 0
     335    TailIndent: 0
     336    FirstLineHeadIndent: 0
     337    LineHeight: 18/0
     338    LineHeightMultiple: 0
     339    LineBreakMode: 0
     340    Tabs: ()
     341    DefaultTabInterval: 36
     342    Blocks: (null)
     343    Lists: (null)
     344    BaseWritingDirection: 0
     345    HyphenationFactor: 0
     346    TighteningFactor: 0.05
     347    HeaderLevel: 0
     348[ ]
     349    NSFont: Times-Roman 16.00 pt.
     350NSParagraphStyle:
     351Alignment 4
     352    LineSpacing: 0
     353    ParagraphSpacing: 0
     354    ParagraphSpacingBefore: 0
     355    HeadIndent: 0
     356    TailIndent: 0
     357    FirstLineHeadIndent: 0
     358    LineHeight: 23/0
     359    LineHeightMultiple: 0
     360    LineBreakMode: 0
     361    Tabs: ()
     362    DefaultTabInterval: 36
     363    Blocks: (null)
     364    Lists: (null)
     365    BaseWritingDirection: 0
     366    HyphenationFactor: 0
     367    TighteningFactor: 0.05
     368    HeaderLevel: 0
    129369[15pt]
    130     NSColor: #000000 (NSDeviceRGBColorSpace)
    131370    NSFont: Times-Roman 20.00 pt.
    132     NSKern: 0pt
    133     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    134     NSStrokeWidth: 0
    135 [ ]
    136     NSColor: #000000 (NSDeviceRGBColorSpace)
    137     NSFont: Times-Roman 16.00 pt.
    138     NSKern: 0pt
    139     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    140     NSStrokeWidth: 0
     371NSParagraphStyle:
     372Alignment 4
     373    LineSpacing: 0
     374    ParagraphSpacing: 0
     375    ParagraphSpacingBefore: 0
     376    HeadIndent: 0
     377    TailIndent: 0
     378    FirstLineHeadIndent: 0
     379    LineHeight: 18/0
     380    LineHeightMultiple: 0
     381    LineBreakMode: 0
     382    Tabs: ()
     383    DefaultTabInterval: 36
     384    Blocks: (null)
     385    Lists: (null)
     386    BaseWritingDirection: 0
     387    HyphenationFactor: 0
     388    TighteningFactor: 0.05
     389    HeaderLevel: 0
     390[ ]
     391    NSFont: Times-Roman 16.00 pt.
    141392

  • trunk/LayoutTests/platform/mac/editing/attributed-string/font-style-variant-effect-expected.txt

    r176048 r179168  
    1515    TailIndent: 0
    1616    FirstLineHeadIndent: 0
    17     LineHeight: 0/0
     17    LineHeight: 18/0
    1818    LineHeightMultiple: 0
    1919    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac/editing/attributed-string/font-weight-expected.txt

    r176048 r179168  
    2020    TailIndent: 0
    2121    FirstLineHeadIndent: 0
    22     LineHeight: 0/0
     22    LineHeight: 18/0
    2323    LineHeightMultiple: 0
    2424    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac/editing/attributed-string/letter-spacing-expected.txt

    r176048 r179168  
    1111    TailIndent: 0
    1212    FirstLineHeadIndent: 0
    13     LineHeight: 0/0
     13    LineHeight: 18/0
    1414    LineHeightMultiple: 0
    1515    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac/editing/attributed-string/text-decorations-expected.txt

    r176048 r179168  
    1313    TailIndent: 0
    1414    FirstLineHeadIndent: 0
    15     LineHeight: 0/0
     15    LineHeight: 18/0
    1616    LineHeightMultiple: 0
    1717    LineBreakMode: 0

  • trunk/LayoutTests/platform/mac/editing/attributed-string/vertical-align-expected.txt

    r176048 r179168  
    1515    TailIndent: 0
    1616    FirstLineHeadIndent: 0
    17     LineHeight: 0/0
     17    LineHeight: 15/0
    1818    LineHeightMultiple: 0
    1919    LineBreakMode: 0
    … …  
    2727    HeaderLevel: 0
    2828[sup element]
    29     NSColor: #000000 (NSDeviceRGBColorSpace)
    3029    NSFont: Times-Roman 13.00 pt.
    31     NSKern: 0pt
    32     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    33     NSStrokeWidth: 0
     30    NSSuperScript: 1
     31NSParagraphStyle:
     32Alignment 4
     33    LineSpacing: 0
     34    ParagraphSpacing: 0
     35    ParagraphSpacingBefore: 0
     36    HeadIndent: 0
     37    TailIndent: 0
     38    FirstLineHeadIndent: 0
     39    LineHeight: 18/0
     40    LineHeightMultiple: 0
     41    LineBreakMode: 0
     42    Tabs: ()
     43    DefaultTabInterval: 36
     44    Blocks: (null)
     45    Lists: (null)
     46    BaseWritingDirection: 0
     47    HyphenationFactor: 0
     48    TighteningFactor: 0.05
     49    HeaderLevel: 0
     50[ ]
     51    NSFont: Times-Roman 16.00 pt.
     52NSParagraphStyle:
     53Alignment 4
     54    LineSpacing: 0
     55    ParagraphSpacing: 0
     56    ParagraphSpacingBefore: 0
     57    HeadIndent: 0
     58    TailIndent: 0
     59    FirstLineHeadIndent: 0
     60    LineHeight: 15/0
     61    LineHeightMultiple: 0
     62    LineBreakMode: 0
     63    Tabs: ()
     64    DefaultTabInterval: 36
     65    Blocks: (null)
     66    Lists: (null)
     67    BaseWritingDirection: 0
     68    HyphenationFactor: 0
     69    TighteningFactor: 0.05
     70    HeaderLevel: 0
     71[sub element]
     72    NSFont: Times-Roman 13.00 pt.
     73    NSSuperScript: -1
     74NSParagraphStyle:
     75Alignment 4
     76    LineSpacing: 0
     77    ParagraphSpacing: 0
     78    ParagraphSpacingBefore: 0
     79    HeadIndent: 0
     80    TailIndent: 0
     81    FirstLineHeadIndent: 0
     82    LineHeight: 18/0
     83    LineHeightMultiple: 0
     84    LineBreakMode: 0
     85    Tabs: ()
     86    DefaultTabInterval: 36
     87    Blocks: (null)
     88    Lists: (null)
     89    BaseWritingDirection: 0
     90    HyphenationFactor: 0
     91    TighteningFactor: 0.05
     92    HeaderLevel: 0
     93[ ]
     94    NSFont: Times-Roman 16.00 pt.
     95[vertical align super]
     96    NSFont: Times-Roman 16.00 pt.
    3497    NSSuperScript: 1
    3598[ ]
    36     NSColor: #000000 (NSDeviceRGBColorSpace)
    3799    NSFont: Times-Roman 16.00 pt.
    38     NSKern: 0pt
    39     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    40     NSStrokeWidth: 0
    41 [sub element]
    42     NSColor: #000000 (NSDeviceRGBColorSpace)
    43     NSFont: Times-Roman 13.00 pt.
    44     NSKern: 0pt
    45     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    46     NSStrokeWidth: 0
    47     NSSuperScript: -1
    48 [ ]
    49     NSColor: #000000 (NSDeviceRGBColorSpace)
     100[vertical align sub]
    50101    NSFont: Times-Roman 16.00 pt.
    51     NSKern: 0pt
    52     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    53     NSStrokeWidth: 0
    54 [vertical align super]
    55     NSColor: #000000 (NSDeviceRGBColorSpace)
    56     NSFont: Times-Roman 16.00 pt.
    57     NSKern: 0pt
    58     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    59     NSStrokeWidth: 0
    60     NSSuperScript: 1
    61 [ ]
    62     NSColor: #000000 (NSDeviceRGBColorSpace)
    63     NSFont: Times-Roman 16.00 pt.
    64     NSKern: 0pt
    65     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    66     NSStrokeWidth: 0
    67 [vertical align sub]
    68     NSColor: #000000 (NSDeviceRGBColorSpace)
    69     NSFont: Times-Roman 16.00 pt.
    70     NSKern: 0pt
    71     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    72     NSStrokeWidth: 0
    73102    NSSuperScript: -1
    74103[ vertical align 50% ]
    75     NSColor: #000000 (NSDeviceRGBColorSpace)
    76104    NSFont: Times-Roman 16.00 pt.
    77     NSKern: 0pt
    78     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
    79     NSStrokeWidth: 0
    80105

  • trunk/LayoutTests/svg/css/getComputedStyle-basic-expected.txt

    r176258 r179168  
    9999rect: style.getPropertyValue(letter-spacing) : normal
    100100rect: style.getPropertyCSSValue(letter-spacing) : [object CSSPrimitiveValue]
    101 rect: style.getPropertyValue(line-height) : normal
     101rect: style.getPropertyValue(line-height) : 18px
    102102rect: style.getPropertyCSSValue(line-height) : [object CSSPrimitiveValue]
    103103rect: style.getPropertyValue(list-style-image) : none
    … …  
    611611g: style.getPropertyValue(letter-spacing) : normal
    612612g: style.getPropertyCSSValue(letter-spacing) : [object CSSPrimitiveValue]
    613 g: style.getPropertyValue(line-height) : normal
     613g: style.getPropertyValue(line-height) : 18px
    614614g: style.getPropertyCSSValue(line-height) : [object CSSPrimitiveValue]
    615615g: style.getPropertyValue(list-style-image) : none

  • trunk/Source/WebCore/ChangeLog

    r179166 r179168  
     12015-01-26  Sylvain Galineau  <galineau@adobe.com>
     2
     3        The computed value of line-height:normal is incorrect
     4        https://bugs.webkit.org/show_bug.cgi?id=133744
     5
     6        Reviewed by Dean Jackson.
     7
     8        Use font's line spacing as computed line-height value when specified value is 'normal'.
     9        This behavior is compatible with all other engines.
     10
     11        No new tests; all existing tests are updated to reflect the new computed value.
     12
     13        * css/CSSComputedStyleDeclaration.cpp:
     14        (WebCore::lineHeightFromStyle): If line-height wasn't set, use the font's line spacing (same as Blink).
     15
    1162015-01-26  Chris Dumez  <cdumez@apple.com>
    217

  • trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp

    r179017 r179168  
    15131513{
    15141514    Length length = style->lineHeight();
    1515     if (length.isNegative())
    1516         return cssValuePool().createIdentifierValue(CSSValueNormal);
     1515    if (length.isNegative()) // If true, line-height not set; use the font's line spacing.
     1516        return zoomAdjustedPixelValue(style->fontMetrics().floatLineSpacing(), style);
    15171517    if (length.isPercentNotCalculated()) {
    15181518        // This is imperfect, because it doesn't include the zoom factor and the real computation
Note: See TracChangeset for help on using the changeset viewer.