Changeset 19593 in webkit


Ignore:
Timestamp:
Feb 12, 2007 5:41:52 PM (17 years ago)
Author:
bdash
Message:

Rolling out r19588 as it caused a build failure and a hang in layout tests after the obvious build fix was applied.

Location:
trunk
Files:
8 deleted
118 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/css1/formatting_model/inline_elements-expected.checksum

    r19588 r19593  
    1 b2da820c6f3f6667759c9aa205909f11
     155a1f301085cb525112043606e0fc453
  • trunk/LayoutTests/css1/formatting_model/inline_elements-expected.txt

    r19588 r19593  
    1 layer at (0,0) size 785x779
     1layer at (0,0) size 785x792
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x779
    4   RenderBlock {HTML} at (0,0) size 785x779
    5     RenderBody {BODY} at (8,8) size 769x763 [bgcolor=#CCCCCC]
     3layer at (0,0) size 785x792
     4  RenderBlock {HTML} at (0,0) size 785x792
     5    RenderBody {BODY} at (8,8) size 769x776 [bgcolor=#CCCCCC]
    66      RenderBlock {P} at (0,0) size 769x18
    77        RenderText {#text} at (0,0) size 355x18
     
    5353          text run at (83,48) width 3: " "
    5454          text run at (86,48) width 412: "The line spacing in the whole paragraph should be 12pt, with font-size 10pt."
    55       RenderTable {TABLE} at (0,455) size 769x308 [border: (1px outset #808080)]
    56         RenderTableSection {TBODY} at (1,1) size 767x306
     55      RenderTable {TABLE} at (0,455) size 769x321 [border: (1px outset #808080)]
     56        RenderTableSection {TBODY} at (1,1) size 767x319
    5757          RenderTableRow {TR} at (0,0) size 767x26
    5858            RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
     
    6060                RenderText {#text} at (4,4) size 163x18
    6161                  text run at (4,4) width 163: "TABLE Testing Section"
    62           RenderTableRow {TR} at (0,26) size 767x280
    63             RenderTableCell {TD} at (0,153) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     62          RenderTableRow {TR} at (0,26) size 767x293
     63            RenderTableCell {TD} at (0,159) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    6464              RenderText {#text} at (4,4) size 4x18
    6565                text run at (4,4) width 4: " "
    66             RenderTableCell {TD} at (12,26) size 755x280 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     66            RenderTableCell {TD} at (12,26) size 755x293 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    6767              RenderBlock {P} at (4,4) size 747x192
    6868                RenderText {#text} at (0,7) size 187x18
  • trunk/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x170
     3layer at (0,0) size 800x134
    44  RenderBlock {HTML} at (0,0) size 800x134
    55    RenderBody {BODY} at (8,16) size 784x102
  • trunk/LayoutTests/css2.1/t0905-c414-flt-01-d-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x162
     3layer at (0,0) size 800x130
    44  RenderBlock {HTML} at (0,0) size 800x130
    55    RenderBody {BODY} at (8,16) size 784x98
  • trunk/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x264
     3layer at (0,0) size 800x68
    44  RenderBlock {HTML} at (0,0) size 800x68
    55    RenderBody {BODY} at (8,16) size 784x36
  • trunk/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x264
     3layer at (0,0) size 800x68
    44  RenderBlock {HTML} at (0,0) size 800x68
    55    RenderBody {BODY} at (8,16) size 784x36
  • trunk/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x344
     3layer at (0,0) size 800x68
    44  RenderBlock {HTML} at (0,0) size 800x68
    55    RenderBody {BODY} at (8,16) size 784x36
  • trunk/LayoutTests/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x163
     3layer at (0,0) size 800x156
    44  RenderBlock {HTML} at (0,0) size 800x156
    55    RenderBody {BODY} at (8,16) size 784x124
  • trunk/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x260
     3layer at (0,0) size 800x8
    44  RenderBlock {HTML} at (0,0) size 800x8
    55    RenderBody {BODY} at (8,8) size 784x0
  • trunk/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x54
     3layer at (0,0) size 800x34
    44  RenderBlock {HTML} at (0,0) size 800x34
    55    RenderBody {BODY} at (8,8) size 784x18
  • trunk/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x44
     3layer at (0,0) size 800x34
    44  RenderBlock {HTML} at (0,0) size 800x34
    55    RenderBody {BODY} at (8,8) size 784x18
  • trunk/LayoutTests/css2.1/t090501-c414-flt-02-d-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x218
     3layer at (0,0) size 800x154
    44  RenderBlock {HTML} at (0,0) size 800x154
    55    RenderBody {BODY} at (8,16) size 784x122
  • trunk/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x237
     3layer at (0,0) size 800x155
    44  RenderBlock {HTML} at (0,0) size 800x155
    55    RenderBody {BODY} at (8,16) size 784x123
  • trunk/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x524
     3layer at (0,0) size 800x484
    44  RenderBlock {HTML} at (0,0) size 800x484
    55    RenderBody {BODY} at (8,16) size 784x452
  • trunk/LayoutTests/fast/block/float/008-expected.txt

    r19588 r19593  
    11layer at (0,0) size 785x608
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x608
     3layer at (0,0) size 785x600
    44  RenderBlock {HTML} at (0,0) size 785x600
    55    RenderBody {BODY} at (8,8) size 769x300
  • trunk/LayoutTests/fast/block/float/013-expected.checksum

    r19588 r19593  
    1 f069ee9081d2de062f2c9e90efa023b9
     176249c23fcdddcecf3cdb08b2120b225
  • trunk/LayoutTests/fast/block/float/013-expected.txt

    r19588 r19593  
    44  RenderBlock {HTML} at (0,0) size 800x8
    55    RenderBody {BODY} at (8,8) size 784x0
    6 layer at (8,64) size 800x115
     6layer at (8,64) size 800x108
    77  RenderBlock (positioned) {DIV} at (8,64) size 800x108 [bgcolor=#0000FF]
    88    RenderBlock {DIV} at (38,8) size 723x57 [bgcolor=#008000] [border: (2px solid #888878) none]
  • trunk/LayoutTests/fast/block/float/029-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x166
     3layer at (0,0) size 800x54
    44  RenderBlock {HTML} at (0,0) size 800x54
    55    RenderBody {BODY} at (8,8) size 784x38
  • trunk/LayoutTests/fast/block/float/031-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x332
     3layer at (0,0) size 800x300
    44  RenderBlock {HTML} at (0,0) size 800x300
    55    RenderBody {BODY} at (8,8) size 784x284
  • trunk/LayoutTests/fast/block/float/float-in-float-painting-expected.txt

    r19588 r19593  
    1313        RenderText {#text} at (115,18) size 597x18
    1414          text run at (115,18) width 597: ", or rather, a related painting issue. The word \"PASS\" should appear below in translucent blue."
    15 layer at (8,44) size 784x162
     15layer at (8,44) size 784x125
    1616  RenderBlock {DIV} at (0,36) size 784x125
    1717    RenderBlock (floating) {DIV} at (0,0) size 104x125
  • trunk/LayoutTests/fast/block/margin-collapse/059-expected.checksum

    r19588 r19593  
    1 8f0042cc5c242365774f89743a2678a0
     18e03cda31efbafc6ddf1b53fa70376a9
  • trunk/LayoutTests/fast/block/margin-collapse/059-expected.txt

    r19588 r19593  
    1010        RenderTableSection {TBODY} at (3,3) size 100x200
    1111          RenderTableRow {TR} at (0,0) size 100x200
    12             RenderTableCell {TD} at (0,25) size 50x150 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
     12            RenderTableCell {TD} at (0,0) size 50x200 [bgcolor=#FFA500] [r=0 c=0 rs=1 cs=1]
    1313              RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#FF0000]
    1414                RenderBlock {DIV} at (0,0) size 50x150 [bgcolor=#00FFFF]
  • trunk/LayoutTests/fast/block/margin-collapse/062-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x110 layerType: background only
     3layer at (0,0) size 800x46 layerType: background only
    44layer at (10,46) size 320x64
    55  RenderBlock (positioned) zI: -1 {DIV} at (10,46) size 320x64 [color=#FFFF00] [bgcolor=#FF0000]
    66    RenderText zI: -1 {#text} at (0,0) size 36x18
    77      text run at (0,0) width 36: "FAIL"
    8 layer at (0,0) size 800x110 layerType: foreground only
     8layer at (0,0) size 800x46 layerType: foreground only
    99  RenderBlock {HTML} at (0,0) size 800x46
    1010    RenderBody {BODY} at (10,46) size 780x0
  • trunk/LayoutTests/fast/block/margin-collapse/063-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x77 layerType: background only
     3layer at (0,0) size 800x49 layerType: background only
    44layer at (10,13) size 320x64
    55  RenderBlock (positioned) zI: -1 {DIV} at (10,13) size 320x64 [color=#FFFF00] [bgcolor=#FF0000]
    66    RenderText zI: -1 {#text} at (0,0) size 36x18
    77      text run at (0,0) width 36: "FAIL"
    8 layer at (0,0) size 800x77 layerType: foreground only
     8layer at (0,0) size 800x49 layerType: foreground only
    99  RenderBlock {HTML} at (0,0) size 800x49
    1010    RenderBody {BODY} at (10,2) size 780x1
  • trunk/LayoutTests/fast/box-shadow/basic-shadows-expected.txt

    r19588 r19593  
    11layer at (0,0) size 785x671
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x671
     3layer at (0,0) size 785x658
    44  RenderBlock {HTML} at (0,0) size 785x658
    55    RenderBody {BODY} at (8,8) size 769x634
  • trunk/LayoutTests/fast/forms/floating-textfield-relayout-expected.checksum

    r19588 r19593  
    1 9eea4b422a919b63d920d6da21841f7b
     12a7212dd9cad1f4955efa5403430629c
  • trunk/LayoutTests/fast/forms/floating-textfield-relayout-expected.txt

    r19588 r19593  
    1818          text run at (59,18) width 4: "."
    1919      RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #000000)]
    20 layer at (8,70) size 784x21
     20layer at (8,70) size 784x0
    2121  RenderBlock (relative positioned) {DIV} at (0,62) size 784x0
    2222    RenderTextControl {INPUT} at (0,2) size 392x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
  • trunk/LayoutTests/fast/lists/003-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x350
     3layer at (0,0) size 800x334
    44  RenderBlock {HTML} at (0,0) size 800x334
    55    RenderBody {BODY} at (8,16) size 784x302
  • trunk/LayoutTests/fast/media/mq-relative-constraints-08-expected.txt

    r19588 r19593  
    11layer at (0,0) size 785x642
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x642
     3layer at (0,0) size 785x600
    44  RenderBlock {HTML} at (0,0) size 785x600
    55    RenderBody {BODY} at (8,8) size 769x576
  • trunk/LayoutTests/fast/multicol/float-multicol-expected.txt

    r19588 r19593  
    11layer at (0,0) size 785x794
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x794
     3layer at (0,0) size 785x670
    44  RenderBlock {HTML} at (0,0) size 785x670
    55    RenderBody {BODY} at (8,19) size 769x635
  • trunk/LayoutTests/fast/table/009-expected.checksum

    r19588 r19593  
    1 12a8a4de3eab368c50a059827e98cb07
     197ea3f069f0cfaf6898e9f733f98c33c
  • trunk/LayoutTests/fast/table/009-expected.txt

    r19588 r19593  
    44  RenderBlock {HTML} at (0,0) size 800x600
    55    RenderBody {BODY} at (0,0) size 800x584 [bgcolor=#FFFFFF]
    6       RenderBlock {CENTER} at (0,0) size 800x58
    7         RenderTable {TABLE} at (0,0) size 800x58 [bgcolor=#CCCCCC] [border: (1px outset #808080)]
    8           RenderTableSection {TBODY} at (1,1) size 798x56
    9             RenderTableRow {TR} at (0,0) size 798x56
    10               RenderTableCell {TD} at (0,0) size 798x56 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     6      RenderBlock {CENTER} at (0,0) size 800x222
     7        RenderTable {TABLE} at (0,0) size 800x222 [bgcolor=#CCCCCC] [border: (1px outset #808080)]
     8          RenderTableSection {TBODY} at (1,1) size 798x220
     9            RenderTableRow {TR} at (0,0) size 798x220
     10              RenderTableCell {TD} at (0,0) size 798x220 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1111                RenderBlock {DIV} at (82,1) size 634x54 [border: (2px solid #FF0000)]
    1212                  RenderTable {TABLE} at (2,2) size 630x216 [bgcolor=#CCCCCC] [border: (2px outset #808080)]
     
    1919                                RenderTableCell {TD} at (0,0) size 97x180 [r=0 c=0 rs=1 cs=1]
    2020                                  RenderImage {IMG} at (0,0) size 97x180
    21       RenderBlock {P} at (0,74) size 800x0
    22       RenderBlock (floating) {DIV} at (0,74) size 104x54 [border: (2px solid #FF0000)]
     21      RenderBlock {P} at (0,238) size 800x0
     22      RenderBlock (floating) {DIV} at (0,238) size 104x54 [border: (2px solid #FF0000)]
    2323        RenderText {#text} at (2,2) size 82x54
    2424          text run at (2,2) width 82: "Here is some"
     
    4040        RenderText {#text} at (2,146) size 45x18
    4141          text run at (2,146) width 45: "Really."
    42       RenderBlock {P} at (0,74) size 800x0
     42      RenderBlock {P} at (0,238) size 800x0
  • trunk/LayoutTests/fast/text/text-shadow-extreme-value.html

    r19588 r19593  
    33    <title>Test HTML Page</title>
    44<script>
    5 function test()
    6 {
    7     if (window.layoutTestController) {
    8         layoutTestController.dumpAsText();
    9         document.body.offsetTop;
    10         layoutTestController.display();
    11     }
    12 }
     5if (window.layoutTestController)
     6    layoutTestController.dumpAsText();
    137</script>
    148    <style type="text/css">
     
    1610    </style>
    1711</head>
    18 <body onload="test()">
     12<body>
    1913    <p>Extreme text-shadow blur values should not crash.</p>
    2014</body>
  • trunk/LayoutTests/fast/text/whitespace/012-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x156
     3layer at (0,0) size 800x76
    44  RenderBlock {HTML} at (0,0) size 800x76
    55    RenderBody {BODY} at (8,8) size 784x52
  • trunk/LayoutTests/tables/mozilla/bugs/bug120364-expected.txt

    r19588 r19593  
    11layer at (0,0) size 785x1813
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x1813
     3layer at (0,0) size 785x600
    44  RenderBlock {HTML} at (0,0) size 785x600
    55    RenderBody {BODY} at (8,8) size 769x584
  • trunk/LayoutTests/tables/mozilla/bugs/bug196870-expected.checksum

    r19588 r19593  
    1 904b2a329a83e47c32af9dde9b082774
     11bec2a2cd4977686d9d5a1e056c8fdc2
  • trunk/LayoutTests/tables/mozilla/bugs/bug196870-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x47
    4   RenderBlock {HTML} at (0,0) size 800x47
    5     RenderBody {BODY} at (8,8) size 784x31
    6       RenderTable {TABLE} at (0,0) size 130x31
    7         RenderTableSection {TBODY} at (0,0) size 130x31
    8           RenderTableRow {TR} at (0,2) size 130x27
    9             RenderTableCell {TD} at (2,2) size 126x27 [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x103
     4  RenderBlock {HTML} at (0,0) size 800x103
     5    RenderBody {BODY} at (8,8) size 784x87
     6      RenderTable {TABLE} at (0,0) size 130x87
     7        RenderTableSection {TBODY} at (0,0) size 130x87
     8          RenderTableRow {TR} at (0,2) size 130x83
     9            RenderTableCell {TD} at (2,2) size 126x83 [r=0 c=0 rs=1 cs=1]
    1010              RenderBlock {DIV} at (100,1) size 25x25
    1111                RenderImage {IMG} at (0,0) size 77x77
  • trunk/LayoutTests/tables/mozilla/bugs/bug45055-2-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x136
     3layer at (0,0) size 800x8
    44  RenderBlock {HTML} at (0,0) size 800x8
    55    RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#FFFFFF]
  • trunk/LayoutTests/tables/mozilla/bugs/bug72359-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x62
     3layer at (0,0) size 800x8
    44  RenderBlock {html} at (0,0) size 800x8
    55    RenderBody {body} at (8,8) size 784x0
  • trunk/LayoutTests/tables/mozilla/marvin/x_table_align_left-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x36
     3layer at (0,0) size 800x8
    44  RenderBlock {html} at (0,0) size 800x8
    55    RenderBody {body} at (8,8) size 784x0
  • trunk/LayoutTests/tables/mozilla/marvin/x_table_align_right-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x36
     3layer at (0,0) size 800x8
    44  RenderBlock {html} at (0,0) size 800x8
    55    RenderBody {body} at (8,8) size 784x0
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.checksum

    r19588 r19593  
    1 85c7b05d885bbac635c8b940fbcc4e1b
     1034076c6256aecd14026c7637d29d4ff
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x116
    4   RenderBlock {HTML} at (0,0) size 800x116
    5     RenderBody {BODY} at (8,8) size 784x100
    6       RenderTable {TABLE} at (0,0) size 200x100 [bgcolor=#0000FF]
    7         RenderTableSection {TBODY} at (0,0) size 200x100
    8           RenderTableRow {TR} at (0,0) size 200x100
    9             RenderTableCell {TD} at (0,41) size 59x18 [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x316
     4  RenderBlock {HTML} at (0,0) size 800x316
     5    RenderBody {BODY} at (8,8) size 784x300
     6      RenderTable {TABLE} at (0,0) size 200x300 [bgcolor=#0000FF]
     7        RenderTableSection {TBODY} at (0,0) size 200x300
     8          RenderTableRow {TR} at (0,0) size 200x300
     9            RenderTableCell {TD} at (0,141) size 59x18 [r=0 c=0 rs=1 cs=1]
    1010              RenderText {#text} at (0,0) size 21x18
    1111                text run at (0,0) width 21: "foo"
    12             RenderTableCell {TD} at (59,0) size 141x50 [r=0 c=1 rs=1 cs=1]
     12            RenderTableCell {TD} at (59,0) size 141x300 [r=0 c=1 rs=1 cs=1]
    1313              RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000]
    1414                RenderBlock {DIV} at (0,0) size 400x300 [bgcolor=#FF0000]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.checksum

    r19588 r19593  
    1 ce9b6e763a48e26225e6f87c687e24ee
     17452def0f334ebd3b3e4ab06367e8955
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt

    r19588 r19593  
    1 layer at (0,0) size 785x612
     1layer at (0,0) size 785x619
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x416
    4   RenderBlock {HTML} at (0,0) size 785x416
    5     RenderBody {BODY} at (8,8) size 769x400
    6       RenderTable {TABLE} at (0,0) size 229x400 [border: (1px outset #808080)]
     3layer at (0,0) size 785x619
     4  RenderBlock {HTML} at (0,0) size 785x619
     5    RenderBody {BODY} at (8,8) size 769x603
     6      RenderTable {TABLE} at (0,0) size 229x603 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 227x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (102,3) size 22x18
    99            text run at (102,3) width 22: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 227x192
    11           RenderTableRow {TR} at (0,30) size 227x132
    12             RenderTableCell {TD} at (30,71) size 53x50 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,207) size 227x395
     11          RenderTableRow {TR} at (0,30) size 227x335
     12            RenderTableCell {TD} at (30,172) size 53x50 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (16,16) size 21x18
    1414                text run at (16,16) width 21: "foo"
    15             RenderTableCell {TD} at (113,78) size 84x84 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     15            RenderTableCell {TD} at (113,30) size 84x335 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1616              RenderBlock {DIV} at (16,16) size 52x52 [border: (1px solid #008000)]
    1717                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.checksum

    r19588 r19593  
    1 e00ac6458b82189a0b510a2a44bb4089
     1e6081f0f652de26f0c095542cc9d5ac3
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x356
    4   RenderBlock {HTML} at (0,0) size 800x356
    5     RenderBody {BODY} at (8,8) size 784x340
    6       RenderTable {TABLE} at (0,0) size 200x340 [bgcolor=#0000FF]
     3layer at (0,0) size 800x556
     4  RenderBlock {HTML} at (0,0) size 800x556
     5    RenderBody {BODY} at (8,8) size 784x540
     6      RenderTable {TABLE} at (0,0) size 200x540 [bgcolor=#0000FF]
    77        RenderBlock {CAPTION} at (0,0) size 200x200 [bgcolor=#FFA500]
    88          RenderText {#text} at (89,0) size 22x18
    99            text run at (89,0) width 22: "cap"
    10         RenderTableSection {TBODY} at (0,200) size 200x140
    11           RenderTableRow {TR} at (0,0) size 200x140
    12             RenderTableCell {TD} at (0,41) size 80x58 [bgcolor=#FFFF00] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (0,200) size 200x340
     11          RenderTableRow {TR} at (0,0) size 200x340
     12            RenderTableCell {TD} at (0,141) size 80x58 [bgcolor=#FFFF00] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (20,20) size 21x18
    1414                text run at (20,20) width 21: "foo"
    15             RenderTableCell {TD} at (80,50) size 120x90 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
     15            RenderTableCell {TD} at (80,0) size 120x340 [bgcolor=#FFFF00] [r=0 c=1 rs=1 cs=1]
    1616              RenderBlock {DIV} at (20,20) size 50x50 [bgcolor=#008000]
    1717                RenderBlock {DIV} at (0,0) size 400x300 [bgcolor=#FF0000]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.checksum

    r19588 r19593  
    1 4d2cc65ae0c74caba21fd04ad66842c0
     18e7ac76ea28c973ca22bda2328a5d662
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt

    r19588 r19593  
    1 layer at (0,0) size 785x728
     1layer at (0,0) size 785x735
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x532
    4   RenderBlock {HTML} at (0,0) size 785x532
    5     RenderBody {BODY} at (8,8) size 769x516
    6       RenderTable {TABLE} at (0,0) size 229x516 [border: (1px outset #808080)]
     3layer at (0,0) size 785x735
     4  RenderBlock {HTML} at (0,0) size 785x735
     5    RenderBody {BODY} at (8,8) size 769x719
     6      RenderTable {TABLE} at (0,0) size 229x719 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 227x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (102,3) size 22x18
    99            text run at (102,3) width 22: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 227x308
     10        RenderTableSection {TBODY} at (1,207) size 227x511
    1111          RenderTableRow {TR} at (0,30) size 227x86
    1212            RenderTableCell {TD} at (30,48) size 53x50 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     
    2222              RenderText {#text} at (16,52) size 22x18
    2323                text run at (16,52) width 22: "zap"
    24           RenderTableRow {TR} at (0,146) size 227x132
    25             RenderTableCell {TD} at (30,187) size 53x50 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     24          RenderTableRow {TR} at (0,146) size 227x335
     25            RenderTableCell {TD} at (30,288) size 53x50 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    2626              RenderText {#text} at (16,16) size 21x18
    2727                text run at (16,16) width 21: "foo"
    28             RenderTableCell {TD} at (113,194) size 84x84 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     28            RenderTableCell {TD} at (113,146) size 84x335 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    2929              RenderBlock {DIV} at (16,16) size 52x52 [border: (1px solid #008000)]
    3030                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.checksum

    r19588 r19593  
    1 dca9eded4a80fd5251e2d86eebcafd39
     1363abbecc85936d99f10536ed1738d04
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x38
    4   RenderBlock {HTML} at (0,0) size 800x38
    5     RenderBody {BODY} at (8,8) size 784x22
    6 layer at (8,8) size 22x22 clip at (9,9) size 20x20 scrollWidth 707 scrollHeight 507
    7   RenderTable {TABLE} at (0,0) size 22x22 [border: (1px outset #808080)]
    8     RenderTableSection {TBODY} at (1,1) size 20x20
    9       RenderTableRow {TR} at (0,2) size 20x16
    10         RenderTableCell {TD} at (2,2) size 16x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x529
     4  RenderBlock {HTML} at (0,0) size 800x529
     5    RenderBody {BODY} at (8,8) size 784x513
     6layer at (8,8) size 22x513 clip at (9,9) size 20x511 scrollWidth 707
     7  RenderTable {TABLE} at (0,0) size 22x513 [border: (1px outset #808080)]
     8    RenderTableSection {TBODY} at (1,1) size 20x511
     9      RenderTableRow {TR} at (0,2) size 20x507
     10        RenderTableCell {TD} at (2,2) size 16x507 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1111          RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)]
    1212            RenderBlock {DIV} at (1,1) size 702x502 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.checksum

    r19588 r19593  
    1 dca9eded4a80fd5251e2d86eebcafd39
     1363abbecc85936d99f10536ed1738d04
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x38
    4   RenderBlock {HTML} at (0,0) size 800x38
    5     RenderBody {BODY} at (8,8) size 784x22
    6       RenderTable {TABLE} at (0,0) size 22x22 [border: (1px outset #808080)]
    7 layer at (9,9) size 20x20 scrollWidth 707 scrollHeight 507
    8   RenderTableSection {TBODY} at (1,1) size 20x20
    9     RenderTableRow {TR} at (0,2) size 20x16
    10       RenderTableCell {TD} at (2,2) size 16x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x529
     4  RenderBlock {HTML} at (0,0) size 800x529
     5    RenderBody {BODY} at (8,8) size 784x513
     6      RenderTable {TABLE} at (0,0) size 22x513 [border: (1px outset #808080)]
     7layer at (9,9) size 20x511 scrollWidth 707
     8  RenderTableSection {TBODY} at (1,1) size 20x511
     9    RenderTableRow {TR} at (0,2) size 20x507
     10      RenderTableCell {TD} at (2,2) size 16x507 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1111        RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)]
    1212          RenderBlock {DIV} at (1,1) size 702x502 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.checksum

    r19588 r19593  
    1 f7b5617cc469edc9dfc2a75cf6c05448
     1363abbecc85936d99f10536ed1738d04
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x38
    4   RenderBlock {HTML} at (0,0) size 800x38
    5     RenderBody {BODY} at (8,8) size 784x22
    6       RenderTable {TABLE} at (0,0) size 22x22 [border: (1px outset #808080)]
    7         RenderTableSection {TBODY} at (1,1) size 20x20
    8 layer at (9,11) size 20x16
    9   RenderTableRow {TR} at (0,2) size 20x16
    10     RenderTableCell {TD} at (2,2) size 16x16 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x529
     4  RenderBlock {HTML} at (0,0) size 800x529
     5    RenderBody {BODY} at (8,8) size 784x513
     6      RenderTable {TABLE} at (0,0) size 22x513 [border: (1px outset #808080)]
     7        RenderTableSection {TBODY} at (1,1) size 20x511
     8layer at (9,11) size 20x507
     9  RenderTableRow {TR} at (0,2) size 20x507
     10    RenderTableCell {TD} at (2,2) size 16x507 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1111      RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)]
    1212        RenderBlock {DIV} at (1,1) size 702x502 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.checksum

    r19588 r19593  
    1 3d382b6bf9a1f7ab24606204d2bc232c
     19dd2a0762ccc745d867fe7f4951673ad
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x397
    4   RenderBlock {HTML} at (0,0) size 800x397
    5     RenderBody {BODY} at (8,8) size 784x381
    6       RenderTable {TABLE} at (0,0) size 200x381 [border: (1px outset #808080)]
     3layer at (0,0) size 800x589
     4  RenderBlock {HTML} at (0,0) size 800x589
     5    RenderBody {BODY} at (8,8) size 784x573
     6      RenderTable {TABLE} at (0,0) size 200x573 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 198x173
    11           RenderTableRow {TR} at (0,30) size 198x113
    12             RenderTableCell {TD} at (30,30) size 54x113 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,207) size 198x365
     11          RenderTableRow {TR} at (0,30) size 198x305
     12            RenderTableCell {TD} at (30,126) size 54x113 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (1,1) size 44x111
    1414                text run at (1,1) width 43: "foo"
    1515                text run at (1,38) width 41: "bar"
    1616                text run at (1,75) width 44: "baz"
    17             RenderTableCell {TD} at (114,30) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     17            RenderTableCell {TD} at (114,30) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1818              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    1919                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.checksum

    r19588 r19593  
    1 4c160e95aa789559e237a137d55b4c85
     11874d8a1f9a2d0bb88510dc3c7d0782d
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x386
    4   RenderBlock {HTML} at (0,0) size 800x386
    5     RenderBody {BODY} at (8,8) size 784x370
    6       RenderTable {TABLE} at (0,0) size 200x370 [border: (1px outset #808080)]
     3layer at (0,0) size 800x589
     4  RenderBlock {HTML} at (0,0) size 800x589
     5    RenderBody {BODY} at (8,8) size 784x573
     6      RenderTable {TABLE} at (0,0) size 200x573 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 198x162
    11           RenderTableRow {TR} at (0,30) size 198x102
    12             RenderTableCell {TD} at (30,65) size 54x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,207) size 198x365
     11          RenderTableRow {TR} at (0,30) size 198x305
     12            RenderTableCell {TD} at (30,166) size 54x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (1,1) size 38x30
    1414                text run at (1,1) width 38: "foo bar"
    1515                text run at (1,16) width 19: "baz"
    16             RenderTableCell {TD} at (114,78) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     16            RenderTableCell {TD} at (114,30) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1717              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    1818                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.checksum

    r19588 r19593  
    1 aa93dfeb51e6c55f6527c7bd8e73c430
     1e63da4ef64e59c683071748ac1829b6c
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x386
    4   RenderBlock {HTML} at (0,0) size 800x386
    5     RenderBody {BODY} at (8,8) size 784x370
    6       RenderTable {TABLE} at (0,0) size 200x370 [border: (1px outset #808080)]
     3layer at (0,0) size 800x589
     4  RenderBlock {HTML} at (0,0) size 800x589
     5    RenderBody {BODY} at (8,8) size 784x573
     6      RenderTable {TABLE} at (0,0) size 200x573 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 198x162
    11           RenderTableRow {TR} at (0,30) size 198x102
    12             RenderTableCell {TD} at (30,65) size 54x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,207) size 198x365
     11          RenderTableRow {TR} at (0,30) size 198x305
     12            RenderTableCell {TD} at (30,166) size 54x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (1,1) size 38x30
    1414                text run at (1,1) width 38: "foo bar"
    1515                text run at (1,16) width 19: "baz"
    16             RenderTableCell {TD} at (114,78) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     16            RenderTableCell {TD} at (114,30) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1717              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    1818                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.checksum

    r19588 r19593  
    1 fe62a0ba8b647113b665df2628b96dcb
     15daf609f4be509c7fad304416a5cf780
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt

    r19588 r19593  
    1 layer at (0,0) size 785x685
     1layer at (0,0) size 785x666
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x474
    4   RenderBlock {HTML} at (0,0) size 785x474
    5     RenderBody {BODY} at (8,8) size 769x458
    6       RenderTable {TABLE} at (0,0) size 200x458 [border: (1px outset #808080)]
     3layer at (0,0) size 785x666
     4  RenderBlock {HTML} at (0,0) size 785x666
     5    RenderBody {BODY} at (8,8) size 769x650
     6      RenderTable {TABLE} at (0,0) size 200x650 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 198x250
     10        RenderTableSection {TBODY} at (1,207) size 198x442
    1111          RenderTableRow {TR} at (0,30) size 198x47
    1212            RenderTableCell {TD} at (30,45) size 54x17 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     
    2222              RenderText {#text} at (1,31) size 19x15
    2323                text run at (1,31) width 19: "zap"
    24           RenderTableRow {TR} at (0,107) size 198x113
    25             RenderTableCell {TD} at (30,107) size 54x113 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
     24          RenderTableRow {TR} at (0,107) size 198x305
     25            RenderTableCell {TD} at (30,203) size 54x113 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
    2626              RenderText {#text} at (1,1) size 44x111
    2727                text run at (1,1) width 43: "foo"
    2828                text run at (1,38) width 41: "bar"
    2929                text run at (1,75) width 44: "baz"
    30             RenderTableCell {TD} at (114,166) size 54x54 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
     30            RenderTableCell {TD} at (114,107) size 54x305 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
    3131              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    3232                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.checksum

    r19588 r19593  
    1 e7916950ef324aa58f51045b23df8381
     127f1de52df50405a3062410ef89621ad
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x163
    4   RenderBlock {HTML} at (0,0) size 800x163
    5     RenderBody {BODY} at (8,8) size 784x147
    6       RenderTable {TABLE} at (0,0) size 200x147 [border: (1px outset #808080)]
     3layer at (0,0) size 800x366
     4  RenderBlock {HTML} at (0,0) size 800x366
     5    RenderBody {BODY} at (8,8) size 784x350
     6      RenderTable {TABLE} at (0,0) size 200x350 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x43 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,44) size 198x102
    11           RenderTableRow {TR} at (0,0) size 198x102
    12             RenderTableCell {TD} at (0,13) size 144x76 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,44) size 198x305
     11          RenderTableRow {TR} at (0,0) size 198x305
     12            RenderTableCell {TD} at (0,114) size 144x76 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (1,1) size 92x74
    1414                text run at (1,1) width 92: "foo bar"
    1515                text run at (1,38) width 44: "baz"
    16             RenderTableCell {TD} at (144,48) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     16            RenderTableCell {TD} at (144,0) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1717              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    1818                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.checksum

    r19588 r19593  
    1 9932242894c2a0c1ee5512d49c64c56d
     14d8c3409c239129ac7a9f69134e9f1d7
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x234
    4   RenderBlock {HTML} at (0,0) size 800x234
    5     RenderBody {BODY} at (8,8) size 784x218
    6       RenderTable {TABLE} at (0,0) size 200x218 [border: (1px outset #808080)]
     3layer at (0,0) size 800x426
     4  RenderBlock {HTML} at (0,0) size 800x426
     5    RenderBody {BODY} at (8,8) size 784x410
     6      RenderTable {TABLE} at (0,0) size 200x410 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x43 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,44) size 198x173
    11           RenderTableRow {TR} at (0,30) size 198x113
    12             RenderTableCell {TD} at (30,30) size 54x113 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,44) size 198x365
     11          RenderTableRow {TR} at (0,30) size 198x305
     12            RenderTableCell {TD} at (30,126) size 54x113 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (1,1) size 44x111
    1414                text run at (1,1) width 43: "foo"
    1515                text run at (1,38) width 41: "bar"
    1616                text run at (1,75) width 44: "baz"
    17             RenderTableCell {TD} at (114,89) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     17            RenderTableCell {TD} at (114,30) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1818              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    1919                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.checksum

    r19588 r19593  
    1 ecac3024fc833dc8fa265548836816a0
     1d7d6fcd1c1a085add192501ac38a1206
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x386
    4   RenderBlock {HTML} at (0,0) size 800x386
    5     RenderBody {BODY} at (8,8) size 784x370
    6       RenderTable {TABLE} at (0,0) size 200x370 [border: (1px outset #808080)]
     3layer at (0,0) size 800x589
     4  RenderBlock {HTML} at (0,0) size 800x589
     5    RenderBody {BODY} at (8,8) size 784x573
     6      RenderTable {TABLE} at (0,0) size 200x573 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
    99            text run at (77,3) width 44: "cap"
    10         RenderTableSection {TBODY} at (1,207) size 198x162
    11           RenderTableRow {TR} at (0,30) size 198x102
    12             RenderTableCell {TD} at (30,62) size 54x38 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     10        RenderTableSection {TBODY} at (1,207) size 198x365
     11          RenderTableRow {TR} at (0,30) size 198x305
     12            RenderTableCell {TD} at (30,163) size 54x38 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1313              RenderText {#text} at (1,1) size 45x36
    1414                text run at (1,1) width 45: "foo bar"
    1515                text run at (1,19) width 22: "baz"
    16             RenderTableCell {TD} at (114,78) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     16            RenderTableCell {TD} at (114,30) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1717              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    1818                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.checksum

    r19588 r19593  
    1 f1f156f4a8fa8c525e2b94002cbce377
     1560d8103342d139c584cf15a2921d534
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt

    r19588 r19593  
    1 layer at (0,0) size 785x724
     1layer at (0,0) size 785x705
    22  RenderView at (0,0) size 785x600
    3 layer at (0,0) size 785x513
    4   RenderBlock {HTML} at (0,0) size 785x513
    5     RenderBody {BODY} at (8,8) size 769x497
    6       RenderTable {TABLE} at (0,0) size 200x497 [border: (1px outset #808080)]
     3layer at (0,0) size 785x705
     4  RenderBlock {HTML} at (0,0) size 785x705
     5    RenderBody {BODY} at (8,8) size 769x689
     6      RenderTable {TABLE} at (0,0) size 200x689 [border: (1px outset #808080)]
    77        RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)]
    88          RenderText {#text} at (77,3) size 44x37
     
    2222              RenderText {#text} at (1,37) size 22x18
    2323                text run at (1,37) width 22: "zap"
    24         RenderTableSection {TBODY} at (1,323) size 198x173
    25           RenderTableRow {TR} at (0,30) size 198x113
    26             RenderTableCell {TD} at (30,30) size 54x113 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     24        RenderTableSection {TBODY} at (1,323) size 198x365
     25          RenderTableRow {TR} at (0,30) size 198x305
     26            RenderTableCell {TD} at (30,126) size 54x113 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    2727              RenderText {#text} at (1,1) size 44x111
    2828                text run at (1,1) width 43: "foo"
    2929                text run at (1,38) width 41: "bar"
    3030                text run at (1,75) width 44: "baz"
    31             RenderTableCell {TD} at (114,89) size 54x54 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     31            RenderTableCell {TD} at (114,30) size 54x305 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    3232              RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)]
    3333                RenderBlock {DIV} at (1,1) size 402x302 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.checksum

    r19588 r19593  
    1 268da7b88265f34521c21e4c5af04aa9
     17202a1cd6cca2d6cfb405d3c3133e366
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x126
    4   RenderBlock {HTML} at (0,0) size 800x126
    5     RenderBody {BODY} at (8,8) size 784x110
    6       RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
    7         RenderTableSection {TBODY} at (1,1) size 198x108
    8           RenderTableRow {TR} at (0,2) size 198x104
    9             RenderTableCell {TD} at (2,43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x429
     4  RenderBlock {HTML} at (0,0) size 800x429
     5    RenderBody {BODY} at (8,8) size 784x413
     6      RenderTable {TABLE} at (0,0) size 200x413 [border: (1px outset #808080)]
     7        RenderTableSection {TBODY} at (1,1) size 198x411
     8          RenderTableRow {TR} at (0,2) size 198x407
     9            RenderTableCell {TD} at (2,194) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1010              RenderText {#text} at (2,2) size 21x18
    1111                text run at (2,2) width 21: "foo"
    12             RenderTableCell {TD} at (121,46) size 75x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     12            RenderTableCell {TD} at (121,2) size 75x407 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1313              RenderBlock {DIV} at (61,2) size 12x12 [border: (1px solid #008000)]
    1414                RenderBlock {DIV} at (-291,1) size 302x402 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.checksum

    r19588 r19593  
    1 86c435aa1e700cc3c7911ce3449e76fb
     1ff1c7f3e9940d48f979950ad2a6e309d
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x126
    4   RenderBlock {HTML} at (0,0) size 800x126
    5     RenderBody {BODY} at (8,8) size 784x110
    6       RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
    7         RenderTableSection {TBODY} at (1,1) size 198x108
    8           RenderTableRow {TR} at (0,2) size 198x104
    9             RenderTableCell {TD} at (2,43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x429
     4  RenderBlock {HTML} at (0,0) size 800x429
     5    RenderBody {BODY} at (8,8) size 784x413
     6      RenderTable {TABLE} at (0,0) size 200x413 [border: (1px outset #808080)]
     7        RenderTableSection {TBODY} at (1,1) size 198x411
     8          RenderTableRow {TR} at (0,2) size 198x407
     9            RenderTableCell {TD} at (2,194) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1010              RenderText {#text} at (2,2) size 21x18
    1111                text run at (2,2) width 21: "foo"
    12             RenderTableCell {TD} at (121,90) size 75x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     12            RenderTableCell {TD} at (121,2) size 75x407 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1313              RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)]
    1414                RenderBlock {DIV} at (1,1) size 302x402 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.checksum

    r19588 r19593  
    1 0f0df87821767c6540ad11435828fa94
     1ff1c7f3e9940d48f979950ad2a6e309d
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x126
    4   RenderBlock {HTML} at (0,0) size 800x126
    5     RenderBody {BODY} at (8,8) size 784x110
    6       RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
    7         RenderTableSection {TBODY} at (1,1) size 198x108
    8           RenderTableRow {TR} at (0,2) size 198x104
    9             RenderTableCell {TD} at (2,43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x429
     4  RenderBlock {HTML} at (0,0) size 800x429
     5    RenderBody {BODY} at (8,8) size 784x413
     6      RenderTable {TABLE} at (0,0) size 200x413 [border: (1px outset #808080)]
     7        RenderTableSection {TBODY} at (1,1) size 198x411
     8          RenderTableRow {TR} at (0,2) size 198x407
     9            RenderTableCell {TD} at (2,194) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1010              RenderText {#text} at (2,2) size 21x18
    1111                text run at (2,2) width 21: "foo"
    12             RenderTableCell {TD} at (121,46) size 75x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     12            RenderTableCell {TD} at (121,2) size 75x407 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1313              RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)]
    1414                RenderBlock {DIV} at (1,1) size 302x402 [border: (1px solid #FF0000)]
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.checksum

    r19588 r19593  
    1 337ee2a5b4b4f2cd5e4043b2ff7f021b
     1ff1c7f3e9940d48f979950ad2a6e309d
  • trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt

    r19588 r19593  
    11layer at (0,0) size 800x600
    22  RenderView at (0,0) size 800x600
    3 layer at (0,0) size 800x126
    4   RenderBlock {HTML} at (0,0) size 800x126
    5     RenderBody {BODY} at (8,8) size 784x110
    6       RenderTable {TABLE} at (0,0) size 200x110 [border: (1px outset #808080)]
    7         RenderTableSection {TBODY} at (1,1) size 198x108
    8           RenderTableRow {TR} at (0,2) size 198x104
    9             RenderTableCell {TD} at (2,43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
     3layer at (0,0) size 800x429
     4  RenderBlock {HTML} at (0,0) size 800x429
     5    RenderBody {BODY} at (8,8) size 784x413
     6      RenderTable {TABLE} at (0,0) size 200x413 [border: (1px outset #808080)]
     7        RenderTableSection {TBODY} at (1,1) size 198x411
     8          RenderTableRow {TR} at (0,2) size 198x407
     9            RenderTableCell {TD} at (2,194) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
    1010              RenderText {#text} at (2,2) size 21x18
    1111                text run at (2,2) width 21: "foo"
    12             RenderTableCell {TD} at (121,2) size 75x16 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
     12            RenderTableCell {TD} at (121,2) size 75x407 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
    1313              RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)]
    1414                RenderBlock {DIV} at (1,1) size 302x402 [border: (1px solid #FF0000)]
  • trunk/WebCore/rendering/InlineFlowBox.cpp

    r19588 r19593  
    300300                x += curr->object()->marginLeft();
    301301                curr->setXPos(x);
    302                 leftPosition = min(x + curr->object()->overflowLeft(false), leftPosition);
    303                 rightPosition = max(x + curr->object()->overflowWidth(false), rightPosition);
     302                leftPosition = min(x, leftPosition);
     303                rightPosition = max(x + curr->width(), rightPosition);
    304304                x += curr->width() + curr->object()->marginRight();
    305305            }
  • trunk/WebCore/rendering/RenderBlock.cpp

    r19588 r19593  
    467467    }
    468468   
    469     IntRect oldBounds;
     469    IntRect oldBounds, oldFullBounds;
    470470    bool checkForRepaint = checkForRepaintDuringLayout();
    471471    if (checkForRepaint) {
    472         oldBounds = getAbsoluteRepaintRect();
     472        getAbsoluteRepaintRectIncludingFloats(oldBounds, oldFullBounds);
    473473        oldBounds.move(view()->layoutDelta());
     474        oldFullBounds.move(view()->layoutDelta());
    474475    }
    475476
     
    555556        relayoutChildren = true;
    556557
     558    // Table cells need to grow to accommodate blocks that have overflowed content.
     559    if (m_overflowHeight > m_height && !hasOverflowClip() && expandsToEncloseOverflow())
     560        m_height = m_overflowHeight + borderBottom() + paddingBottom();
     561
    557562    // Some classes of objects (floats and fieldsets with no specified heights and table cells) expand to encompass
    558563    // overhanging floats.
     
    562567    }
    563568
    564     if ((isTableCell() || isInline() || isFloatingOrPositioned() || isRoot()) && !hasOverflowClip() && !hasControlClip())
    565         addVisualOverflow(floatRect());
    566 
    567569    layoutPositionedObjects(relayoutChildren || isRoot());
    568570
     
    582584    bool didFullRepaint = false;
    583585    if (checkForRepaint)
    584         didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds);
     586        didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds, oldFullBounds);
    585587    if (!didFullRepaint && !repaintRect.isEmpty()) {
    586588        // FIXME: Deal with multiple column repainting.  We have to split the repaint
     
    11531155        determineHorizontalPosition(child);
    11541156
     1157        // Update our top overflow in case the child spills out the top of the block.
     1158        m_overflowTop = min(m_overflowTop, child->yPos() + child->overflowTop(false));
     1159       
    11551160        // Update our height now that the child has been placed in the correct position.
    11561161        m_height += child->height();
     
    11591164            marginInfo.clearMargin();
    11601165        }
     1166        int overflowDelta = child->overflowHeight(false) - child->height();
     1167        if (m_height + overflowDelta > m_overflowHeight)
     1168            m_overflowHeight = m_height + overflowDelta;
     1169
    11611170        // If the child has overhanging floats that intrude into following siblings (or possibly out
    11621171        // of this block), then the parent gets notified of the floats now.
    11631172        addOverhangingFloats(static_cast<RenderBlock *>(child), -child->xPos(), -child->yPos());
    11641173
    1165         // Update our overflow in case the child spills out the block.
    1166         m_overflowTop = min(m_overflowTop, child->yPos() + child->overflowTop(false));
    1167         m_overflowHeight = max(m_overflowHeight, m_height + child->overflowHeight(false) - child->height());
     1174        // See if this child has made our overflow need to grow.
    11681175        m_overflowWidth = max(child->xPos() + child->overflowWidth(false), m_overflowWidth);
    11691176        m_overflowLeft = min(child->xPos() + child->overflowLeft(false), m_overflowLeft);
     
    12281235}
    12291236
     1237void RenderBlock::getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& fullBounds)
     1238{
     1239    bounds = fullBounds = getAbsoluteRepaintRect();
     1240
     1241    // Include any overhanging floats (if we know we're the one to paint them).
     1242    // We null-check m_floatingObjects here to catch any cases where m_height ends up negative
     1243    // for some reason.  I think I've caught all those cases, but this way we stay robust and don't
     1244    // crash.
     1245    if (hasOverhangingFloats() && m_floatingObjects) {
     1246        FloatingObject* r;
     1247        DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
     1248        for ( ; (r = it.current()); ++it) {
     1249            // Only repaint the object if our noPaint flag isn't set and if it isn't in
     1250            // its own layer.
     1251            if (!r->noPaint && !r->node->layer()) {
     1252                IntRect childRect, childFullRect;
     1253                r->node->getAbsoluteRepaintRectIncludingFloats(childRect, childFullRect);
     1254                fullBounds.unite(childFullRect);
     1255            }
     1256        }
     1257    }
     1258}
     1259
    12301260void RenderBlock::repaintOverhangingFloats(bool paintAllDescendants)
    12311261{
     
    12791309        overflowBox.inflate(maximalOutlineSize(paintInfo.phase));
    12801310        overflowBox.move(tx, ty);
    1281         if (!overflowBox.intersects(paintInfo.rect))
    1282             return;
     1311        bool intersectsOverflowBox = overflowBox.intersects(paintInfo.rect);
     1312        if (!intersectsOverflowBox) {
     1313            // Check floats next.
     1314            if (paintInfo.phase != PaintPhaseFloat && paintInfo.phase != PaintPhaseSelection)
     1315                return;
     1316            IntRect floatBox = floatRect();
     1317            floatBox.inflate(maximalOutlineSize(paintInfo.phase));
     1318            floatBox.move(tx, ty);
     1319            if (!floatBox.intersects(paintInfo.rect))
     1320                return;
     1321        }
    12831322    }
    12841323
     
    22112250IntRect RenderBlock::floatRect() const
    22122251{
    2213     IntRect result;
     2252    IntRect result(borderBox());
    22142253    if (!m_floatingObjects || hasOverflowClip())
    22152254        return result;
     
    22182257    for (; (r = it.current()); ++it) {
    22192258        if (!r->noPaint && !r->node->layer()) {
    2220             IntRect childRect = r->node->overflowRect(false);
     2259            IntRect childRect = unionRect(r->node->floatRect(), r->node->overflowRect());
    22212260            childRect.move(r->left + r->node->marginLeft(), r->startY + r->node->marginTop());
    22222261            result.unite(childRect);
     
    24522491{
    24532492    // Prevent floats from being added to the canvas by the root element, e.g., <html>.
    2454     if (child->hasOverflowClip() || !child->containsFloats() || child->isRoot())
     2493    if (child->hasOverflowClip() || !child->hasOverhangingFloats() || child->isRoot())
    24552494        return;
    2456 
    2457     // Floats that will remain the child's responsiblity to paint should factor into its
    2458     // visual overflow.
    2459     IntRect floatsOverflowRect;
     2495   
     2496    // We think that we must be in a bad state if child->m_floatingObjects is nil at this point,
     2497    // so we assert on Debug builds and nil-check Release builds.
     2498    ASSERT(child->m_floatingObjects);
     2499    if (!child->m_floatingObjects)
     2500        return;
     2501
    24602502    DeprecatedPtrListIterator<FloatingObject> it(*child->m_floatingObjects);
    2461     for (FloatingObject* r; (r = it.current()); ++it) {
     2503    for (FloatingObject *r; (r = it.current()); ++it) {
    24622504        if (child->yPos() + r->endY > height()) {
     2505            // The object may already be in our list. Check for it up front to avoid
     2506            // creating duplicate entries.
     2507            FloatingObject* f = 0;
     2508            if (m_floatingObjects) {
     2509                DeprecatedPtrListIterator<FloatingObject> it(*m_floatingObjects);
     2510                while ((f = it.current())) {
     2511                    if (f->node == r->node) break;
     2512                    ++it;
     2513                }
     2514            }
     2515
    24632516            // If the object is not in the list, we add it now.
    2464             if (!containsFloat(r->node)) {
     2517            if (!f) {
    24652518                FloatingObject *floatingObj = new FloatingObject(r->type());
    24662519                floatingObj->startY = r->startY - yoff;
     
    24872540            }
    24882541        }
    2489         if (!r->noPaint && !r->node->layer()) {
    2490             IntRect floatOverflowRect = r->node->overflowRect(false);
    2491             floatOverflowRect.move(r->left + r->node->marginLeft(), r->startY + r->node->marginTop());
    2492             floatsOverflowRect.unite(floatOverflowRect);
    2493         }
    2494     }
    2495     child->addVisualOverflow(floatsOverflowRect);
     2542    }
    24962543}
    24972544
     
    26152662}
    26162663
    2617 void RenderBlock::addVisualOverflow(const IntRect& r)
    2618 {
    2619     if (r.isEmpty())
    2620         return;
    2621     m_overflowLeft = min(m_overflowLeft, r.x());
    2622     m_overflowWidth = max(m_overflowWidth, r.right());
    2623     m_overflowTop = min(m_overflowTop, r.y());
    2624     m_overflowHeight = max(m_overflowHeight, r.bottom());
    2625 }
    2626 
    26272664bool RenderBlock::isPointInScrollbar(HitTestResult& result, int _x, int _y, int _tx, int _ty)
    26282665{
     
    26662703        IntRect overflowBox = overflowRect(false);
    26672704        overflowBox.move(tx, ty);
    2668         if (!overflowBox.contains(_x, _y))
    2669             return false;
     2705        bool insideOverflowBox = overflowBox.contains(_x, _y);
     2706        if (!insideOverflowBox) {
     2707            // Check floats next.
     2708            if (hitTestAction != HitTestFloat)
     2709                return false;
     2710            IntRect floatBox = floatRect();
     2711            floatBox.move(tx, ty);
     2712            if (!floatBox.contains(_x, _y))
     2713                return false;
     2714        }
    26702715    }
    26712716
  • trunk/WebCore/rendering/RenderBlock.h

    r19588 r19593  
    7070    virtual void setOverflowWidth(int w) { m_overflowWidth = w; }
    7171
    72     void addVisualOverflow(const IntRect&);
    73 
    7472    virtual bool isSelfCollapsingBlock() const;
    7573    virtual bool isTopMarginQuirk() const { return m_topMarginQuirk; }
     
    104102    virtual void repaintObjectsBeforeLayout();
    105103    virtual void repaintOverhangingFloats(bool paintAllDescendants);
     104    virtual void getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& fullBounds);
    106105
    107106    virtual void setStyle(RenderStyle*);
     
    180179    inline int leftBottom();
    181180    inline int rightBottom();
     181    virtual IntRect floatRect() const;
    182182
    183183    virtual int lineWidth(int y) const;
     
    290290
    291291protected:
    292     IntRect floatRect() const;
    293292    void newLine();
    294293    virtual bool hasLineIfEmpty() const;
     
    450449    int m_maxBottomNegMargin;
    451450
    452     // How much content overflows out of our block vertically or horizontally.
     451    // How much content overflows out of our block vertically or horizontally (all we support
     452    // for now is spillage out of the bottom and the right, which are the common cases).
     453    // FIXME: Generalize to work with top and left as well.
    453454    int m_overflowHeight;
    454455    int m_overflowWidth;
     456
     457    // Left and top overflow.  Does not affect scrolling dimensions, but we do at least use it
     458    // when dirty rect checking and hit testing.
    455459    int m_overflowLeft;
    456460    int m_overflowTop;
  • trunk/WebCore/rendering/RenderFlexibleBox.cpp

    r19588 r19593  
    331331    // Repaint with our new bounds if they are different from our old bounds.
    332332    if (checkForRepaint)
    333         repaintAfterLayoutIfNeeded(oldBounds);
     333        repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    334334   
    335335    setNeedsLayout(false);
     
    489489
    490490            placeChild(child, xPos, childY);
    491 
    492             if (child->isRenderBlock())
    493                 static_cast<RenderBlock*>(child)->addVisualOverflow(static_cast<RenderBlock*>(child)->floatRect());
    494 
    495491            m_overflowHeight = max(m_overflowHeight, childY + child->overflowHeight(false));
    496492            m_overflowTop = min(m_overflowTop, child->yPos() + child->overflowTop(false));
     
    871867            m_height += child->height() + child->marginBottom();
    872868   
    873             if (child->isRenderBlock())
    874                 static_cast<RenderBlock*>(child)->addVisualOverflow(static_cast<RenderBlock*>(child)->floatRect());
    875 
    876869            // See if this child has made our overflow need to grow.
    877870            m_overflowWidth = max(child->xPos() + child->overflowWidth(false), m_overflowWidth);
  • trunk/WebCore/rendering/RenderForeignObject.cpp

    r19588 r19593  
    9898
    9999    if (checkForRepaint)
    100         repaintAfterLayoutIfNeeded(oldBounds);
     100        repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    101101
    102102    setNeedsLayout(false);
  • trunk/WebCore/rendering/RenderHTMLCanvas.cpp

    r19588 r19593  
    9191    calcHeight();
    9292    if (checkForRepaint)
    93         repaintAfterLayoutIfNeeded(oldBounds);
     93        repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    9494
    9595    setNeedsLayout(false);
  • trunk/WebCore/rendering/RenderImage.cpp

    r19590 r19593  
    317317
    318318    if (checkForRepaint)
    319         repaintAfterLayoutIfNeeded(oldBounds);
     319        repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    320320   
    321321    setNeedsLayout(false);
  • trunk/WebCore/rendering/RenderLayer.cpp

    r19588 r19593  
    200200        int x, y;
    201201        m_object->absolutePosition(x, y);
    202         IntRect newRect = m_object->getAbsoluteRepaintRect();
     202        IntRect newRect, newFullRect;
     203        m_object->getAbsoluteRepaintRectIncludingFloats(newRect, newFullRect);
    203204        if (checkForRepaint) {
    204205            RenderView *c = m_object->view();
     
    206207                bool didMove = x != m_repaintX || y != m_repaintY;
    207208                if (!didMove && !m_repaintOverflowOnResize)
    208                     m_object->repaintAfterLayoutIfNeeded(m_repaintRect);
     209                    m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect);
    209210                else if (didMove || newRect != m_repaintRect) {
    210                     c->repaintViewRectangle(m_repaintRect);
    211                     c->repaintViewRectangle(newRect);
     211                    c->repaintViewRectangle(m_fullRepaintRect);
     212                    c->repaintViewRectangle(newFullRect);
    212213                }
    213214            }
    214215        }
    215216        m_repaintRect = newRect;
     217        m_fullRepaintRect = newFullRect;
    216218        m_repaintX = x;
    217219        m_repaintY = y;
    218220    } else {
    219221        m_repaintRect = IntRect();
     222        m_fullRepaintRect = IntRect();
    220223    }
    221224   
     
    18001803        if (bbox != overflowRect)
    18011804            result.unite(overflowRect);
     1805        IntRect floatRect = renderer()->floatRect();
     1806        if (bbox != floatRect)
     1807            result.unite(floatRect);
    18021808       
    18031809        // We have to adjust the x/y of this result so that it is in the coordinate space of the layer.
  • trunk/WebCore/rendering/RenderLayer.h

    r19588 r19593  
    388388
    389389    IntRect m_repaintRect; // Cached repaint rects. Used by layout.
     390    IntRect m_fullRepaintRect;
    390391    int m_repaintX;
    391392    int m_repaintY;
  • trunk/WebCore/rendering/RenderObject.cpp

    r19588 r19593  
    17351735}
    17361736
    1737 bool RenderObject::repaintAfterLayoutIfNeeded(const IntRect& oldBounds)
     1737bool RenderObject::repaintAfterLayoutIfNeeded(const IntRect& oldBounds, const IntRect& oldFullBounds)
    17381738{
    17391739    RenderView* v = view();
     
    17411741        return false; // Don't repaint if we're printing.
    17421742
    1743     IntRect newBounds = getAbsoluteRepaintRect();
     1743    IntRect newBounds, newFullBounds;
     1744    getAbsoluteRepaintRectIncludingFloats(newBounds, newFullBounds);
    17441745    if (newBounds == oldBounds && !selfNeedsLayout())
    17451746        return false;
     
    17471748    bool fullRepaint = selfNeedsLayout() || newBounds.location() != oldBounds.location() || mustRepaintBackgroundOrBorder();
    17481749    if (fullRepaint) {
    1749         v->repaintViewRectangle(oldBounds);
     1750        v->repaintViewRectangle(oldFullBounds);
    17501751        if (newBounds != oldBounds)
    1751             v->repaintViewRectangle(newBounds);
     1752            v->repaintViewRectangle(newFullBounds);
    17521753        return true;
    17531754    }
     
    18291830        return parent()->getAbsoluteRepaintRect();
    18301831    return IntRect();
     1832}
     1833
     1834void RenderObject::getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& fullBounds)
     1835{
     1836    bounds = fullBounds = getAbsoluteRepaintRect();
    18311837}
    18321838
  • trunk/WebCore/rendering/RenderObject.h

    r19588 r19593  
    718718
    719719    // Repaint only if our old bounds and new bounds are different.
    720     bool repaintAfterLayoutIfNeeded(const IntRect& oldBounds);
     720    bool repaintAfterLayoutIfNeeded(const IntRect& oldBounds, const IntRect& oldFullBounds);
    721721
    722722    // Repaint only if the object moved.
     
    736736
    737737    IntRect getAbsoluteRepaintRectWithOutline(int ow);
     738
     739    virtual void getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& boundsWithChildren);
    738740
    739741    // Given a rect in the object's coordinate space, this method converts the rectangle to the view's
     
    748750    virtual bool hasOverhangingFloats() { return false; }
    749751    virtual bool expandsToEncloseOverhangingFloats() const { return isFloating() && style()->height().isAuto(); }
     752    virtual IntRect floatRect() const { return borderBox(); }
     753
     754    virtual bool expandsToEncloseOverflow() const { return false; }
    750755
    751756    virtual void removePositionedObjects(RenderBlock*) { }
  • trunk/WebCore/rendering/RenderPath.cpp

    r19588 r19593  
    132132
    133133    if (selfNeedsLayout() && checkForRepaint)
    134         repaintAfterLayoutIfNeeded(oldBounds);
     134        repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    135135
    136136    setNeedsLayout(false);
  • trunk/WebCore/rendering/RenderSVGContainer.cpp

    r19588 r19593  
    121121
    122122    if (selfNeedsLayout() && checkForRepaint)
    123         repaintAfterLayoutIfNeeded(oldBounds);
     123        repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    124124
    125125    setNeedsLayout(false);
  • trunk/WebCore/rendering/RenderSVGText.cpp

    r19588 r19593  
    7878    bool repainted = false;
    7979    if (checkForRepaint)
    80         repainted = repaintAfterLayoutIfNeeded(oldBounds);
     80        repainted = repaintAfterLayoutIfNeeded(oldBounds, oldBounds);
    8181   
    8282    setNeedsLayout(false);
  • trunk/WebCore/rendering/RenderTable.cpp

    r19588 r19593  
    277277
    278278    IntRect oldBounds;
     279    IntRect oldFullBounds;
    279280    bool checkForRepaint = checkForRepaintDuringLayout();
    280281    if (checkForRepaint) {
    281         oldBounds = getAbsoluteRepaintRect();
     282        getAbsoluteRepaintRectIncludingFloats(oldBounds, oldFullBounds);
    282283        oldBounds.move(view()->layoutDelta());
     284        oldFullBounds.move(view()->layoutDelta());
    283285    }
    284286   
     
    424426    // Repaint with our new bounds if they are different from our old bounds.
    425427    if (checkForRepaint)
    426         didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds);
     428        didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds, oldFullBounds);
    427429    if (!didFullRepaint && sectionMoved) {
    428430        IntRect repaintRect(m_overflowLeft, movedSectionTop, m_overflowWidth - m_overflowLeft, m_overflowHeight - movedSectionTop);
  • trunk/WebCore/rendering/RenderTableCell.h

    r19588 r19593  
    6868
    6969    virtual bool expandsToEncloseOverhangingFloats() const { return true; }
     70    virtual bool expandsToEncloseOverflow() const { return true; }
    7071
    7172    int borderLeft() const;
Note: See TracChangeset for help on using the changeset viewer.