Index: LayoutTests/tables/mozilla/core/cell_heights-expected.txt |
diff --git a/LayoutTests/tables/mozilla/core/cell_heights-expected.txt b/LayoutTests/tables/mozilla/core/cell_heights-expected.txt |
index fbf88d7596ec56ca6cbfa08219745423adc3aa9c..6a8eda3b26a6ad61075d6d4746be79cd8b2849e2 100644 |
--- a/LayoutTests/tables/mozilla/core/cell_heights-expected.txt |
+++ b/LayoutTests/tables/mozilla/core/cell_heights-expected.txt |
@@ -1,171 +1,171 @@ |
-layer at (0,0) size 785x4336 |
+layer at (0,0) size 785x4366 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x4336 |
- RenderBlock {HTML} at (0,0) size 785x4336 |
- RenderBody {BODY} at (8,8) size 769x4320 |
+layer at (0,0) size 785x4366 |
+ RenderBlock {HTML} at (0,0) size 785x4366 |
+ RenderBody {BODY} at (8,8) size 769x4350 |
RenderTable {TABLE} at (0,0) size 39x584 [bgcolor=#0000FF] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 37x582 |
RenderTableRow {TR} at (0,2) size 37x114 |
- RenderTableCell {TD} at (2,48) size 33x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 29x18 |
+ RenderTableCell {TD} at (2,47) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 29x19 |
text run at (2,2) width 29: "20%" |
RenderTableRow {TR} at (0,118) size 37x462 |
- RenderTableCell {TD} at (2,338) size 33x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 29x18 |
+ RenderTableCell {TD} at (2,337) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 29x19 |
text run at (2,2) width 29: "80%" |
- RenderBlock (anonymous) at (0,584) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,602) size 55x108 [bgcolor=#0000FF] [border: (1px outset #808080)] |
- RenderTableSection {TBODY} at (1,1) size 53x106 |
- RenderTableRow {TR} at (0,2) size 53x50 |
- RenderTableCell {TD} at (2,16) size 49x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 45x18 |
- text run at (2,2) width 45: "row 50" |
- RenderTableRow {TR} at (0,54) size 53x50 |
- RenderTableCell {TD} at (2,68) size 49x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x18 |
+ RenderBlock (anonymous) at (0,584) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,604) size 54x108 [bgcolor=#0000FF] [border: (1px outset #808080)] |
+ RenderTableSection {TBODY} at (1,1) size 52x106 |
+ RenderTableRow {TR} at (0,2) size 52x50 |
+ RenderTableCell {TD} at (2,15) size 48x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 44x19 |
+ text run at (2,2) width 44: "row 50" |
+ RenderTableRow {TR} at (0,54) size 52x50 |
+ RenderTableCell {TD} at (2,67) size 48x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x19 |
text run at (2,2) width 16: "50" |
- RenderBlock (anonymous) at (0,710) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,728) size 26x116 [bgcolor=#0000FF] [border: (1px outset #808080)] |
- RenderTableSection {TBODY} at (1,1) size 24x114 |
- RenderTableRow {TR} at (0,2) size 24x58 |
- RenderTableCell {TD} at (2,2) size 20x58 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 8x54 |
+ RenderBlock (anonymous) at (0,712) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,732) size 26x122 [bgcolor=#0000FF] [border: (1px outset #808080)] |
+ RenderTableSection {TBODY} at (1,1) size 24x120 |
+ RenderTableRow {TR} at (0,2) size 24x64 |
+ RenderTableCell {TD} at (2,2) size 20x64 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 8x59 |
text run at (2,2) width 8: "5" |
- text run at (2,20) width 8: "5" |
- text run at (2,38) width 8: "5" |
- RenderTableRow {TR} at (0,62) size 24x50 |
- RenderTableCell {TD} at (2,76) size 20x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x18 |
+ text run at (2,22) width 8: "5" |
+ text run at (2,42) width 8: "5" |
+ RenderTableRow {TR} at (0,68) size 24x50 |
+ RenderTableCell {TD} at (2,81) size 20x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x19 |
text run at (2,2) width 16: "50" |
- RenderTable {TABLE} at (0,844) size 34x258 [bgcolor=#0000FF] [border: (1px outset #808080)] |
+ RenderTable {TABLE} at (0,854) size 34x258 [bgcolor=#0000FF] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 32x256 |
RenderTableRow {TR} at (0,2) size 32x200 |
- RenderTableCell {TD} at (2,91) size 28x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderTableCell {TD} at (2,90) size 28x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "200" |
RenderTableRow {TR} at (0,204) size 32x50 |
- RenderTableCell {TD} at (2,218) size 28x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x18 |
+ RenderTableCell {TD} at (2,217) size 28x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x19 |
text run at (2,2) width 16: "50" |
- RenderBlock (anonymous) at (0,1102) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,1120) size 34x258 [bgcolor=#0000FF] [border: (1px outset #808080)] |
+ RenderBlock (anonymous) at (0,1112) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,1132) size 34x258 [bgcolor=#0000FF] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 32x256 |
RenderTableRow {TR} at (0,2) size 32x200 |
- RenderTableCell {TD} at (2,91) size 28x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderTableCell {TD} at (2,90) size 28x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "200" |
RenderTableRow {TR} at (0,204) size 32x50 |
- RenderTableCell {TD} at (2,218) size 28x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x18 |
+ RenderTableCell {TD} at (2,217) size 28x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x19 |
text run at (2,2) width 16: "50" |
- RenderBlock (anonymous) at (0,1378) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,1396) size 64x208 [bgcolor=#FFA500] [border: (1px outset #808080)] |
+ RenderBlock (anonymous) at (0,1390) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,1410) size 64x208 [bgcolor=#FFA500] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 62x206 |
RenderTableRow {TR} at (0,2) size 62x100 |
- RenderTableCell {TD} at (2,92) size 28x22 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderTableCell {TD} at (2,91) size 28x24 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "100" |
- RenderTableCell {TD} at (32,41) size 28x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderTableCell {TD} at (32,40) size 28x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "100" |
RenderTableRow {TR} at (0,104) size 62x100 |
- RenderTableCell {TD} at (32,125) size 28x58 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 24x54 |
+ RenderTableCell {TD} at (32,122) size 28x64 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 24x59 |
text run at (2,2) width 24: "100" |
- text run at (2,20) width 24: "100" |
- text run at (2,38) width 24: "100" |
- RenderBlock (anonymous) at (0,1604) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,1622) size 47x28 [bgcolor=#FFFF00] [border: (1px outset #808080)] |
- RenderTableSection {TBODY} at (1,1) size 45x26 |
- RenderTableRow {TR} at (0,2) size 45x22 |
- RenderTableCell {TD} at (2,2) size 41x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 37x18 |
+ text run at (2,22) width 24: "100" |
+ text run at (2,42) width 24: "100" |
+ RenderBlock (anonymous) at (0,1618) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,1638) size 47x30 [bgcolor=#FFFF00] [border: (1px outset #808080)] |
+ RenderTableSection {TBODY} at (1,1) size 45x28 |
+ RenderTableRow {TR} at (0,2) size 45x24 |
+ RenderTableCell {TD} at (2,2) size 41x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 37x19 |
text run at (2,2) width 37: "100%" |
- RenderBlock (anonymous) at (0,1650) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,1668) size 39x584 [bgcolor=#FFA500] [border: (1px outset #808080)] |
+ RenderBlock (anonymous) at (0,1668) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,1688) size 39x584 [bgcolor=#FFA500] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 37x582 |
RenderTableRow {TR} at (0,2) size 37x114 |
- RenderTableCell {TD} at (2,48) size 33x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 29x18 |
+ RenderTableCell {TD} at (2,47) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 29x19 |
text run at (2,2) width 29: "20%" |
RenderTableRow {TR} at (0,118) size 37x462 |
- RenderTableCell {TD} at (2,338) size 33x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 29x18 |
+ RenderTableCell {TD} at (2,337) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 29x19 |
text run at (2,2) width 29: "80%" |
- RenderBlock (anonymous) at (0,2252) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,2270) size 61x206 [bgcolor=#808080] [border: (1px outset #808080)] |
+ RenderBlock (anonymous) at (0,2272) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,2292) size 61x206 [bgcolor=#808080] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 59x204 |
RenderTableRow {TR} at (0,2) size 59x200 |
- RenderTableCell {TD} at (2,91) size 25x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 21x18 |
+ RenderTableCell {TD} at (2,90) size 25x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 21x19 |
text run at (2,2) width 21: "5%" |
- RenderTableCell {TD} at (29,91) size 28x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderTableCell {TD} at (29,90) size 28x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "200" |
- RenderBlock (anonymous) at (0,2476) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,2494) size 61x198 [bgcolor=#FFA500] [border: (1px outset #808080)] |
+ RenderBlock (anonymous) at (0,2498) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,2518) size 61x198 [bgcolor=#FFA500] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 59x196 |
RenderTableRow {TR} at (0,2) size 59x192 |
- RenderTableCell {TD} at (2,87) size 33x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 29x18 |
+ RenderTableCell {TD} at (2,86) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 29x19 |
text run at (2,2) width 29: "50%" |
- RenderTableCell {TD} at (37,87) size 20x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x18 |
+ RenderTableCell {TD} at (37,86) size 20x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x19 |
text run at (2,2) width 16: "20" |
- RenderBlock (anonymous) at (0,2692) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,2710) size 39x584 [border: (1px outset #808080)] |
+ RenderBlock (anonymous) at (0,2716) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,2736) size 39x584 [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 37x582 |
RenderTableRow {TR} at (0,2) size 37x500 |
- RenderTableCell {TD} at (2,241) size 33x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderTableCell {TD} at (2,240) size 33x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "500" |
RenderTableRow {TR} at (0,504) size 37x76 |
- RenderTableCell {TD} at (2,531) size 33x22 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 29x18 |
+ RenderTableCell {TD} at (2,530) size 33x24 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 29x19 |
text run at (2,2) width 29: "80%" |
- RenderBlock (anonymous) at (0,3294) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,3312) size 103x584 [bgcolor=#FF0000] [border: (1px outset #808080)] |
- RenderTableSection {TBODY} at (1,1) size 101x582 |
- RenderTableRow {TR} at (0,2) size 101x40 |
- RenderTableCell {TD} at (2,259) size 31x22 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1] |
- RenderText {#text} at (2,2) size 24x18 |
+ RenderBlock (anonymous) at (0,3320) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,3340) size 100x584 [bgcolor=#FF0000] [border: (1px outset #808080)] |
+ RenderTableSection {TBODY} at (1,1) size 98x582 |
+ RenderTableRow {TR} at (0,2) size 98x266 |
+ RenderTableCell {TD} at (2,257) size 30x24 [border: (1px inset #808080)] [r=0 c=0 rs=2 cs=1] |
+ RenderText {#text} at (2,2) size 24x19 |
text run at (2,2) width 24: "500" |
- RenderTableCell {TD} at (35,11) size 31x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 27x18 |
- text run at (2,2) width 27: "auto" |
- RenderTableRow {TR} at (0,44) size 101x494 |
- RenderTableCell {TD} at (35,280) size 31x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 27x18 |
- text run at (2,2) width 27: "auto" |
- RenderTableCell {TD} at (68,280) size 31x22 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 27x18 |
- text run at (2,2) width 27: "auto" |
- RenderTableRow {TR} at (0,540) size 101x40 |
- RenderTableCell {TD} at (2,549) size 31x22 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 27x18 |
- text run at (2,2) width 27: "auto" |
- RenderTableCell {TD} at (35,549) size 31x22 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 27x18 |
- text run at (2,2) width 27: "auto" |
- RenderBlock (anonymous) at (0,3896) size 769x18 |
- RenderBR {BR} at (0,0) size 0x18 |
- RenderTable {TABLE} at (0,3914) size 53x406 [bgcolor=#FFA500] [border: (1px outset #808080)] |
+ RenderTableCell {TD} at (34,123) size 30x24 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 26x19 |
+ text run at (2,2) width 26: "auto" |
+ RenderTableRow {TR} at (0,270) size 98x266 |
+ RenderTableCell {TD} at (34,391) size 30x24 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 26x19 |
+ text run at (2,2) width 26: "auto" |
+ RenderTableCell {TD} at (66,391) size 30x24 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 26x19 |
+ text run at (2,2) width 26: "auto" |
+ RenderTableRow {TR} at (0,538) size 98x42 |
+ RenderTableCell {TD} at (2,547) size 30x24 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 26x19 |
+ text run at (2,2) width 26: "auto" |
+ RenderTableCell {TD} at (34,547) size 30x24 [border: (1px inset #808080)] [r=2 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 26x19 |
+ text run at (2,2) width 26: "auto" |
+ RenderBlock (anonymous) at (0,3924) size 769x20 |
+ RenderBR {BR} at (0,0) size 0x19 |
+ RenderTable {TABLE} at (0,3944) size 53x406 [bgcolor=#FFA500] [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 51x404 |
RenderTableRow {TR} at (0,2) size 51x400 |
RenderTableCell {TD} at (2,2) size 47x400 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
RenderTable {TABLE} at (2,2) size 43x396 [bgcolor=#0000FF] |
RenderTableSection {TBODY} at (0,0) size 43x396 |
RenderTableRow {TR} at (0,2) size 43x392 |
- RenderTableCell {TD} at (2,188) size 39x20 [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (1,1) size 37x18 |
+ RenderTableCell {TD} at (2,187) size 39x22 [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (1,1) size 37x19 |
text run at (1,1) width 37: "100%" |