Changeset 19593 in webkit
- Timestamp:
- Feb 12, 2007 5:41:52 PM (17 years ago)
- Location:
- trunk
- Files:
-
- 8 deleted
- 118 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/css1/formatting_model/inline_elements-expected.checksum
r19588 r19593 1 b2da820c6f3f6667759c9aa205909f11 1 55a1f301085cb525112043606e0fc453 -
trunk/LayoutTests/css1/formatting_model/inline_elements-expected.txt
r19588 r19593 1 layer at (0,0) size 785x7 791 layer at (0,0) size 785x792 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x7 794 RenderBlock {HTML} at (0,0) size 785x7 795 RenderBody {BODY} at (8,8) size 769x7 63[bgcolor=#CCCCCC]3 layer at (0,0) size 785x792 4 RenderBlock {HTML} at (0,0) size 785x792 5 RenderBody {BODY} at (8,8) size 769x776 [bgcolor=#CCCCCC] 6 6 RenderBlock {P} at (0,0) size 769x18 7 7 RenderText {#text} at (0,0) size 355x18 … … 53 53 text run at (83,48) width 3: " " 54 54 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 769x3 08[border: (1px outset #808080)]56 RenderTableSection {TBODY} at (1,1) size 767x3 0655 RenderTable {TABLE} at (0,455) size 769x321 [border: (1px outset #808080)] 56 RenderTableSection {TBODY} at (1,1) size 767x319 57 57 RenderTableRow {TR} at (0,0) size 767x26 58 58 RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] … … 60 60 RenderText {#text} at (4,4) size 163x18 61 61 text run at (4,4) width 163: "TABLE Testing Section" 62 RenderTableRow {TR} at (0,26) size 767x2 8063 RenderTableCell {TD} at (0,15 3) 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] 64 64 RenderText {#text} at (4,4) size 4x18 65 65 text run at (4,4) width 4: " " 66 RenderTableCell {TD} at (12,26) size 755x2 80[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] 67 67 RenderBlock {P} at (4,4) size 747x192 68 68 RenderText {#text} at (0,7) size 187x18 -
trunk/LayoutTests/css2.1/t0905-c414-flt-00-d-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x1 703 layer at (0,0) size 800x134 4 4 RenderBlock {HTML} at (0,0) size 800x134 5 5 RenderBody {BODY} at (8,16) size 784x102 -
trunk/LayoutTests/css2.1/t0905-c414-flt-01-d-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x1 623 layer at (0,0) size 800x130 4 4 RenderBlock {HTML} at (0,0) size 800x130 5 5 RenderBody {BODY} at (8,16) size 784x98 -
trunk/LayoutTests/css2.1/t0905-c414-flt-02-c-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 2643 layer at (0,0) size 800x68 4 4 RenderBlock {HTML} at (0,0) size 800x68 5 5 RenderBody {BODY} at (8,16) size 784x36 -
trunk/LayoutTests/css2.1/t0905-c414-flt-03-c-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 2643 layer at (0,0) size 800x68 4 4 RenderBlock {HTML} at (0,0) size 800x68 5 5 RenderBody {BODY} at (8,16) size 784x36 -
trunk/LayoutTests/css2.1/t0905-c414-flt-04-c-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 3443 layer at (0,0) size 800x68 4 4 RenderBlock {HTML} at (0,0) size 800x68 5 5 RenderBody {BODY} at (8,16) size 784x36 -
trunk/LayoutTests/css2.1/t0905-c414-flt-wrap-01-d-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x1 633 layer at (0,0) size 800x156 4 4 RenderBlock {HTML} at (0,0) size 800x156 5 5 RenderBody {BODY} at (8,16) size 784x124 -
trunk/LayoutTests/css2.1/t0905-c5525-fltcont-00-d-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 2603 layer at (0,0) size 800x8 4 4 RenderBlock {HTML} at (0,0) size 800x8 5 5 RenderBody {BODY} at (8,8) size 784x0 -
trunk/LayoutTests/css2.1/t0905-c5525-fltwidth-02-c-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 543 layer at (0,0) size 800x34 4 4 RenderBlock {HTML} at (0,0) size 800x34 5 5 RenderBody {BODY} at (8,8) size 784x18 -
trunk/LayoutTests/css2.1/t0905-c5525-fltwidth-03-c-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 443 layer at (0,0) size 800x34 4 4 RenderBlock {HTML} at (0,0) size 800x34 5 5 RenderBody {BODY} at (8,8) size 784x18 -
trunk/LayoutTests/css2.1/t090501-c414-flt-02-d-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 2183 layer at (0,0) size 800x154 4 4 RenderBlock {HTML} at (0,0) size 800x154 5 5 RenderBody {BODY} at (8,16) size 784x122 -
trunk/LayoutTests/css2.1/t090501-c414-flt-03-b-g-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 2373 layer at (0,0) size 800x155 4 4 RenderBlock {HTML} at (0,0) size 800x155 5 5 RenderBody {BODY} at (8,16) size 784x123 -
trunk/LayoutTests/fast/backgrounds/repeat/negative-offset-repeat-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 5243 layer at (0,0) size 800x484 4 4 RenderBlock {HTML} at (0,0) size 800x484 5 5 RenderBody {BODY} at (8,16) size 784x452 -
trunk/LayoutTests/fast/block/float/008-expected.txt
r19588 r19593 1 1 layer at (0,0) size 785x608 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x60 83 layer at (0,0) size 785x600 4 4 RenderBlock {HTML} at (0,0) size 785x600 5 5 RenderBody {BODY} at (8,8) size 769x300 -
trunk/LayoutTests/fast/block/float/013-expected.checksum
r19588 r19593 1 f069ee9081d2de062f2c9e90efa023b9 1 76249c23fcdddcecf3cdb08b2120b225 -
trunk/LayoutTests/fast/block/float/013-expected.txt
r19588 r19593 4 4 RenderBlock {HTML} at (0,0) size 800x8 5 5 RenderBody {BODY} at (8,8) size 784x0 6 layer at (8,64) size 800x1 156 layer at (8,64) size 800x108 7 7 RenderBlock (positioned) {DIV} at (8,64) size 800x108 [bgcolor=#0000FF] 8 8 RenderBlock {DIV} at (38,8) size 723x57 [bgcolor=#008000] [border: (2px solid #888878) none] -
trunk/LayoutTests/fast/block/float/029-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1663 layer at (0,0) size 800x54 4 4 RenderBlock {HTML} at (0,0) size 800x54 5 5 RenderBody {BODY} at (8,8) size 784x38 -
trunk/LayoutTests/fast/block/float/031-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x3 323 layer at (0,0) size 800x300 4 4 RenderBlock {HTML} at (0,0) size 800x300 5 5 RenderBody {BODY} at (8,8) size 784x284 -
trunk/LayoutTests/fast/block/float/float-in-float-painting-expected.txt
r19588 r19593 13 13 RenderText {#text} at (115,18) size 597x18 14 14 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 784x1 6215 layer at (8,44) size 784x125 16 16 RenderBlock {DIV} at (0,36) size 784x125 17 17 RenderBlock (floating) {DIV} at (0,0) size 104x125 -
trunk/LayoutTests/fast/block/margin-collapse/059-expected.checksum
r19588 r19593 1 8 f0042cc5c242365774f89743a2678a01 8e03cda31efbafc6ddf1b53fa70376a9 -
trunk/LayoutTests/fast/block/margin-collapse/059-expected.txt
r19588 r19593 10 10 RenderTableSection {TBODY} at (3,3) size 100x200 11 11 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] 13 13 RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#FF0000] 14 14 RenderBlock {DIV} at (0,0) size 50x150 [bgcolor=#00FFFF] -
trunk/LayoutTests/fast/block/margin-collapse/062-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 110layerType: background only3 layer at (0,0) size 800x46 layerType: background only 4 4 layer at (10,46) size 320x64 5 5 RenderBlock (positioned) zI: -1 {DIV} at (10,46) size 320x64 [color=#FFFF00] [bgcolor=#FF0000] 6 6 RenderText zI: -1 {#text} at (0,0) size 36x18 7 7 text run at (0,0) width 36: "FAIL" 8 layer at (0,0) size 800x 110layerType: foreground only8 layer at (0,0) size 800x46 layerType: foreground only 9 9 RenderBlock {HTML} at (0,0) size 800x46 10 10 RenderBody {BODY} at (10,46) size 780x0 -
trunk/LayoutTests/fast/block/margin-collapse/063-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 77layerType: background only3 layer at (0,0) size 800x49 layerType: background only 4 4 layer at (10,13) size 320x64 5 5 RenderBlock (positioned) zI: -1 {DIV} at (10,13) size 320x64 [color=#FFFF00] [bgcolor=#FF0000] 6 6 RenderText zI: -1 {#text} at (0,0) size 36x18 7 7 text run at (0,0) width 36: "FAIL" 8 layer at (0,0) size 800x 77layerType: foreground only8 layer at (0,0) size 800x49 layerType: foreground only 9 9 RenderBlock {HTML} at (0,0) size 800x49 10 10 RenderBody {BODY} at (10,2) size 780x1 -
trunk/LayoutTests/fast/box-shadow/basic-shadows-expected.txt
r19588 r19593 1 1 layer at (0,0) size 785x671 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x6 713 layer at (0,0) size 785x658 4 4 RenderBlock {HTML} at (0,0) size 785x658 5 5 RenderBody {BODY} at (8,8) size 769x634 -
trunk/LayoutTests/fast/forms/floating-textfield-relayout-expected.checksum
r19588 r19593 1 9eea4b422a919b63d920d6da21841f7b 1 2a7212dd9cad1f4955efa5403430629c -
trunk/LayoutTests/fast/forms/floating-textfield-relayout-expected.txt
r19588 r19593 18 18 text run at (59,18) width 4: "." 19 19 RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #000000)] 20 layer at (8,70) size 784x 2120 layer at (8,70) size 784x0 21 21 RenderBlock (relative positioned) {DIV} at (0,62) size 784x0 22 22 RenderTextControl {INPUT} at (0,2) size 392x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)] -
trunk/LayoutTests/fast/lists/003-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x3 503 layer at (0,0) size 800x334 4 4 RenderBlock {HTML} at (0,0) size 800x334 5 5 RenderBody {BODY} at (8,16) size 784x302 -
trunk/LayoutTests/fast/media/mq-relative-constraints-08-expected.txt
r19588 r19593 1 1 layer at (0,0) size 785x642 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x6 423 layer at (0,0) size 785x600 4 4 RenderBlock {HTML} at (0,0) size 785x600 5 5 RenderBody {BODY} at (8,8) size 769x576 -
trunk/LayoutTests/fast/multicol/float-multicol-expected.txt
r19588 r19593 1 1 layer at (0,0) size 785x794 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 7943 layer at (0,0) size 785x670 4 4 RenderBlock {HTML} at (0,0) size 785x670 5 5 RenderBody {BODY} at (8,19) size 769x635 -
trunk/LayoutTests/fast/table/009-expected.checksum
r19588 r19593 1 12a8a4de3eab368c50a059827e98cb07 1 97ea3f069f0cfaf6898e9f733f98c33c -
trunk/LayoutTests/fast/table/009-expected.txt
r19588 r19593 4 4 RenderBlock {HTML} at (0,0) size 800x600 5 5 RenderBody {BODY} at (0,0) size 800x584 [bgcolor=#FFFFFF] 6 RenderBlock {CENTER} at (0,0) size 800x 587 RenderTable {TABLE} at (0,0) size 800x 58[bgcolor=#CCCCCC] [border: (1px outset #808080)]8 RenderTableSection {TBODY} at (1,1) size 798x 569 RenderTableRow {TR} at (0,0) size 798x 5610 RenderTableCell {TD} at (0,0) size 798x 56[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] 11 11 RenderBlock {DIV} at (82,1) size 634x54 [border: (2px solid #FF0000)] 12 12 RenderTable {TABLE} at (2,2) size 630x216 [bgcolor=#CCCCCC] [border: (2px outset #808080)] … … 19 19 RenderTableCell {TD} at (0,0) size 97x180 [r=0 c=0 rs=1 cs=1] 20 20 RenderImage {IMG} at (0,0) size 97x180 21 RenderBlock {P} at (0, 74) size 800x022 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)] 23 23 RenderText {#text} at (2,2) size 82x54 24 24 text run at (2,2) width 82: "Here is some" … … 40 40 RenderText {#text} at (2,146) size 45x18 41 41 text run at (2,146) width 45: "Really." 42 RenderBlock {P} at (0, 74) size 800x042 RenderBlock {P} at (0,238) size 800x0 -
trunk/LayoutTests/fast/text/text-shadow-extreme-value.html
r19588 r19593 3 3 <title>Test HTML Page</title> 4 4 <script> 5 function test() 6 { 7 if (window.layoutTestController) { 8 layoutTestController.dumpAsText(); 9 document.body.offsetTop; 10 layoutTestController.display(); 11 } 12 } 5 if (window.layoutTestController) 6 layoutTestController.dumpAsText(); 13 7 </script> 14 8 <style type="text/css"> … … 16 10 </style> 17 11 </head> 18 <body onload="test()">12 <body> 19 13 <p>Extreme text-shadow blur values should not crash.</p> 20 14 </body> -
trunk/LayoutTests/fast/text/whitespace/012-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1563 layer at (0,0) size 800x76 4 4 RenderBlock {HTML} at (0,0) size 800x76 5 5 RenderBody {BODY} at (8,8) size 784x52 -
trunk/LayoutTests/tables/mozilla/bugs/bug120364-expected.txt
r19588 r19593 1 1 layer at (0,0) size 785x1813 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 18133 layer at (0,0) size 785x600 4 4 RenderBlock {HTML} at (0,0) size 785x600 5 5 RenderBody {BODY} at (8,8) size 769x584 -
trunk/LayoutTests/tables/mozilla/bugs/bug196870-expected.checksum
r19588 r19593 1 904b2a329a83e47c32af9dde9b082774 1 1bec2a2cd4977686d9d5a1e056c8fdc2 -
trunk/LayoutTests/tables/mozilla/bugs/bug196870-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 474 RenderBlock {HTML} at (0,0) size 800x 475 RenderBody {BODY} at (8,8) size 784x 316 RenderTable {TABLE} at (0,0) size 130x 317 RenderTableSection {TBODY} at (0,0) size 130x 318 RenderTableRow {TR} at (0,2) size 130x 279 RenderTableCell {TD} at (2,2) size 126x 27[r=0 c=0 rs=1 cs=1]3 layer 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] 10 10 RenderBlock {DIV} at (100,1) size 25x25 11 11 RenderImage {IMG} at (0,0) size 77x77 -
trunk/LayoutTests/tables/mozilla/bugs/bug45055-2-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1363 layer at (0,0) size 800x8 4 4 RenderBlock {HTML} at (0,0) size 800x8 5 5 RenderBody {BODY} at (8,8) size 784x0 [bgcolor=#FFFFFF] -
trunk/LayoutTests/tables/mozilla/bugs/bug72359-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 623 layer at (0,0) size 800x8 4 4 RenderBlock {html} at (0,0) size 800x8 5 5 RenderBody {body} at (8,8) size 784x0 -
trunk/LayoutTests/tables/mozilla/marvin/x_table_align_left-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 363 layer at (0,0) size 800x8 4 4 RenderBlock {html} at (0,0) size 800x8 5 5 RenderBody {body} at (8,8) size 784x0 -
trunk/LayoutTests/tables/mozilla/marvin/x_table_align_right-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 363 layer at (0,0) size 800x8 4 4 RenderBlock {html} at (0,0) size 800x8 5 5 RenderBody {body} at (8,8) size 784x0 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.checksum
r19588 r19593 1 85c7b05d885bbac635c8b940fbcc4e1b 1 034076c6256aecd14026c7637d29d4ff -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1164 RenderBlock {HTML} at (0,0) size 800x 1165 RenderBody {BODY} at (8,8) size 784x 1006 RenderTable {TABLE} at (0,0) size 200x 100 [bgcolor=#0000FF]7 RenderTableSection {TBODY} at (0,0) size 200x 1008 RenderTableRow {TR} at (0,0) size 200x 1009 RenderTableCell {TD} at (0, 41) size 59x18 [r=0 c=0 rs=1 cs=1]3 layer 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] 10 10 RenderText {#text} at (0,0) size 21x18 11 11 text run at (0,0) width 21: "foo" 12 RenderTableCell {TD} at (59,0) size 141x 50 [r=0 c=1 rs=1 cs=1]12 RenderTableCell {TD} at (59,0) size 141x300 [r=0 c=1 rs=1 cs=1] 13 13 RenderBlock {DIV} at (0,0) size 50x50 [bgcolor=#008000] 14 14 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 1 7452def0f334ebd3b3e4ab06367e8955 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_row-expected.txt
r19588 r19593 1 layer at (0,0) size 785x61 21 layer at (0,0) size 785x619 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 4164 RenderBlock {HTML} at (0,0) size 785x 4165 RenderBody {BODY} at (8,8) size 769x 4006 RenderTable {TABLE} at (0,0) size 229x 400[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 227x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (102,3) size 22x18 9 9 text run at (102,3) width 22: "cap" 10 RenderTableSection {TBODY} at (1,207) size 227x 19211 RenderTableRow {TR} at (0,30) size 227x 13212 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] 13 13 RenderText {#text} at (16,16) size 21x18 14 14 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] 16 16 RenderBlock {DIV} at (16,16) size 52x52 [border: (1px solid #008000)] 17 17 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 e 00ac6458b82189a0b510a2a44bb40891 e6081f0f652de26f0c095542cc9d5ac3 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_table-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 3564 RenderBlock {HTML} at (0,0) size 800x 3565 RenderBody {BODY} at (8,8) size 784x 3406 RenderTable {TABLE} at (0,0) size 200x 340 [bgcolor=#0000FF]3 layer 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] 7 7 RenderBlock {CAPTION} at (0,0) size 200x200 [bgcolor=#FFA500] 8 8 RenderText {#text} at (89,0) size 22x18 9 9 text run at (89,0) width 22: "cap" 10 RenderTableSection {TBODY} at (0,200) size 200x 14011 RenderTableRow {TR} at (0,0) size 200x 14012 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] 13 13 RenderText {#text} at (20,20) size 21x18 14 14 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] 16 16 RenderBlock {DIV} at (20,20) size 50x50 [bgcolor=#008000] 17 17 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 1 8e7ac76ea28c973ca22bda2328a5d662 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_dirty_reflow_tbody-expected.txt
r19588 r19593 1 layer at (0,0) size 785x7 281 layer at (0,0) size 785x735 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 5324 RenderBlock {HTML} at (0,0) size 785x 5325 RenderBody {BODY} at (8,8) size 769x 5166 RenderTable {TABLE} at (0,0) size 229x 516[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 227x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (102,3) size 22x18 9 9 text run at (102,3) width 22: "cap" 10 RenderTableSection {TBODY} at (1,207) size 227x 30810 RenderTableSection {TBODY} at (1,207) size 227x511 11 11 RenderTableRow {TR} at (0,30) size 227x86 12 12 RenderTableCell {TD} at (30,48) size 53x50 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] … … 22 22 RenderText {#text} at (16,52) size 22x18 23 23 text run at (16,52) width 22: "zap" 24 RenderTableRow {TR} at (0,146) size 227x 13225 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] 26 26 RenderText {#text} at (16,16) size 21x18 27 27 text run at (16,16) width 21: "foo" 28 RenderTableCell {TD} at (113,1 94) 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] 29 29 RenderBlock {DIV} at (16,16) size 52x52 [border: (1px solid #008000)] 30 30 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 1 363abbecc85936d99f10536ed1738d04 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_table-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 384 RenderBlock {HTML} at (0,0) size 800x 385 RenderBody {BODY} at (8,8) size 784x 226 layer at (8,8) size 22x 22 clip at (9,9) size 20x20 scrollWidth 707 scrollHeight 5077 RenderTable {TABLE} at (0,0) size 22x 22[border: (1px outset #808080)]8 RenderTableSection {TBODY} at (1,1) size 20x 209 RenderTableRow {TR} at (0,2) size 20x 1610 RenderTableCell {TD} at (2,2) size 16x 16[border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer at (0,0) size 800x529 4 RenderBlock {HTML} at (0,0) size 800x529 5 RenderBody {BODY} at (8,8) size 784x513 6 layer 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] 11 11 RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)] 12 12 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 1 363abbecc85936d99f10536ed1738d04 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tbody-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 384 RenderBlock {HTML} at (0,0) size 800x 385 RenderBody {BODY} at (8,8) size 784x 226 RenderTable {TABLE} at (0,0) size 22x 22[border: (1px outset #808080)]7 layer at (9,9) size 20x 20 scrollWidth 707 scrollHeight 5078 RenderTableSection {TBODY} at (1,1) size 20x 209 RenderTableRow {TR} at (0,2) size 20x 1610 RenderTableCell {TD} at (2,2) size 16x 16[border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer 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 layer 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] 11 11 RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)] 12 12 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 1 363abbecc85936d99f10536ed1738d04 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_hidden_tr-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 384 RenderBlock {HTML} at (0,0) size 800x 385 RenderBody {BODY} at (8,8) size 784x 226 RenderTable {TABLE} at (0,0) size 22x 22[border: (1px outset #808080)]7 RenderTableSection {TBODY} at (1,1) size 20x 208 layer at (9,11) size 20x 169 RenderTableRow {TR} at (0,2) size 20x 1610 RenderTableCell {TD} at (2,2) size 16x 16[border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer 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 8 layer 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] 11 11 RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)] 12 12 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 1 9dd2a0762ccc745d867fe7f4951673ad -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 3974 RenderBlock {HTML} at (0,0) size 800x 3975 RenderBody {BODY} at (8,8) size 784x 3816 RenderTable {TABLE} at (0,0) size 200x 381[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,207) size 198x 17311 RenderTableRow {TR} at (0,30) size 198x 11312 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] 13 13 RenderText {#text} at (1,1) size 44x111 14 14 text run at (1,1) width 43: "foo" 15 15 text run at (1,38) width 41: "bar" 16 16 text run at (1,75) width 44: "baz" 17 RenderTableCell {TD} at (114,30) size 54x 54[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] 18 18 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 19 19 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 1 1874d8a1f9a2d0bb88510dc3c7d0782d -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_cell_sibling-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 3864 RenderBlock {HTML} at (0,0) size 800x 3865 RenderBody {BODY} at (8,8) size 784x 3706 RenderTable {TABLE} at (0,0) size 200x 370[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,207) size 198x 16211 RenderTableRow {TR} at (0,30) size 198x 10212 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] 13 13 RenderText {#text} at (1,1) size 38x30 14 14 text run at (1,1) width 38: "foo bar" 15 15 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] 17 17 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 18 18 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 1 e63da4ef64e59c683071748ac1829b6c -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 3864 RenderBlock {HTML} at (0,0) size 800x 3865 RenderBody {BODY} at (8,8) size 784x 3706 RenderTable {TABLE} at (0,0) size 200x 370[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,207) size 198x 16211 RenderTableRow {TR} at (0,30) size 198x 10212 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] 13 13 RenderText {#text} at (1,1) size 38x30 14 14 text run at (1,1) width 38: "foo bar" 15 15 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] 17 17 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 18 18 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 1 5daf609f4be509c7fad304416a5cf780 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_row_sibling-expected.txt
r19588 r19593 1 layer at (0,0) size 785x6 851 layer at (0,0) size 785x666 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 4744 RenderBlock {HTML} at (0,0) size 785x 4745 RenderBody {BODY} at (8,8) size 769x 4586 RenderTable {TABLE} at (0,0) size 200x 458[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,207) size 198x 25010 RenderTableSection {TBODY} at (1,207) size 198x442 11 11 RenderTableRow {TR} at (0,30) size 198x47 12 12 RenderTableCell {TD} at (30,45) size 54x17 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] … … 22 22 RenderText {#text} at (1,31) size 19x15 23 23 text run at (1,31) width 19: "zap" 24 RenderTableRow {TR} at (0,107) size 198x 11325 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] 26 26 RenderText {#text} at (1,1) size 44x111 27 27 text run at (1,1) width 43: "foo" 28 28 text run at (1,38) width 41: "bar" 29 29 text run at (1,75) width 44: "baz" 30 RenderTableCell {TD} at (114,1 66) 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] 31 31 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 32 32 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 1 27f1de52df50405a3062410ef89621ad -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1634 RenderBlock {HTML} at (0,0) size 800x 1635 RenderBody {BODY} at (8,8) size 784x 1476 RenderTable {TABLE} at (0,0) size 200x 147[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x43 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,44) size 198x 10211 RenderTableRow {TR} at (0,0) size 198x 10212 RenderTableCell {TD} at (0,1 3) 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] 13 13 RenderText {#text} at (1,1) size 92x74 14 14 text run at (1,1) width 92: "foo bar" 15 15 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] 17 17 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 18 18 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 1 4d8c3409c239129ac7a9f69134e9f1d7 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_table_caption-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 2344 RenderBlock {HTML} at (0,0) size 800x 2345 RenderBody {BODY} at (8,8) size 784x 2186 RenderTable {TABLE} at (0,0) size 200x 218[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x43 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,44) size 198x 17311 RenderTableRow {TR} at (0,30) size 198x 11312 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] 13 13 RenderText {#text} at (1,1) size 44x111 14 14 text run at (1,1) width 43: "foo" 15 15 text run at (1,38) width 41: "bar" 16 16 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] 18 18 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 19 19 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 1 d7d6fcd1c1a085add192501ac38a1206 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 3864 RenderBlock {HTML} at (0,0) size 800x 3865 RenderBody {BODY} at (8,8) size 784x 3706 RenderTable {TABLE} at (0,0) size 200x 370[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 9 9 text run at (77,3) width 44: "cap" 10 RenderTableSection {TBODY} at (1,207) size 198x 16211 RenderTableRow {TR} at (0,30) size 198x 10212 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] 13 13 RenderText {#text} at (1,1) size 45x36 14 14 text run at (1,1) width 45: "foo bar" 15 15 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] 17 17 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 18 18 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 1 560d8103342d139c584cf15a2921d534 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_style_reflow_tbody_sibling-expected.txt
r19588 r19593 1 layer at (0,0) size 785x7 241 layer at (0,0) size 785x705 2 2 RenderView at (0,0) size 785x600 3 layer at (0,0) size 785x 5134 RenderBlock {HTML} at (0,0) size 785x 5135 RenderBody {BODY} at (8,8) size 769x 4976 RenderTable {TABLE} at (0,0) size 200x 497[border: (1px outset #808080)]3 layer 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)] 7 7 RenderBlock {CAPTION} at (0,0) size 198x206 [border: (3px solid #FFA500)] 8 8 RenderText {#text} at (77,3) size 44x37 … … 22 22 RenderText {#text} at (1,37) size 22x18 23 23 text run at (1,37) width 22: "zap" 24 RenderTableSection {TBODY} at (1,323) size 198x 17325 RenderTableRow {TR} at (0,30) size 198x 11326 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] 27 27 RenderText {#text} at (1,1) size 44x111 28 28 text run at (1,1) width 43: "foo" 29 29 text run at (1,38) width 41: "bar" 30 30 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] 32 32 RenderBlock {DIV} at (1,1) size 52x52 [border: (1px solid #008000)] 33 33 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 1 7202a1cd6cca2d6cfb405d3c3133e366 -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_align_right-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1264 RenderBlock {HTML} at (0,0) size 800x 1265 RenderBody {BODY} at (8,8) size 784x 1106 RenderTable {TABLE} at (0,0) size 200x 110[border: (1px outset #808080)]7 RenderTableSection {TBODY} at (1,1) size 198x 1088 RenderTableRow {TR} at (0,2) size 198x 1049 RenderTableCell {TD} at (2, 43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer 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] 10 10 RenderText {#text} at (2,2) size 21x18 11 11 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] 13 13 RenderBlock {DIV} at (61,2) size 12x12 [border: (1px solid #008000)] 14 14 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 1 ff1c7f3e9940d48f979950ad2a6e309d -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_bottom-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1264 RenderBlock {HTML} at (0,0) size 800x 1265 RenderBody {BODY} at (8,8) size 784x 1106 RenderTable {TABLE} at (0,0) size 200x 110[border: (1px outset #808080)]7 RenderTableSection {TBODY} at (1,1) size 198x 1088 RenderTableRow {TR} at (0,2) size 198x 1049 RenderTableCell {TD} at (2, 43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer 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] 10 10 RenderText {#text} at (2,2) size 21x18 11 11 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] 13 13 RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)] 14 14 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 1 ff1c7f3e9940d48f979950ad2a6e309d -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_middle-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1264 RenderBlock {HTML} at (0,0) size 800x 1265 RenderBody {BODY} at (8,8) size 784x 1106 RenderTable {TABLE} at (0,0) size 200x 110[border: (1px outset #808080)]7 RenderTableSection {TBODY} at (1,1) size 198x 1088 RenderTableRow {TR} at (0,2) size 198x 1049 RenderTableCell {TD} at (2, 43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer 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] 10 10 RenderText {#text} at (2,2) size 21x18 11 11 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] 13 13 RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)] 14 14 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 1 ff1c7f3e9940d48f979950ad2a6e309d -
trunk/LayoutTests/tables/mozilla_expected_failures/marvin/table_overflow_td_valign_top-expected.txt
r19588 r19593 1 1 layer at (0,0) size 800x600 2 2 RenderView at (0,0) size 800x600 3 layer at (0,0) size 800x 1264 RenderBlock {HTML} at (0,0) size 800x 1265 RenderBody {BODY} at (8,8) size 784x 1106 RenderTable {TABLE} at (0,0) size 200x 110[border: (1px outset #808080)]7 RenderTableSection {TBODY} at (1,1) size 198x 1088 RenderTableRow {TR} at (0,2) size 198x 1049 RenderTableCell {TD} at (2, 43) size 117x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]3 layer 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] 10 10 RenderText {#text} at (2,2) size 21x18 11 11 text run at (2,2) width 21: "foo" 12 RenderTableCell {TD} at (121,2) size 75x 16[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] 13 13 RenderBlock {DIV} at (2,2) size 12x12 [border: (1px solid #008000)] 14 14 RenderBlock {DIV} at (1,1) size 302x402 [border: (1px solid #FF0000)] -
trunk/WebCore/rendering/InlineFlowBox.cpp
r19588 r19593 300 300 x += curr->object()->marginLeft(); 301 301 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); 304 304 x += curr->width() + curr->object()->marginRight(); 305 305 } -
trunk/WebCore/rendering/RenderBlock.cpp
r19588 r19593 467 467 } 468 468 469 IntRect oldBounds ;469 IntRect oldBounds, oldFullBounds; 470 470 bool checkForRepaint = checkForRepaintDuringLayout(); 471 471 if (checkForRepaint) { 472 oldBounds = getAbsoluteRepaintRect();472 getAbsoluteRepaintRectIncludingFloats(oldBounds, oldFullBounds); 473 473 oldBounds.move(view()->layoutDelta()); 474 oldFullBounds.move(view()->layoutDelta()); 474 475 } 475 476 … … 555 556 relayoutChildren = true; 556 557 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 557 562 // Some classes of objects (floats and fieldsets with no specified heights and table cells) expand to encompass 558 563 // overhanging floats. … … 562 567 } 563 568 564 if ((isTableCell() || isInline() || isFloatingOrPositioned() || isRoot()) && !hasOverflowClip() && !hasControlClip())565 addVisualOverflow(floatRect());566 567 569 layoutPositionedObjects(relayoutChildren || isRoot()); 568 570 … … 582 584 bool didFullRepaint = false; 583 585 if (checkForRepaint) 584 didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds );586 didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds, oldFullBounds); 585 587 if (!didFullRepaint && !repaintRect.isEmpty()) { 586 588 // FIXME: Deal with multiple column repainting. We have to split the repaint … … 1153 1155 determineHorizontalPosition(child); 1154 1156 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 1155 1160 // Update our height now that the child has been placed in the correct position. 1156 1161 m_height += child->height(); … … 1159 1164 marginInfo.clearMargin(); 1160 1165 } 1166 int overflowDelta = child->overflowHeight(false) - child->height(); 1167 if (m_height + overflowDelta > m_overflowHeight) 1168 m_overflowHeight = m_height + overflowDelta; 1169 1161 1170 // If the child has overhanging floats that intrude into following siblings (or possibly out 1162 1171 // of this block), then the parent gets notified of the floats now. 1163 1172 addOverhangingFloats(static_cast<RenderBlock *>(child), -child->xPos(), -child->yPos()); 1164 1173 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. 1168 1175 m_overflowWidth = max(child->xPos() + child->overflowWidth(false), m_overflowWidth); 1169 1176 m_overflowLeft = min(child->xPos() + child->overflowLeft(false), m_overflowLeft); … … 1228 1235 } 1229 1236 1237 void 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 1230 1260 void RenderBlock::repaintOverhangingFloats(bool paintAllDescendants) 1231 1261 { … … 1279 1309 overflowBox.inflate(maximalOutlineSize(paintInfo.phase)); 1280 1310 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 } 1283 1322 } 1284 1323 … … 2211 2250 IntRect RenderBlock::floatRect() const 2212 2251 { 2213 IntRect result ;2252 IntRect result(borderBox()); 2214 2253 if (!m_floatingObjects || hasOverflowClip()) 2215 2254 return result; … … 2218 2257 for (; (r = it.current()); ++it) { 2219 2258 if (!r->noPaint && !r->node->layer()) { 2220 IntRect childRect = r->node->overflowRect(false);2259 IntRect childRect = unionRect(r->node->floatRect(), r->node->overflowRect()); 2221 2260 childRect.move(r->left + r->node->marginLeft(), r->startY + r->node->marginTop()); 2222 2261 result.unite(childRect); … … 2452 2491 { 2453 2492 // 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()) 2455 2494 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 2460 2502 DeprecatedPtrListIterator<FloatingObject> it(*child->m_floatingObjects); 2461 for (FloatingObject *r; (r = it.current()); ++it) {2503 for (FloatingObject *r; (r = it.current()); ++it) { 2462 2504 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 2463 2516 // If the object is not in the list, we add it now. 2464 if (! containsFloat(r->node)) {2517 if (!f) { 2465 2518 FloatingObject *floatingObj = new FloatingObject(r->type()); 2466 2519 floatingObj->startY = r->startY - yoff; … … 2487 2540 } 2488 2541 } 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 } 2496 2543 } 2497 2544 … … 2615 2662 } 2616 2663 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 2627 2664 bool RenderBlock::isPointInScrollbar(HitTestResult& result, int _x, int _y, int _tx, int _ty) 2628 2665 { … … 2666 2703 IntRect overflowBox = overflowRect(false); 2667 2704 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 } 2670 2715 } 2671 2716 -
trunk/WebCore/rendering/RenderBlock.h
r19588 r19593 70 70 virtual void setOverflowWidth(int w) { m_overflowWidth = w; } 71 71 72 void addVisualOverflow(const IntRect&);73 74 72 virtual bool isSelfCollapsingBlock() const; 75 73 virtual bool isTopMarginQuirk() const { return m_topMarginQuirk; } … … 104 102 virtual void repaintObjectsBeforeLayout(); 105 103 virtual void repaintOverhangingFloats(bool paintAllDescendants); 104 virtual void getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& fullBounds); 106 105 107 106 virtual void setStyle(RenderStyle*); … … 180 179 inline int leftBottom(); 181 180 inline int rightBottom(); 181 virtual IntRect floatRect() const; 182 182 183 183 virtual int lineWidth(int y) const; … … 290 290 291 291 protected: 292 IntRect floatRect() const;293 292 void newLine(); 294 293 virtual bool hasLineIfEmpty() const; … … 450 449 int m_maxBottomNegMargin; 451 450 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. 453 454 int m_overflowHeight; 454 455 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. 455 459 int m_overflowLeft; 456 460 int m_overflowTop; -
trunk/WebCore/rendering/RenderFlexibleBox.cpp
r19588 r19593 331 331 // Repaint with our new bounds if they are different from our old bounds. 332 332 if (checkForRepaint) 333 repaintAfterLayoutIfNeeded(oldBounds );333 repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 334 334 335 335 setNeedsLayout(false); … … 489 489 490 490 placeChild(child, xPos, childY); 491 492 if (child->isRenderBlock())493 static_cast<RenderBlock*>(child)->addVisualOverflow(static_cast<RenderBlock*>(child)->floatRect());494 495 491 m_overflowHeight = max(m_overflowHeight, childY + child->overflowHeight(false)); 496 492 m_overflowTop = min(m_overflowTop, child->yPos() + child->overflowTop(false)); … … 871 867 m_height += child->height() + child->marginBottom(); 872 868 873 if (child->isRenderBlock())874 static_cast<RenderBlock*>(child)->addVisualOverflow(static_cast<RenderBlock*>(child)->floatRect());875 876 869 // See if this child has made our overflow need to grow. 877 870 m_overflowWidth = max(child->xPos() + child->overflowWidth(false), m_overflowWidth); -
trunk/WebCore/rendering/RenderForeignObject.cpp
r19588 r19593 98 98 99 99 if (checkForRepaint) 100 repaintAfterLayoutIfNeeded(oldBounds );100 repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 101 101 102 102 setNeedsLayout(false); -
trunk/WebCore/rendering/RenderHTMLCanvas.cpp
r19588 r19593 91 91 calcHeight(); 92 92 if (checkForRepaint) 93 repaintAfterLayoutIfNeeded(oldBounds );93 repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 94 94 95 95 setNeedsLayout(false); -
trunk/WebCore/rendering/RenderImage.cpp
r19590 r19593 317 317 318 318 if (checkForRepaint) 319 repaintAfterLayoutIfNeeded(oldBounds );319 repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 320 320 321 321 setNeedsLayout(false); -
trunk/WebCore/rendering/RenderLayer.cpp
r19588 r19593 200 200 int x, y; 201 201 m_object->absolutePosition(x, y); 202 IntRect newRect = m_object->getAbsoluteRepaintRect(); 202 IntRect newRect, newFullRect; 203 m_object->getAbsoluteRepaintRectIncludingFloats(newRect, newFullRect); 203 204 if (checkForRepaint) { 204 205 RenderView *c = m_object->view(); … … 206 207 bool didMove = x != m_repaintX || y != m_repaintY; 207 208 if (!didMove && !m_repaintOverflowOnResize) 208 m_object->repaintAfterLayoutIfNeeded(m_repaintRect );209 m_object->repaintAfterLayoutIfNeeded(m_repaintRect, m_fullRepaintRect); 209 210 else if (didMove || newRect != m_repaintRect) { 210 c->repaintViewRectangle(m_ repaintRect);211 c->repaintViewRectangle(new Rect);211 c->repaintViewRectangle(m_fullRepaintRect); 212 c->repaintViewRectangle(newFullRect); 212 213 } 213 214 } 214 215 } 215 216 m_repaintRect = newRect; 217 m_fullRepaintRect = newFullRect; 216 218 m_repaintX = x; 217 219 m_repaintY = y; 218 220 } else { 219 221 m_repaintRect = IntRect(); 222 m_fullRepaintRect = IntRect(); 220 223 } 221 224 … … 1800 1803 if (bbox != overflowRect) 1801 1804 result.unite(overflowRect); 1805 IntRect floatRect = renderer()->floatRect(); 1806 if (bbox != floatRect) 1807 result.unite(floatRect); 1802 1808 1803 1809 // 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 388 388 389 389 IntRect m_repaintRect; // Cached repaint rects. Used by layout. 390 IntRect m_fullRepaintRect; 390 391 int m_repaintX; 391 392 int m_repaintY; -
trunk/WebCore/rendering/RenderObject.cpp
r19588 r19593 1735 1735 } 1736 1736 1737 bool RenderObject::repaintAfterLayoutIfNeeded(const IntRect& oldBounds )1737 bool RenderObject::repaintAfterLayoutIfNeeded(const IntRect& oldBounds, const IntRect& oldFullBounds) 1738 1738 { 1739 1739 RenderView* v = view(); … … 1741 1741 return false; // Don't repaint if we're printing. 1742 1742 1743 IntRect newBounds = getAbsoluteRepaintRect(); 1743 IntRect newBounds, newFullBounds; 1744 getAbsoluteRepaintRectIncludingFloats(newBounds, newFullBounds); 1744 1745 if (newBounds == oldBounds && !selfNeedsLayout()) 1745 1746 return false; … … 1747 1748 bool fullRepaint = selfNeedsLayout() || newBounds.location() != oldBounds.location() || mustRepaintBackgroundOrBorder(); 1748 1749 if (fullRepaint) { 1749 v->repaintViewRectangle(old Bounds);1750 v->repaintViewRectangle(oldFullBounds); 1750 1751 if (newBounds != oldBounds) 1751 v->repaintViewRectangle(new Bounds);1752 v->repaintViewRectangle(newFullBounds); 1752 1753 return true; 1753 1754 } … … 1829 1830 return parent()->getAbsoluteRepaintRect(); 1830 1831 return IntRect(); 1832 } 1833 1834 void RenderObject::getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& fullBounds) 1835 { 1836 bounds = fullBounds = getAbsoluteRepaintRect(); 1831 1837 } 1832 1838 -
trunk/WebCore/rendering/RenderObject.h
r19588 r19593 718 718 719 719 // 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); 721 721 722 722 // Repaint only if the object moved. … … 736 736 737 737 IntRect getAbsoluteRepaintRectWithOutline(int ow); 738 739 virtual void getAbsoluteRepaintRectIncludingFloats(IntRect& bounds, IntRect& boundsWithChildren); 738 740 739 741 // Given a rect in the object's coordinate space, this method converts the rectangle to the view's … … 748 750 virtual bool hasOverhangingFloats() { return false; } 749 751 virtual bool expandsToEncloseOverhangingFloats() const { return isFloating() && style()->height().isAuto(); } 752 virtual IntRect floatRect() const { return borderBox(); } 753 754 virtual bool expandsToEncloseOverflow() const { return false; } 750 755 751 756 virtual void removePositionedObjects(RenderBlock*) { } -
trunk/WebCore/rendering/RenderPath.cpp
r19588 r19593 132 132 133 133 if (selfNeedsLayout() && checkForRepaint) 134 repaintAfterLayoutIfNeeded(oldBounds );134 repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 135 135 136 136 setNeedsLayout(false); -
trunk/WebCore/rendering/RenderSVGContainer.cpp
r19588 r19593 121 121 122 122 if (selfNeedsLayout() && checkForRepaint) 123 repaintAfterLayoutIfNeeded(oldBounds );123 repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 124 124 125 125 setNeedsLayout(false); -
trunk/WebCore/rendering/RenderSVGText.cpp
r19588 r19593 78 78 bool repainted = false; 79 79 if (checkForRepaint) 80 repainted = repaintAfterLayoutIfNeeded(oldBounds );80 repainted = repaintAfterLayoutIfNeeded(oldBounds, oldBounds); 81 81 82 82 setNeedsLayout(false); -
trunk/WebCore/rendering/RenderTable.cpp
r19588 r19593 277 277 278 278 IntRect oldBounds; 279 IntRect oldFullBounds; 279 280 bool checkForRepaint = checkForRepaintDuringLayout(); 280 281 if (checkForRepaint) { 281 oldBounds = getAbsoluteRepaintRect();282 getAbsoluteRepaintRectIncludingFloats(oldBounds, oldFullBounds); 282 283 oldBounds.move(view()->layoutDelta()); 284 oldFullBounds.move(view()->layoutDelta()); 283 285 } 284 286 … … 424 426 // Repaint with our new bounds if they are different from our old bounds. 425 427 if (checkForRepaint) 426 didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds );428 didFullRepaint = repaintAfterLayoutIfNeeded(oldBounds, oldFullBounds); 427 429 if (!didFullRepaint && sectionMoved) { 428 430 IntRect repaintRect(m_overflowLeft, movedSectionTop, m_overflowWidth - m_overflowLeft, m_overflowHeight - movedSectionTop); -
trunk/WebCore/rendering/RenderTableCell.h
r19588 r19593 68 68 69 69 virtual bool expandsToEncloseOverhangingFloats() const { return true; } 70 virtual bool expandsToEncloseOverflow() const { return true; } 70 71 71 72 int borderLeft() const;
Note: See TracChangeset
for help on using the changeset viewer.