Changeset 53450 in webkit


Ignore:
Timestamp:
Jan 18, 2010 6:59:21 PM (14 years ago)
Author:
mitz@apple.com
Message:

Rubber-stamped by Sam Weinig.

<rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change

WebCore:

Reverted r49567.

  • css/CSSComputedStyleDeclaration.cpp:

(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

  • rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::computeLogicalBoxHeights):

  • rendering/RenderBR.cpp:

(WebCore::RenderBR::lineHeight):

  • rendering/style/RenderStyle.h:

(WebCore::InheritedFlags::computedLineHeight):

LayoutTests:

Reverted r49567, but left in the test added in that revision, now with a failing result.

  • css1/font_properties/font.html:
  • fast/css/line-height-rounding-expected.txt:
  • platform/mac/css1/font_properties/font-expected.txt:
  • platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt:
  • platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt:
  • platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt:
  • platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt:
  • platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum:
  • platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
  • platform/mac/svg/custom/svg-fonts-in-html-expected.checksum:
  • platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r53448 r53450  
     12010-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Rubber-stamped by Sam Weinig.
     4
     5        <rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change
     6
     7        Reverted r49567, but left in the test added in that revision, now with a failing result.
     8
     9        * css1/font_properties/font.html:
     10        * fast/css/line-height-rounding-expected.txt:
     11        * platform/mac/css1/font_properties/font-expected.txt:
     12        * platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt:
     13        * platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt:
     14        * platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt:
     15        * platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt:
     16        * platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum:
     17        * platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt:
     18        * platform/mac/svg/custom/svg-fonts-in-html-expected.checksum:
     19        * platform/mac/svg/custom/svg-fonts-in-html-expected.txt:
     20
    1212010-01-18  Yuzo Fujishima  <yuzo@google.com>
    222
  • trunk/LayoutTests/css1/font_properties/font.html

    r49567 r53450  
    6969</P>
    7070<P class="ten">
    71 This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px.  Extra text is included for the purposes of testing this more effectively.
     71This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px.  Extra text is included for the purposes of testing this more effectively.
    7272</P>
    7373
     
    115115</P>
    116116<P class="ten">
    117 This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px.  Extra text is included for the purposes of testing this more effectively.
     117This element should be in a sans-serif font, with a weight of 400.  Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px.  Extra text is included for the purposes of testing this more effectively.
    118118</P>
    119119
  • trunk/LayoutTests/fast/css/line-height-rounding-expected.txt

    r49567 r53450  
    11This tests non-integer line height is rounded to the nearest integer.
    22
    3 Test passed.
     3Test failed:
     4FAIL: font size: 10px; line height percent: 1.05; expected line height: 11px; actual line height: 10px
     5
  • trunk/LayoutTests/platform/mac/css1/font_properties/font-expected.txt

    r49567 r53450  
    1 layer at (0,0) size 785x4268
     1layer at (0,0) size 785x4266
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x4268
    4   RenderBlock {HTML} at (0,0) size 785x4268
    5     RenderBody {BODY} at (8,8) size 769x4252 [bgcolor=#CCCCCC]
     3layer at (0,0) size 785x4266
     4  RenderBlock {HTML} at (0,0) size 785x4266
     5    RenderBody {BODY} at (8,8) size 769x4250 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 769x14
    77        RenderText {#text} at (0,0) size 264x14
     
    107107          text run at (0,115) width 93: "effectively."
    108108      RenderBlock {P} at (0,1519) size 769x50
    109         RenderText {#text} at (0,6) size 751x37
     109        RenderText {#text} at (0,6) size 754x37
    110110          text run at (0,6) width 301: "This element should be in a sans-serif font, with a weight of 400. "
    111           text run at (301,6) width 450: "Its font-size should be 80% of 12px, or 10px, and its line-height shoud be 2.5 times that, or 25px."
     111          text run at (301,6) width 453: "Its font-size should be 80% of 12px, or 9.6px, and its line-height shoud be 2.5 times that, or 24px."
    112112          text run at (0,31) width 318: "Extra text is included for the purposes of testing this more effectively."
    113113      RenderBlock {P} at (0,1587) size 769x216
     
    120120            text run at (0,178) width 679: "on an inline element and should therefore only cover the text, not the interline spacing."
    121121        RenderText {#text} at (0,0) size 0x0
    122       RenderTable {TABLE} at (0,1821) size 769x2431 [border: (1px outset #808080)]
    123         RenderTableSection {TBODY} at (1,1) size 767x2429
     122      RenderTable {TABLE} at (0,1821) size 769x2429 [border: (1px outset #808080)]
     123        RenderTableSection {TBODY} at (1,1) size 767x2427
    124124          RenderTableRow {TR} at (0,0) size 767x26
    125125            RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     
    127127                RenderText {#text} at (4,4) size 163x18
    128128                  text run at (4,4) width 163: "TABLE Testing Section"
    129           RenderTableRow {TR} at (0,26) size 767x2403
    130             RenderTableCell {TD} at (0,1214) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     129          RenderTableRow {TR} at (0,26) size 767x2401
     130            RenderTableCell {TD} at (0,1213) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    131131              RenderText {#text} at (4,4) size 4x18
    132132                text run at (4,4) width 4: " "
    133             RenderTableCell {TD} at (12,26) size 755x2403 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     133            RenderTableCell {TD} at (12,26) size 755x2401 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    134134              RenderBlock {P} at (4,4) size 747x36
    135135                RenderText {#text} at (0,0) size 732x36
     
    209209                  text run at (176,79) width 500: "Extra text is included for the purposes of testing this more"
    210210                  text run at (0,115) width 93: "effectively."
    211               RenderBlock {P} at (4,1877) size 747x66
    212                 RenderText {#text} at (0,9) size 745x48
    213                   text run at (0,9) width 378: "This element should be in a sans-serif font, with a weight of 400. "
    214                   text run at (378,9) width 367: "Its font-size should be 80% of 12px, or 10px, and its line-height"
    215                   text run at (0,42) width 196: "shoud be 2.5 times that, or 25px. "
    216                   text run at (196,42) width 405: "Extra text is included for the purposes of testing this more effectively."
    217               RenderBlock {P} at (4,1967) size 747x432
     211              RenderBlock {P} at (4,1877) size 747x64
     212                RenderText {#text} at (0,8) size 714x47
     213                  text run at (0,8) width 378: "This element should be in a sans-serif font, with a weight of 400. "
     214                  text run at (378,8) width 336: "Its font-size should be 80% of 12px, or 9.6px, and its line-"
     215                  text run at (0,40) width 235: "height shoud be 2.5 times that, or 24px. "
     216                  text run at (235,40) width 405: "Extra text is included for the purposes of testing this more effectively."
     217              RenderBlock {P} at (4,1965) size 747x432
    218218                RenderInline {SPAN} at (0,0) size 716x388 [bgcolor=#C0C0C0]
    219219                  RenderText {#text} at (0,22) size 716x388
  • trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-00-d-expected.txt

    r49567 r53450  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x501
    4   RenderBlock {HTML} at (0,0) size 800x501
    5     RenderBody {BODY} at (8,16) size 784x469
     3layer at (0,0) size 800x484
     4  RenderBlock {HTML} at (0,0) size 800x484
     5    RenderBody {BODY} at (8,16) size 784x452
    66      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
    77        RenderText {#text} at (0,0) size 778x54
     
    1313          text run at (0,36) width 111: "the bottom of the "
    1414          text run at (111,36) width 137: "respective small box)."
    15       RenderBlock {DIV} at (16,70) size 752x399 [color=#C0C0C0] [border: (5px solid #800080)]
     15      RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
    1616        RenderText {#text} at (171,22) size 474x18
    1717          text run at (171,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     
    2121        RenderText {#text} at (663,22) size 4x18
    2222          text run at (663,22) width 4: " "
    23         RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
     23        RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
    2424          RenderText {#text} at (19,20) size 48x18
    2525            text run at (19,20) width 48: "AAAA"
    26         RenderText {#text} at (667,22) size 544x39
     26        RenderText {#text} at (667,22) size 544x38
    2727          text run at (667,22) width 48: "dummy"
    28           text run at (171,43) width 422: "text dummy text dummy text dummy text dummy text dummy text "
     28          text run at (171,42) width 422: "text dummy text dummy text dummy text dummy text dummy text "
    2929        RenderInline {SPAN} at (0,0) size 17x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
    30           RenderText {#text} at (596,43) size 11x18
    31             text run at (596,43) width 11: "B"
    32         RenderText {#text} at (610,43) size 4x18
    33           text run at (610,43) width 4: " "
    34         RenderBlock (floating) {P} at (581,63) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
     30          RenderText {#text} at (596,42) size 11x18
     31            text run at (596,42) width 11: "B"
     32        RenderText {#text} at (610,42) size 4x18
     33          text run at (610,42) width 4: " "
     34        RenderBlock (floating) {P} at (581,61) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
    3535          RenderText {#text} at (19,20) size 44x18
    3636            text run at (19,20) width 44: "BBBB"
    37         RenderText {#text} at (614,43) size 707x333
    38           text run at (614,43) width 75: "dummy text"
    39           text run at (171,64) width 391: "dummy text dummy text dummy text dummy text dummy text"
    40           text run at (21,85) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    41           text run at (495,85) width 75: "dummy text"
    42           text run at (21,106) width 395: "dummy text dummy text dummy text dummy text dummy text "
    43           text run at (416,106) width 154: "dummy text dummy text"
    44           text run at (21,127) width 316: "dummy text dummy text dummy text dummy text "
    45           text run at (337,127) width 391: "dummy text dummy text dummy text dummy text dummy text"
    46           text run at (21,148) width 79: "dummy text "
    47           text run at (100,148) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    48           text run at (574,148) width 154: "dummy text dummy text"
    49           text run at (21,169) width 316: "dummy text dummy text dummy text dummy text "
    50           text run at (337,169) width 391: "dummy text dummy text dummy text dummy text dummy text"
    51           text run at (21,190) width 79: "dummy text "
    52           text run at (100,190) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    53           text run at (574,190) width 154: "dummy text dummy text"
    54           text run at (21,211) width 316: "dummy text dummy text dummy text dummy text "
    55           text run at (337,211) width 391: "dummy text dummy text dummy text dummy text dummy text"
    56           text run at (21,232) width 79: "dummy text "
    57           text run at (100,232) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    58           text run at (574,232) width 154: "dummy text dummy text"
    59           text run at (21,253) width 316: "dummy text dummy text dummy text dummy text "
    60           text run at (337,253) width 391: "dummy text dummy text dummy text dummy text dummy text"
    61           text run at (21,274) width 79: "dummy text "
    62           text run at (100,274) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    63           text run at (574,274) width 154: "dummy text dummy text"
    64           text run at (21,295) width 316: "dummy text dummy text dummy text dummy text "
    65           text run at (337,295) width 391: "dummy text dummy text dummy text dummy text dummy text"
    66           text run at (21,316) width 79: "dummy text "
    67           text run at (100,316) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    68           text run at (574,316) width 154: "dummy text dummy text"
    69           text run at (21,337) width 316: "dummy text dummy text dummy text dummy text "
    70           text run at (337,337) width 391: "dummy text dummy text dummy text dummy text dummy text"
    71           text run at (21,358) width 75: "dummy text"
     37        RenderText {#text} at (614,42) size 707x318
     38          text run at (614,42) width 75: "dummy text"
     39          text run at (171,62) width 391: "dummy text dummy text dummy text dummy text dummy text"
     40          text run at (21,82) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     41          text run at (495,82) width 75: "dummy text"
     42          text run at (21,102) width 395: "dummy text dummy text dummy text dummy text dummy text "
     43          text run at (416,102) width 154: "dummy text dummy text"
     44          text run at (21,122) width 316: "dummy text dummy text dummy text dummy text "
     45          text run at (337,122) width 391: "dummy text dummy text dummy text dummy text dummy text"
     46          text run at (21,142) width 79: "dummy text "
     47          text run at (100,142) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     48          text run at (574,142) width 154: "dummy text dummy text"
     49          text run at (21,162) width 316: "dummy text dummy text dummy text dummy text "
     50          text run at (337,162) width 391: "dummy text dummy text dummy text dummy text dummy text"
     51          text run at (21,182) width 79: "dummy text "
     52          text run at (100,182) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     53          text run at (574,182) width 154: "dummy text dummy text"
     54          text run at (21,202) width 316: "dummy text dummy text dummy text dummy text "
     55          text run at (337,202) width 391: "dummy text dummy text dummy text dummy text dummy text"
     56          text run at (21,222) width 79: "dummy text "
     57          text run at (100,222) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     58          text run at (574,222) width 154: "dummy text dummy text"
     59          text run at (21,242) width 316: "dummy text dummy text dummy text dummy text "
     60          text run at (337,242) width 391: "dummy text dummy text dummy text dummy text dummy text"
     61          text run at (21,262) width 79: "dummy text "
     62          text run at (100,262) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     63          text run at (574,262) width 154: "dummy text dummy text"
     64          text run at (21,282) width 316: "dummy text dummy text dummy text dummy text "
     65          text run at (337,282) width 391: "dummy text dummy text dummy text dummy text dummy text"
     66          text run at (21,302) width 79: "dummy text "
     67          text run at (100,302) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     68          text run at (574,302) width 154: "dummy text dummy text"
     69          text run at (21,322) width 316: "dummy text dummy text dummy text dummy text "
     70          text run at (337,322) width 391: "dummy text dummy text dummy text dummy text dummy text"
     71          text run at (21,342) width 75: "dummy text"
  • trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-01-d-g-expected.txt

    r49567 r53450  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x503
    4   RenderBlock {HTML} at (0,0) size 800x503
    5     RenderBody {BODY} at (8,16) size 784x471
     3layer at (0,0) size 800x484
     4  RenderBlock {HTML} at (0,0) size 800x484
     5    RenderBody {BODY} at (8,16) size 784x452
    66      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
    77        RenderText {#text} at (0,0) size 769x54
     
    1313          text run at (0,36) width 104: "respective small "
    1414          text run at (104,36) width 33: "box)."
    15       RenderBlock {DIV} at (16,70) size 752x401 [color=#C0C0C0] [border: (5px solid #800080)]
    16         RenderText {#text} at (133,23) size 474x18
    17           text run at (133,23) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     15      RenderBlock {DIV} at (16,70) size 752x382 [color=#C0C0C0] [border: (5px solid #800080)]
     16        RenderText {#text} at (133,22) size 474x18
     17          text run at (133,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    1818        RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
    19           RenderText {#text} at (610,23) size 16x18
    20             text run at (610,23) width 16: "\x{21E6}"
    21         RenderText {#text} at (629,23) size 4x18
    22           text run at (629,23) width 4: " "
     19          RenderText {#text} at (610,22) size 16x18
     20            text run at (610,22) width 16: "\x{21E6}"
     21        RenderText {#text} at (629,22) size 4x18
     22          text run at (629,22) width 4: " "
    2323        RenderImage {IMG} at (21,21) size 112x112 [color=#FF0000]
    24         RenderText {#text} at (633,23) size 575x40
    25           text run at (633,23) width 75: "dummy text"
    26           text run at (133,45) width 395: "dummy text dummy text dummy text dummy text dummy text "
     24        RenderText {#text} at (633,22) size 575x38
     25          text run at (633,22) width 75: "dummy text"
     26          text run at (133,42) width 395: "dummy text dummy text dummy text dummy text dummy text "
    2727        RenderInline {SPAN} at (0,0) size 22x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
    28           RenderText {#text} at (531,45) size 16x18
    29             text run at (531,45) width 16: "\x{21E8}"
    30         RenderText {#text} at (550,45) size 4x18
    31           text run at (550,45) width 4: " "
    32         RenderImage {IMG} at (619,43) size 112x112 [color=#FF0000]
    33         RenderText {#text} at (554,45) size 707x333
    34           text run at (554,45) width 48: "dummy"
    35           text run at (133,66) width 422: "text dummy text dummy text dummy text dummy text dummy text "
    36           text run at (555,66) width 48: "dummy"
    37           text run at (133,87) width 422: "text dummy text dummy text dummy text dummy text dummy text "
    38           text run at (555,87) width 48: "dummy"
    39           text run at (133,108) width 422: "text dummy text dummy text dummy text dummy text dummy text "
    40           text run at (555,108) width 48: "dummy"
    41           text run at (133,129) width 422: "text dummy text dummy text dummy text dummy text dummy text "
    42           text run at (555,129) width 48: "dummy"
    43           text run at (21,150) width 422: "text dummy text dummy text dummy text dummy text dummy text "
    44           text run at (443,150) width 154: "dummy text dummy text"
    45           text run at (21,171) width 316: "dummy text dummy text dummy text dummy text "
    46           text run at (337,171) width 391: "dummy text dummy text dummy text dummy text dummy text"
    47           text run at (21,192) width 79: "dummy text "
    48           text run at (100,192) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    49           text run at (574,192) width 154: "dummy text dummy text"
    50           text run at (21,213) width 316: "dummy text dummy text dummy text dummy text "
    51           text run at (337,213) width 391: "dummy text dummy text dummy text dummy text dummy text"
    52           text run at (21,234) width 79: "dummy text "
    53           text run at (100,234) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    54           text run at (574,234) width 154: "dummy text dummy text"
    55           text run at (21,255) width 316: "dummy text dummy text dummy text dummy text "
    56           text run at (337,255) width 391: "dummy text dummy text dummy text dummy text dummy text"
    57           text run at (21,276) width 79: "dummy text "
    58           text run at (100,276) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    59           text run at (574,276) width 154: "dummy text dummy text"
    60           text run at (21,297) width 316: "dummy text dummy text dummy text dummy text "
    61           text run at (337,297) width 391: "dummy text dummy text dummy text dummy text dummy text"
    62           text run at (21,318) width 79: "dummy text "
    63           text run at (100,318) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    64           text run at (574,318) width 154: "dummy text dummy text"
    65           text run at (21,339) width 316: "dummy text dummy text dummy text dummy text "
    66           text run at (337,339) width 391: "dummy text dummy text dummy text dummy text dummy text"
    67           text run at (21,360) width 75: "dummy text"
     28          RenderText {#text} at (531,42) size 16x18
     29            text run at (531,42) width 16: "\x{21E8}"
     30        RenderText {#text} at (550,42) size 4x18
     31          text run at (550,42) width 4: " "
     32        RenderImage {IMG} at (619,41) size 112x112 [color=#FF0000]
     33        RenderText {#text} at (554,42) size 707x318
     34          text run at (554,42) width 48: "dummy"
     35          text run at (133,62) width 422: "text dummy text dummy text dummy text dummy text dummy text "
     36          text run at (555,62) width 48: "dummy"
     37          text run at (133,82) width 422: "text dummy text dummy text dummy text dummy text dummy text "
     38          text run at (555,82) width 48: "dummy"
     39          text run at (133,102) width 422: "text dummy text dummy text dummy text dummy text dummy text "
     40          text run at (555,102) width 48: "dummy"
     41          text run at (133,122) width 422: "text dummy text dummy text dummy text dummy text dummy text "
     42          text run at (555,122) width 48: "dummy"
     43          text run at (21,142) width 422: "text dummy text dummy text dummy text dummy text dummy text "
     44          text run at (443,142) width 154: "dummy text dummy text"
     45          text run at (21,162) width 316: "dummy text dummy text dummy text dummy text "
     46          text run at (337,162) width 391: "dummy text dummy text dummy text dummy text dummy text"
     47          text run at (21,182) width 79: "dummy text "
     48          text run at (100,182) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     49          text run at (574,182) width 154: "dummy text dummy text"
     50          text run at (21,202) width 316: "dummy text dummy text dummy text dummy text "
     51          text run at (337,202) width 391: "dummy text dummy text dummy text dummy text dummy text"
     52          text run at (21,222) width 79: "dummy text "
     53          text run at (100,222) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     54          text run at (574,222) width 154: "dummy text dummy text"
     55          text run at (21,242) width 316: "dummy text dummy text dummy text dummy text "
     56          text run at (337,242) width 391: "dummy text dummy text dummy text dummy text dummy text"
     57          text run at (21,262) width 79: "dummy text "
     58          text run at (100,262) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     59          text run at (574,262) width 154: "dummy text dummy text"
     60          text run at (21,282) width 316: "dummy text dummy text dummy text dummy text "
     61          text run at (337,282) width 391: "dummy text dummy text dummy text dummy text dummy text"
     62          text run at (21,302) width 79: "dummy text "
     63          text run at (100,302) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     64          text run at (574,302) width 154: "dummy text dummy text"
     65          text run at (21,322) width 316: "dummy text dummy text dummy text dummy text "
     66          text run at (337,322) width 391: "dummy text dummy text dummy text dummy text dummy text"
     67          text run at (21,342) width 75: "dummy text"
  • trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-02-d-expected.txt

    r49567 r53450  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x564
    4   RenderBlock {HTML} at (0,0) size 800x564
    5     RenderBody {BODY} at (8,16) size 784x532
     3layer at (0,0) size 800x544
     4  RenderBlock {HTML} at (0,0) size 800x544
     5    RenderBody {BODY} at (8,16) size 784x512
    66      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
    77        RenderText {#text} at (0,0) size 778x54
     
    1313          text run at (0,36) width 121: "possible below the "
    1414          text run at (121,36) width 70: "small box)."
    15       RenderBlock {DIV} at (16,70) size 752x462 [color=#C0C0C0] [border: (5px solid #800080)]
     15      RenderBlock {DIV} at (16,70) size 752x442 [color=#C0C0C0] [border: (5px solid #800080)]
    1616        RenderText {#text} at (21,22) size 553x18
    1717          text run at (21,22) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     
    2222        RenderText {#text} at (592,22) size 4x18
    2323          text run at (592,22) width 4: " "
    24         RenderBlock (floating) {P} at (21,42) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
     24        RenderBlock (floating) {P} at (21,41) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
    2525          RenderText {#text} at (19,20) size 48x18
    2626            text run at (19,20) width 48: "AAAA"
    27         RenderText {#text} at (596,22) size 552x39
     27        RenderText {#text} at (596,22) size 552x38
    2828          text run at (596,22) width 127: "dummy text dummy"
    29           text run at (171,43) width 343: "text dummy text dummy text dummy text dummy text "
     29          text run at (171,42) width 343: "text dummy text dummy text dummy text dummy text "
    3030        RenderInline {SPAN} at (0,0) size 14x24 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
    31           RenderText {#text} at (517,43) size 11x18
    32             text run at (517,43) width 11: "B"
     31          RenderText {#text} at (517,42) size 11x18
     32            text run at (517,42) width 11: "B"
    3333        RenderText {#text} at (0,0) size 0x0
    34         RenderBlock (floating) {P} at (581,42) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
     34        RenderBlock (floating) {P} at (581,41) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
    3535          RenderText {#text} at (19,20) size 44x18
    3636            text run at (19,20) width 44: "BBBB"
    37         RenderText {#text} at (321,64) size 237x18
    38           text run at (321,64) width 237: "dummy text dummy text dummy text "
     37        RenderText {#text} at (321,62) size 237x18
     38          text run at (321,62) width 237: "dummy text dummy text dummy text "
    3939        RenderInline {SPAN} at (0,0) size 14x24 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
    40           RenderText {#text} at (561,64) size 11x18
    41             text run at (561,64) width 11: "C"
     40          RenderText {#text} at (561,62) size 11x18
     41            text run at (561,62) width 11: "C"
    4242        RenderText {#text} at (0,0) size 0x0
    43         RenderBlock (floating) {P} at (171,63) size 150x59 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
     43        RenderBlock (floating) {P} at (171,61) size 150x58 [color=#FFFFFF] [bgcolor=#FFA500] [border: (3px solid #FFFF00)]
    4444          RenderText {#text} at (19,20) size 44x18
    4545            text run at (19,20) width 44: "CCCC"
    46         RenderText {#text} at (321,85) size 387x39
    47           text run at (321,85) width 233: "dummy text dummy text dummy text"
    48           text run at (471,106) width 237: "dummy text dummy text dummy text "
     46        RenderText {#text} at (321,82) size 387x38
     47          text run at (321,82) width 233: "dummy text dummy text dummy text"
     48          text run at (471,102) width 237: "dummy text dummy text dummy text "
    4949        RenderInline {SPAN} at (0,0) size 15x24 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
    50           RenderText {#text} at (711,106) size 12x18
    51             text run at (711,106) width 12: "D"
     50          RenderText {#text} at (711,102) size 12x18
     51            text run at (711,102) width 12: "D"
    5252        RenderText {#text} at (0,0) size 0x0
    53         RenderBlock (floating) {P} at (321,105) size 150x59 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
     53        RenderBlock (floating) {P} at (321,101) size 150x58 [color=#FFFFFF] [bgcolor=#008000] [border: (3px solid #00FF00)]
    5454          RenderText {#text} at (19,20) size 48x18
    5555            text run at (19,20) width 48: "DDDD"
    56         RenderText {#text} at (471,127) size 707x312
    57           text run at (471,127) width 233: "dummy text dummy text dummy text"
    58           text run at (471,148) width 233: "dummy text dummy text dummy text"
    59           text run at (21,169) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    60           text run at (495,169) width 233: "dummy text dummy text dummy text"
    61           text run at (21,190) width 237: "dummy text dummy text dummy text "
    62           text run at (258,190) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
    63           text run at (21,211) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    64           text run at (495,211) width 233: "dummy text dummy text dummy text"
    65           text run at (21,232) width 237: "dummy text dummy text dummy text "
    66           text run at (258,232) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
    67           text run at (21,253) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    68           text run at (495,253) width 233: "dummy text dummy text dummy text"
    69           text run at (21,274) width 237: "dummy text dummy text dummy text "
    70           text run at (258,274) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
    71           text run at (21,295) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    72           text run at (495,295) width 233: "dummy text dummy text dummy text"
    73           text run at (21,316) width 237: "dummy text dummy text dummy text "
    74           text run at (258,316) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
    75           text run at (21,337) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    76           text run at (495,337) width 233: "dummy text dummy text dummy text"
    77           text run at (21,358) width 237: "dummy text dummy text dummy text "
    78           text run at (258,358) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
    79           text run at (21,379) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    80           text run at (495,379) width 233: "dummy text dummy text dummy text"
    81           text run at (21,400) width 237: "dummy text dummy text dummy text "
    82           text run at (258,400) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
    83           text run at (21,421) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     56        RenderText {#text} at (471,122) size 707x298
     57          text run at (471,122) width 233: "dummy text dummy text dummy text"
     58          text run at (471,142) width 233: "dummy text dummy text dummy text"
     59          text run at (21,162) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     60          text run at (495,162) width 233: "dummy text dummy text dummy text"
     61          text run at (21,182) width 237: "dummy text dummy text dummy text "
     62          text run at (258,182) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     63          text run at (21,202) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     64          text run at (495,202) width 233: "dummy text dummy text dummy text"
     65          text run at (21,222) width 237: "dummy text dummy text dummy text "
     66          text run at (258,222) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     67          text run at (21,242) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     68          text run at (495,242) width 233: "dummy text dummy text dummy text"
     69          text run at (21,262) width 237: "dummy text dummy text dummy text "
     70          text run at (258,262) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     71          text run at (21,282) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     72          text run at (495,282) width 233: "dummy text dummy text dummy text"
     73          text run at (21,302) width 237: "dummy text dummy text dummy text "
     74          text run at (258,302) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     75          text run at (21,322) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     76          text run at (495,322) width 233: "dummy text dummy text dummy text"
     77          text run at (21,342) width 237: "dummy text dummy text dummy text "
     78          text run at (258,342) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     79          text run at (21,362) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     80          text run at (495,362) width 233: "dummy text dummy text dummy text"
     81          text run at (21,382) width 237: "dummy text dummy text dummy text "
     82          text run at (258,382) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
     83          text run at (21,402) width 470: "dummy text dummy text dummy text dummy text dummy text dummy text"
  • trunk/LayoutTests/platform/mac/css2.1/t090501-c414-flt-ln-03-d-expected.txt

    r49567 r53450  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x480
    4   RenderBlock {HTML} at (0,0) size 800x480
    5     RenderBody {BODY} at (8,16) size 784x448
     3layer at (0,0) size 800x464
     4  RenderBlock {HTML} at (0,0) size 800x464
     5    RenderBody {BODY} at (8,16) size 784x432
    66      RenderBlock {P} at (0,0) size 784x54 [color=#000080]
    77        RenderText {#text} at (0,0) size 778x54
     
    1313          text run at (0,36) width 121: "possible below the "
    1414          text run at (121,36) width 70: "small box)."
    15       RenderBlock {DIV} at (16,70) size 752x378 [color=#C0C0C0] [border: (5px solid #800080)]
     15      RenderBlock {DIV} at (16,70) size 752x362 [color=#C0C0C0] [border: (5px solid #800080)]
    1616        RenderText {#text} at (171,22) size 316x18
    1717          text run at (171,22) width 316: "dummy text dummy text dummy text dummy text "
     
    2121        RenderText {#text} at (505,22) size 4x18
    2222          text run at (505,22) width 4: " "
    23         RenderBlock (floating) {P} at (21,21) size 150x59 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
     23        RenderBlock (floating) {P} at (21,21) size 150x58 [color=#FFFFFF] [bgcolor=#008080] [border: (3px solid #00FFFF)]
    2424          RenderText {#text} at (19,20) size 48x18
    2525            text run at (19,20) width 48: "AAAA"
     
    3030        RenderText {#text} at (526,22) size 4x18
    3131          text run at (526,22) width 4: " "
    32         RenderBlock (floating) {P} at (581,21) size 150x59 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
     32        RenderBlock (floating) {P} at (581,21) size 150x58 [color=#FFFFFF] [bgcolor=#800080] [border: (3px solid #FF00FF)]
    3333          RenderText {#text} at (19,20) size 44x18
    3434            text run at (19,20) width 44: "BBBB"
    35         RenderText {#text} at (530,22) size 707x333
     35        RenderText {#text} at (530,22) size 707x318
    3636          text run at (530,22) width 48: "dummy"
    37           text run at (171,43) width 391: "text dummy text dummy text dummy text dummy text dummy"
    38           text run at (171,64) width 27: "text "
    39           text run at (198,64) width 364: "dummy text dummy text dummy text dummy text dummy"
    40           text run at (21,85) width 106: "text dummy text "
    41           text run at (127,85) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    42           text run at (601,85) width 127: "dummy text dummy"
    43           text run at (21,106) width 343: "text dummy text dummy text dummy text dummy text "
    44           text run at (364,106) width 364: "dummy text dummy text dummy text dummy text dummy"
    45           text run at (21,127) width 106: "text dummy text "
    46           text run at (127,127) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    47           text run at (601,127) width 127: "dummy text dummy"
    48           text run at (21,148) width 343: "text dummy text dummy text dummy text dummy text "
    49           text run at (364,148) width 364: "dummy text dummy text dummy text dummy text dummy"
    50           text run at (21,169) width 106: "text dummy text "
    51           text run at (127,169) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    52           text run at (601,169) width 127: "dummy text dummy"
    53           text run at (21,190) width 343: "text dummy text dummy text dummy text dummy text "
    54           text run at (364,190) width 364: "dummy text dummy text dummy text dummy text dummy"
    55           text run at (21,211) width 106: "text dummy text "
    56           text run at (127,211) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    57           text run at (601,211) width 127: "dummy text dummy"
    58           text run at (21,232) width 343: "text dummy text dummy text dummy text dummy text "
    59           text run at (364,232) width 364: "dummy text dummy text dummy text dummy text dummy"
    60           text run at (21,253) width 106: "text dummy text "
    61           text run at (127,253) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    62           text run at (601,253) width 127: "dummy text dummy"
    63           text run at (21,274) width 343: "text dummy text dummy text dummy text dummy text "
    64           text run at (364,274) width 364: "dummy text dummy text dummy text dummy text dummy"
    65           text run at (21,295) width 106: "text dummy text "
    66           text run at (127,295) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
    67           text run at (601,295) width 127: "dummy text dummy"
    68           text run at (21,316) width 343: "text dummy text dummy text dummy text dummy text "
    69           text run at (364,316) width 364: "dummy text dummy text dummy text dummy text dummy"
    70           text run at (21,337) width 102: "text dummy text"
     37          text run at (171,42) width 391: "text dummy text dummy text dummy text dummy text dummy"
     38          text run at (171,62) width 27: "text "
     39          text run at (198,62) width 364: "dummy text dummy text dummy text dummy text dummy"
     40          text run at (21,82) width 106: "text dummy text "
     41          text run at (127,82) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     42          text run at (601,82) width 127: "dummy text dummy"
     43          text run at (21,102) width 343: "text dummy text dummy text dummy text dummy text "
     44          text run at (364,102) width 364: "dummy text dummy text dummy text dummy text dummy"
     45          text run at (21,122) width 106: "text dummy text "
     46          text run at (127,122) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     47          text run at (601,122) width 127: "dummy text dummy"
     48          text run at (21,142) width 343: "text dummy text dummy text dummy text dummy text "
     49          text run at (364,142) width 364: "dummy text dummy text dummy text dummy text dummy"
     50          text run at (21,162) width 106: "text dummy text "
     51          text run at (127,162) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     52          text run at (601,162) width 127: "dummy text dummy"
     53          text run at (21,182) width 343: "text dummy text dummy text dummy text dummy text "
     54          text run at (364,182) width 364: "dummy text dummy text dummy text dummy text dummy"
     55          text run at (21,202) width 106: "text dummy text "
     56          text run at (127,202) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     57          text run at (601,202) width 127: "dummy text dummy"
     58          text run at (21,222) width 343: "text dummy text dummy text dummy text dummy text "
     59          text run at (364,222) width 364: "dummy text dummy text dummy text dummy text dummy"
     60          text run at (21,242) width 106: "text dummy text "
     61          text run at (127,242) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     62          text run at (601,242) width 127: "dummy text dummy"
     63          text run at (21,262) width 343: "text dummy text dummy text dummy text dummy text "
     64          text run at (364,262) width 364: "dummy text dummy text dummy text dummy text dummy"
     65          text run at (21,282) width 106: "text dummy text "
     66          text run at (127,282) width 474: "dummy text dummy text dummy text dummy text dummy text dummy text "
     67          text run at (601,282) width 127: "dummy text dummy"
     68          text run at (21,302) width 343: "text dummy text dummy text dummy text dummy text "
     69          text run at (364,302) width 364: "dummy text dummy text dummy text dummy text dummy"
     70          text run at (21,322) width 102: "text dummy text"
  • trunk/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum

    r49567 r53450  
    1 53f3eb75f9a6563791fa4d8613d7f46c
     102d6337b033863d06052de3b78597d86
  • trunk/LayoutTests/platform/mac/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt

    r52947 r53450  
    1 layer at (0,0) size 1026x1035
     1layer at (0,0) size 1026x1014
    22  RenderView at (0,0) size 785x585
    3 layer at (0,0) size 1026x1035
    4   RenderBlock {HTML} at (0,0) size 785x1035
    5     RenderBody {BODY} at (8,16) size 769x1015
    6       RenderBlock {DIV} at (16,0) size 737x63
    7         RenderBlock {P} at (0,0) size 737x21
     3layer at (0,0) size 1026x1014
     4  RenderBlock {HTML} at (0,0) size 785x1014
     5    RenderBody {BODY} at (8,16) size 769x994
     6      RenderBlock {DIV} at (16,0) size 737x60
     7        RenderBlock {P} at (0,0) size 737x20
    88          RenderInline {A} at (0,0) size 90x18 [color=#0000EE]
    99            RenderText {#text} at (267,1) size 90x18
     
    1414            RenderText {#text} at (368,1) size 102x18
    1515              text run at (368,1) width 102: "Basic version"
    16         RenderBlock {P} at (0,21) size 737x21
     16        RenderBlock {P} at (0,20) size 737x20
    1717          RenderText {#text} at (182,1) size 143x18
    1818            text run at (182,1) width 143: "Specification link: "
     
    2020            RenderText {#text} at (325,1) size 230x18
    2121              text run at (325,1) width 230: "3.4 How groups are rendered"
    22         RenderBlock {P} at (0,42) size 737x21
     22        RenderBlock {P} at (0,40) size 737x20
    2323          RenderInline {A} at (0,0) size 206x18 [color=#0000EE]
    2424            RenderText {#text} at (148,1) size 206x18
     
    3535              text run at (408,1) width 180: "\x{2192} script-handle-01-b"
    3636          RenderText {#text} at (0,0) size 0x0
    37       RenderTable {TABLE} at (0,67) size 1018x552
    38         RenderTableSection {TBODY} at (0,0) size 1018x552
    39           RenderTableRow {TR} at (0,0) size 1018x552
    40             RenderTableCell {TD} at (0,0) size 1018x552 [r=0 c=0 rs=1 cs=3]
    41               RenderTable {TABLE} at (10,10) size 998x532
    42                 RenderTableSection {TBODY} at (0,0) size 998x532
     37      RenderTable {TABLE} at (0,64) size 1018x550
     38        RenderTableSection {TBODY} at (0,0) size 1018x550
     39          RenderTableRow {TR} at (0,0) size 1018x550
     40            RenderTableCell {TD} at (0,0) size 1018x550 [r=0 c=0 rs=1 cs=3]
     41              RenderTable {TABLE} at (10,10) size 998x530
     42                RenderTableSection {TBODY} at (0,0) size 998x530
    4343                  RenderTableRow {TR} at (0,2) size 998x106
    4444                    RenderTableCell {TD} at (2,2) size 994x106 [r=0 c=0 rs=1 cs=2]
     
    4646                        RenderText {#text} at (312,5) size 354x38
    4747                          text run at (312,5) width 354: "render-groups-01-b"
    48                   RenderTableRow {TR} at (0,110) size 998x37 [color=#FFFFFF] [bgcolor=#000000]
    49                     RenderTableCell {TD} at (2,110) size 496x37 [r=1 c=0 rs=1 cs=1]
     48                  RenderTableRow {TR} at (0,110) size 998x36 [color=#FFFFFF] [bgcolor=#000000]
     49                    RenderTableCell {TD} at (2,110) size 496x36 [r=1 c=0 rs=1 cs=1]
    5050                      RenderText {#text} at (203,9) size 89x18
    5151                        text run at (203,9) width 89: "SVG Image"
    52                     RenderTableCell {TD} at (500,110) size 496x37 [r=1 c=1 rs=1 cs=1]
     52                    RenderTableCell {TD} at (500,110) size 496x36 [r=1 c=1 rs=1 cs=1]
    5353                      RenderText {#text} at (202,9) size 91x18
    5454                        text run at (202,9) width 91: "PNG Image"
    55                   RenderTableRow {TR} at (0,149) size 998x381
    56                     RenderTableCell {TD} at (2,149) size 496x381 [r=2 c=0 rs=1 cs=1]
     55                  RenderTableRow {TR} at (0,148) size 998x380
     56                    RenderTableCell {TD} at (2,148) size 496x380 [r=2 c=0 rs=1 cs=1]
    5757                      RenderEmbeddedObject {EMBED} at (8,8) size 480x360
    5858                        layer at (0,0) size 480x360
     
    8484                            RenderPath {rect} at (0.50,0.50) size 479x359 [stroke={[type=SOLID] [color=#000000]}] [data="M1.00,1.00 L479.00,1.00 L479.00,359.00 L1.00,359.00 Z"]
    8585                      RenderText {#text} at (0,0) size 0x0
    86                     RenderTableCell {TD} at (500,149) size 496x381 [r=2 c=1 rs=1 cs=1]
     86                    RenderTableCell {TD} at (500,148) size 496x380 [r=2 c=1 rs=1 cs=1]
    8787                      RenderImage {IMG} at (8,8) size 480x360
    8888                      RenderText {#text} at (0,0) size 0x0
    89       RenderBlock {DIV} at (23,630) size 723x348
    90         RenderBlock {P} at (0,0) size 723x42
    91           RenderText {#text} at (0,1) size 720x39
     89      RenderBlock {DIV} at (23,625) size 723x333
     90        RenderBlock {P} at (0,0) size 723x40
     91          RenderText {#text} at (0,1) size 720x38
    9292            text run at (0,1) width 720: "Verifies implicit rendering order (paragraph 3.3) and grouping mechanism (paragraphs 3.4)."
    93             text run at (0,22) width 433: "It also validates basic Shape, Image and text rendering."
    94         RenderBlock {P} at (0,53) size 723x168
    95           RenderText {#text} at (0,1) size 711x165
     93            text run at (0,21) width 433: "It also validates basic Shape, Image and text rendering."
     94        RenderBlock {P} at (0,51) size 723x160
     95          RenderText {#text} at (0,1) size 711x158
    9696            text run at (0,1) width 154: "This test renders 3 "
    9797            text run at (154,1) width 275: "elements: a text string \"SVG\", then "
    9898            text run at (429,1) width 276: "a shape, then an image. Because of"
    99             text run at (0,22) width 386: "their definition order and coordinates, the image "
    100             text run at (386,22) width 325: "should be on top of the rectangle and the"
    101             text run at (0,43) width 259: "rectangle on top of the text. The "
    102             text run at (259,43) width 408: "test validates that groups are conceptually rendered"
    103             text run at (0,64) width 183: "offscreen before being "
    104             text run at (183,64) width 464: "rendered on the canvas. This is done by grouping the same"
    105             text run at (0,85) width 193: "overlapping objects and "
    106             text run at (193,85) width 473: "rendering the group at half opacity. The background pattern"
    107             text run at (0,106) width 188: "(vertical stripes) should "
    108             text run at (188,106) width 498: "show throw all the group elements. However, none of the \"SVG\""
    109             text run at (0,127) width 202: "should show through the "
    110             text run at (202,127) width 480: "rectangle and none of the rectangle should show through the"
    111             text run at (0,148) width 53: "image."
    112         RenderBlock {P} at (0,232) size 723x84
    113           RenderText {#text} at (0,1) size 718x81
     99            text run at (0,21) width 386: "their definition order and coordinates, the image "
     100            text run at (386,21) width 325: "should be on top of the rectangle and the"
     101            text run at (0,41) width 259: "rectangle on top of the text. The "
     102            text run at (259,41) width 408: "test validates that groups are conceptually rendered"
     103            text run at (0,61) width 183: "offscreen before being "
     104            text run at (183,61) width 464: "rendered on the canvas. This is done by grouping the same"
     105            text run at (0,81) width 193: "overlapping objects and "
     106            text run at (193,81) width 473: "rendering the group at half opacity. The background pattern"
     107            text run at (0,101) width 188: "(vertical stripes) should "
     108            text run at (188,101) width 498: "show throw all the group elements. However, none of the \"SVG\""
     109            text run at (0,121) width 202: "should show through the "
     110            text run at (202,121) width 480: "rectangle and none of the rectangle should show through the"
     111            text run at (0,141) width 53: "image."
     112        RenderBlock {P} at (0,222) size 723x80
     113          RenderText {#text} at (0,1) size 718x78
    114114            text run at (0,1) width 626: "Prerequisites: the test assumes proper handling of the fill stroke, stroke-width, "
    115115            text run at (626,1) width 61: "opacity,"
    116             text run at (0,22) width 641: "font-size rendering properties. It uses the rect, line, text and image elements, as "
    117             text run at (641,22) width 77: "well as all"
    118             text run at (0,43) width 603: "the elements required for the test template. To ensure that the text string is "
    119             text run at (603,43) width 111: "overlapped by"
    120             text run at (0,64) width 661: "the other elements and to avoid a dependency on system fonts, an SVG font is used."
    121         RenderBlock {P} at (0,327) size 723x21
     116            text run at (0,21) width 641: "font-size rendering properties. It uses the rect, line, text and image elements, as "
     117            text run at (641,21) width 77: "well as all"
     118            text run at (0,41) width 603: "the elements required for the test template. To ensure that the text string is "
     119            text run at (603,41) width 111: "overlapped by"
     120            text run at (0,61) width 661: "the other elements and to avoid a dependency on system fonts, an SVG font is used."
     121        RenderBlock {P} at (0,313) size 723x20
    122122          RenderText {#text} at (0,1) size 494x18
    123123            text run at (0,1) width 494: "The rendered image should match the reference image exactly."
    124       RenderBlock {DIV} at (16,994) size 737x21
    125         RenderBlock {P} at (0,0) size 737x21
     124      RenderBlock {DIV} at (16,974) size 737x20
     125        RenderBlock {P} at (0,0) size 737x20
    126126          RenderInline {A} at (0,0) size 206x18 [color=#0000EE]
    127127            RenderText {#text} at (148,1) size 206x18
     
    138138              text run at (408,1) width 180: "\x{2192} script-handle-01-b"
    139139          RenderText {#text} at (0,0) size 0x0
    140 scrolled to 0,450
     140scrolled to 0,429
  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.checksum

    r49567 r53450  
    1 4cf3848efefdd7b4d77a0d1f1b49e079
     181565beca8cbbefe41ef1bd6a16ee351
  • trunk/LayoutTests/platform/mac/svg/custom/svg-fonts-in-html-expected.txt

    r49567 r53450  
    2020    RenderBlock {DIV} at (0,0) size 453x0
    2121      RenderInline {SPAN} at (0,0) size 0x0
    22 layer at (173,47) size 453x191
    23   RenderBlock (positioned) {H1} at (0,15) size 453x190 [color=#DD9955]
    24     RenderInline {SPAN} at (0,0) size 340x191
    25       RenderText {#text} at (63,0) size 340x191
    26         text run at (63,0) width 327: "CSS ZEN"
    27         text run at (56,95) width 340: "GARDEN"
     22layer at (173,47) size 453x189
     23  RenderBlock (positioned) {H1} at (0,15) size 453x188 [color=#DD9955]
     24    RenderInline {SPAN} at (0,0) size 340x190
     25      RenderText {#text} at (63,-1) size 340x190
     26        text run at (63,-1) width 327: "CSS ZEN"
     27        text run at (56,93) width 340: "GARDEN"
    2828layer at (173,118) size 453x20
    2929  RenderBlock (positioned) {H2} at (0,86) size 453x20 [color=#EEFF00]
  • trunk/WebCore/ChangeLog

    r53449 r53450  
     12010-01-18  Dan Bernstein  <mitz@apple.com>
     2
     3        Rubber-stamped by Sam Weinig.
     4
     5        <rdar://problem/7476957> REGRESSION (r49567): Business widget list does not line up: too tall due to line height rounding change
     6
     7        Reverted r49567.
     8
     9        * css/CSSComputedStyleDeclaration.cpp:
     10        (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
     11        * rendering/InlineFlowBox.cpp:
     12        (WebCore::InlineFlowBox::computeLogicalBoxHeights):
     13        * rendering/RenderBR.cpp:
     14        (WebCore::RenderBR::lineHeight):
     15        * rendering/style/RenderStyle.h:
     16        (WebCore::InheritedFlags::computedLineHeight):
     17
    1182010-01-18  Steve Block  <steveblock@google.com>
    219
  • trunk/WebCore/css/CSSComputedStyleDeclaration.cpp

    r53157 r53450  
    911911                // On the other hand, since font-size doesn't include the zoom factor, we really can't do
    912912                // that here either.
    913                 // The line height returned is rounded to the nearest integer.
    914                 return CSSPrimitiveValue::create(length.calcMinValue(style->fontDescription().specifiedSize(), true), CSSPrimitiveValue::CSS_PX);
     913                return CSSPrimitiveValue::create(static_cast<int>(length.percent() * style->fontDescription().specifiedSize()) / 100, CSSPrimitiveValue::CSS_PX);
    915914            return CSSPrimitiveValue::create(length.value(), CSSPrimitiveValue::CSS_PX);
    916915        }
  • trunk/WebCore/rendering/InlineFlowBox.cpp

    r53200 r53450  
    430430                lineHeight = baseline + baselineToBottom;
    431431            } else if (parentLineHeight.isPercent()) {
    432                 lineHeight = parentLineHeight.calcMinValue(curr->renderer()->style()->fontSize(), true);
     432                lineHeight = parentLineHeight.calcMinValue(curr->renderer()->style()->fontSize());
    433433                baseline = 0;
    434434                for (size_t i = 0; i < usedFonts.size(); ++i) {
  • trunk/WebCore/rendering/RenderBR.cpp

    r50583 r53450  
    6363        }
    6464        if (lh.isPercent())
    65             return lh.calcMinValue(s->fontSize(), true);
     65            return lh.calcMinValue(s->fontSize());
    6666        return lh.value();
    6767    }
  • trunk/WebCore/rendering/style/RenderStyle.h

    r52733 r53450  
    465465
    466466        if (lh.isPercent())
    467             return lh.calcMinValue(fontSize(), true);
     467            return lh.calcMinValue(fontSize());
    468468
    469469        return lh.value();
Note: See TracChangeset for help on using the changeset viewer.