Index: LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.txt |
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.txt |
index 9698ee5c0f08d86e8a06029ec917e9dfd1213e6e..4a6316c65caf0e1a702d064e77d865db0c864f13 100644 |
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.txt |
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug3977-expected.txt |
@@ -1,158 +1,158 @@ |
-layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 893 |
+layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 929 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 785x893 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
- RenderBlock {HTML} at (0,0) size 785x893 |
- RenderBody {BODY} at (8,8) size 769x877 |
- LayoutTable {TABLE} at (0,0) size 600x253 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 598x251 |
+layer at (0,0) size 785x929 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
+ RenderBlock {HTML} at (0,0) size 785x929 |
+ RenderBody {BODY} at (8,8) size 769x913 |
+ LayoutTable {TABLE} at (0,0) size 600x259 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 598x257 |
LayoutTableRow {TR} at (0,2) size 598x77 |
LayoutTableCell {TD} at (2,2) size 594x77 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=3] |
RenderBlock {IMG} at (2,2) size 590x73 |
RenderText {#text} at (0,0) size 0x0 |
- LayoutTableRow {TR} at (0,81) size 598x84 |
- LayoutTableCell {TD} at (2,81) size 114x36 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 74x32 |
+ LayoutTableRow {TR} at (0,81) size 598x90 |
+ LayoutTableCell {TD} at (2,81) size 114x40 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 74x36 |
text run at (2,2) width 74: "LH column" |
- text run at (2,18) width 40: "image" |
- LayoutTableCell {TD} at (118,81) size 20x20 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x16 |
+ text run at (2,20) width 40: "image" |
+ LayoutTableCell {TD} at (118,81) size 20x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x18 |
text run at (2,2) width 16: " " |
- LayoutTableCell {TD} at (140,81) size 456x84 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
- RenderBlock {P} at (2,2) size 452x16 |
- RenderText {#text} at (0,0) size 227x16 |
+ LayoutTableCell {TD} at (140,81) size 456x90 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
+ RenderBlock {P} at (2,2) size 452x18 |
+ RenderText {#text} at (0,0) size 227x18 |
text run at (0,0) width 227: "HP Peripherals Developer Program" |
- RenderBlock {P} at (2,34) size 452x16 |
- RenderText {#text} at (0,0) size 159x16 |
+ RenderBlock {P} at (2,36) size 452x18 |
+ RenderText {#text} at (0,0) size 159x18 |
text run at (0,0) width 159: "PROGRAM SERVICES" |
- RenderBlock {P} at (2,66) size 452x16 |
- RenderText {#text} at (0,0) size 70x16 |
+ RenderBlock {P} at (2,70) size 452x18 |
+ RenderText {#text} at (0,0) size 70x18 |
text run at (0,0) width 70: "etc., etc. ..." |
- LayoutTableRow {TR} at (0,167) size 598x37 |
- LayoutTableCell {TD} at (2,167) size 594x37 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=3] |
+ LayoutTableRow {TR} at (0,173) size 598x37 |
+ LayoutTableCell {TD} at (2,173) size 594x37 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=3] |
RenderBlock {IMG} at (2,2) size 589x33 |
RenderText {#text} at (0,0) size 0x0 |
- LayoutTableRow {TR} at (0,206) size 598x43 |
- LayoutTableCell {TD} at (2,206) size 114x43 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1] |
+ LayoutTableRow {TR} at (0,212) size 598x43 |
+ LayoutTableCell {TD} at (2,212) size 114x43 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1] |
RenderBlock {IMG} at (2,2) size 110x39 |
RenderText {#text} at (0,0) size 0x0 |
- LayoutTableCell {TH} at (118,217) size 478x20 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=2] |
- RenderText {#text} at (207,2) size 64x16 |
+ LayoutTableCell {TH} at (118,222) size 478x22 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=2] |
+ RenderText {#text} at (207,2) size 64x18 |
text run at (207,2) width 64: "text links" |
- RenderBlock {HR} at (0,261) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,279) size 769x16 |
- RenderInline {B} at (0,0) size 476x16 |
- RenderText {#text} at (0,0) size 476x16 |
+ RenderBlock {HR} at (0,267) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,285) size 769x18 |
+ RenderInline {B} at (0,0) size 476x18 |
+ RenderText {#text} at (0,0) size 476x18 |
text run at (0,0) width 476: "Now, nuke the IMG (two of which are colspan=3) -- the table lines up." |
- LayoutTable {TABLE} at (0,311) size 590x169 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 588x167 |
- LayoutTableRow {TR} at (0,2) size 588x20 |
- LayoutTableCell {TD} at (2,2) size 584x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=3] |
- RenderText {#text} at (2,2) size 129x16 |
+ LayoutTable {TABLE} at (0,319) size 590x179 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 588x177 |
+ LayoutTableRow {TR} at (0,2) size 588x22 |
+ LayoutTableCell {TD} at (2,2) size 584x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=3] |
+ RenderText {#text} at (2,2) size 129x18 |
text run at (2,2) width 129: "IMG in a colspan=3" |
- LayoutTableRow {TR} at (0,24) size 588x84 |
- LayoutTableCell {TD} at (2,24) size 110x36 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 74x32 |
+ LayoutTableRow {TR} at (0,26) size 588x90 |
+ LayoutTableCell {TD} at (2,26) size 110x40 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 74x36 |
text run at (2,2) width 74: "LH column" |
- text run at (2,18) width 40: "image" |
- LayoutTableCell {TD} at (114,24) size 20x20 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x16 |
+ text run at (2,20) width 40: "image" |
+ LayoutTableCell {TD} at (114,26) size 20x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x18 |
text run at (2,2) width 16: " " |
- LayoutTableCell {TD} at (136,24) size 450x84 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
- RenderBlock {P} at (2,2) size 446x16 |
- RenderText {#text} at (0,0) size 227x16 |
+ LayoutTableCell {TD} at (136,26) size 450x90 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
+ RenderBlock {P} at (2,2) size 446x18 |
+ RenderText {#text} at (0,0) size 227x18 |
text run at (0,0) width 227: "HP Peripherals Developer Program" |
- RenderBlock {P} at (2,34) size 446x16 |
- RenderText {#text} at (0,0) size 159x16 |
+ RenderBlock {P} at (2,36) size 446x18 |
+ RenderText {#text} at (0,0) size 159x18 |
text run at (0,0) width 159: "PROGRAM SERVICES" |
- RenderBlock {P} at (2,66) size 446x16 |
- RenderText {#text} at (0,0) size 70x16 |
+ RenderBlock {P} at (2,70) size 446x18 |
+ RenderText {#text} at (0,0) size 70x18 |
text run at (0,0) width 70: "etc., etc. ..." |
- LayoutTableRow {TR} at (0,110) size 588x33 |
- LayoutTableCell {TD} at (2,116) size 584x20 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=3] |
- RenderText {#text} at (2,2) size 129x16 |
+ LayoutTableRow {TR} at (0,118) size 588x33 |
+ LayoutTableCell {TD} at (2,123) size 584x22 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=3] |
+ RenderText {#text} at (2,2) size 129x18 |
text run at (2,2) width 129: "IMG in a colspan=3" |
- LayoutTableRow {TR} at (0,145) size 588x20 |
- LayoutTableCell {TD} at (2,145) size 110x20 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 78x16 |
+ LayoutTableRow {TR} at (0,153) size 588x22 |
+ LayoutTableCell {TD} at (2,153) size 110x22 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 78x18 |
text run at (2,2) width 78: "just an IMG" |
- LayoutTableCell {TH} at (114,145) size 472x20 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=2] |
- RenderText {#text} at (204,2) size 64x16 |
+ LayoutTableCell {TH} at (114,153) size 472x22 [border: (1px inset #808080)] [r=3 c=1 rs=1 cs=2] |
+ RenderText {#text} at (204,2) size 64x18 |
text run at (204,2) width 64: "text links" |
- RenderBlock {HR} at (0,488) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,506) size 769x16 |
- RenderInline {B} at (0,0) size 512x16 |
- RenderText {#text} at (0,0) size 512x16 |
+ RenderBlock {HR} at (0,506) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,524) size 769x18 |
+ RenderInline {B} at (0,0) size 512x18 |
+ RenderText {#text} at (0,0) size 512x18 |
text run at (0,0) width 512: "Simpler comparison -- two rows, first is IMG in colspan=3 -- tables not OK" |
- LayoutTable {TABLE} at (0,538) size 600x169 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 598x167 |
+ LayoutTable {TABLE} at (0,558) size 600x175 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 598x173 |
LayoutTableRow {TR} at (0,2) size 598x77 |
LayoutTableCell {TD} at (2,2) size 594x77 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=3] |
RenderBlock {IMG} at (2,2) size 590x73 |
RenderText {#text} at (0,0) size 0x0 |
- LayoutTableRow {TR} at (0,81) size 598x84 |
- LayoutTableCell {TD} at (2,81) size 111x36 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 74x32 |
+ LayoutTableRow {TR} at (0,81) size 598x90 |
+ LayoutTableCell {TD} at (2,81) size 111x40 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 74x36 |
text run at (2,2) width 74: "LH column" |
- text run at (2,18) width 40: "image" |
- LayoutTableCell {TD} at (115,81) size 20x20 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x16 |
+ text run at (2,20) width 40: "image" |
+ LayoutTableCell {TD} at (115,81) size 20x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x18 |
text run at (2,2) width 16: " " |
- LayoutTableCell {TD} at (137,81) size 459x84 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
- RenderBlock {P} at (2,2) size 455x16 |
- RenderText {#text} at (0,0) size 227x16 |
+ LayoutTableCell {TD} at (137,81) size 459x90 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
+ RenderBlock {P} at (2,2) size 455x18 |
+ RenderText {#text} at (0,0) size 227x18 |
text run at (0,0) width 227: "HP Peripherals Developer Program" |
- RenderBlock {P} at (2,34) size 455x16 |
- RenderText {#text} at (0,0) size 159x16 |
+ RenderBlock {P} at (2,36) size 455x18 |
+ RenderText {#text} at (0,0) size 159x18 |
text run at (0,0) width 159: "PROGRAM SERVICES" |
- RenderBlock {P} at (2,66) size 455x16 |
- RenderText {#text} at (0,0) size 70x16 |
+ RenderBlock {P} at (2,70) size 455x18 |
+ RenderText {#text} at (0,0) size 70x18 |
text run at (0,0) width 70: "etc., etc. ..." |
- RenderBlock {HR} at (0,715) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,733) size 769x16 |
- RenderInline {B} at (0,0) size 528x16 |
- RenderText {#text} at (0,0) size 528x16 |
+ RenderBlock {HR} at (0,741) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,759) size 769x18 |
+ RenderInline {B} at (0,0) size 528x18 |
+ RenderText {#text} at (0,0) size 528x18 |
text run at (0,0) width 528: "Simpler comparison -- nuke the IMG (replace with text) -- tables line up now." |
- LayoutTable {TABLE} at (0,765) size 590x112 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 588x110 |
- LayoutTableRow {TR} at (0,2) size 588x20 |
- LayoutTableCell {TD} at (2,2) size 584x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=3] |
- RenderText {#text} at (2,2) size 213x16 |
+ LayoutTable {TABLE} at (0,793) size 590x120 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 588x118 |
+ LayoutTableRow {TR} at (0,2) size 588x22 |
+ LayoutTableCell {TD} at (2,2) size 584x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=3] |
+ RenderText {#text} at (2,2) size 213x18 |
text run at (2,2) width 213: "text instead of IMG in colspan=3" |
- LayoutTableRow {TR} at (0,24) size 588x84 |
- LayoutTableCell {TD} at (2,24) size 110x36 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 74x32 |
+ LayoutTableRow {TR} at (0,26) size 588x90 |
+ LayoutTableCell {TD} at (2,26) size 110x40 [bgcolor=#94BD73] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 74x36 |
text run at (2,2) width 74: "LH column" |
- text run at (2,18) width 40: "image" |
- LayoutTableCell {TD} at (114,24) size 20x20 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 16x16 |
+ text run at (2,20) width 40: "image" |
+ LayoutTableCell {TD} at (114,26) size 20x22 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 16x18 |
text run at (2,2) width 16: " " |
- LayoutTableCell {TD} at (136,24) size 450x84 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
- RenderBlock {P} at (2,2) size 446x16 |
- RenderText {#text} at (0,0) size 227x16 |
+ LayoutTableCell {TD} at (136,26) size 450x90 [border: (1px inset #808080)] [r=1 c=2 rs=1 cs=1] |
+ RenderBlock {P} at (2,2) size 446x18 |
+ RenderText {#text} at (0,0) size 227x18 |
text run at (0,0) width 227: "HP Peripherals Developer Program" |
- RenderBlock {P} at (2,34) size 446x16 |
- RenderText {#text} at (0,0) size 159x16 |
+ RenderBlock {P} at (2,36) size 446x18 |
+ RenderText {#text} at (0,0) size 159x18 |
text run at (0,0) width 159: "PROGRAM SERVICES" |
- RenderBlock {P} at (2,66) size 446x16 |
- RenderText {#text} at (0,0) size 70x16 |
+ RenderBlock {P} at (2,70) size 446x18 |
+ RenderText {#text} at (0,0) size 70x18 |
text run at (0,0) width 70: "etc., etc. ..." |
layer at (13,13) size 590x73 clip at (14,14) size 588x71 |
RenderBlock {DIV} at (0,0) size 590x73 [border: (1px solid #C0C0C0)] |
RenderImage {IMG} at (2,2) size 16x16 |
layer at (31,15) size 570x0 |
RenderBlock {DIV} at (18,2) size 570x0 |
-layer at (13,178) size 589x33 clip at (14,179) size 587x31 |
+layer at (13,184) size 589x33 clip at (14,185) size 587x31 |
RenderBlock {DIV} at (0,0) size 589x33 [border: (1px solid #C0C0C0)] |
RenderImage {IMG} at (2,2) size 16x16 |
-layer at (31,180) size 569x0 |
+layer at (31,186) size 569x0 |
RenderBlock {DIV} at (18,2) size 569x0 |
-layer at (13,217) size 110x39 clip at (14,218) size 108x37 |
+layer at (13,223) size 110x39 clip at (14,224) size 108x37 |
RenderBlock {DIV} at (0,0) size 110x39 [border: (1px solid #C0C0C0)] |
RenderImage {IMG} at (2,2) size 16x16 |
-layer at (31,219) size 90x0 |
+layer at (31,225) size 90x0 |
RenderBlock {DIV} at (18,2) size 90x0 |
-layer at (13,551) size 590x73 backgroundClip at (13,551) size 590x49 clip at (14,552) size 588x48 outlineClip at (0,0) size 785x600 |
+layer at (13,571) size 590x73 backgroundClip at (13,571) size 590x29 clip at (14,572) size 588x28 outlineClip at (0,0) size 785x600 |
RenderBlock {DIV} at (0,0) size 590x73 [border: (1px solid #C0C0C0)] |
RenderImage {IMG} at (2,2) size 16x16 |
-layer at (31,553) size 570x0 |
+layer at (31,573) size 570x0 |
RenderBlock {DIV} at (18,2) size 570x0 |