Index: LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.txt |
diff --git a/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.txt b/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.txt |
index bdfee69140420c7b7e1708a954a02b0183b8d370..19e6f35305bca99aa75fa323b9806e63042ef411 100644 |
--- a/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.txt |
+++ b/LayoutTests/platform/mac/tables/mozilla/bugs/bug5835-expected.txt |
@@ -1,89 +1,89 @@ |
-layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 672 |
+layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 704 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 785x672 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
- RenderBlock {HTML} at (0,0) size 785x672 |
- RenderBody {BODY} at (8,8) size 769x648 |
- RenderBlock {P} at (0,0) size 769x32 |
- RenderText {#text} at (0,0) size 755x32 |
+layer at (0,0) size 785x704 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
+ RenderBlock {HTML} at (0,0) size 785x704 |
+ RenderBody {BODY} at (8,8) size 769x680 |
+ RenderBlock {P} at (0,0) size 769x36 |
+ RenderText {#text} at (0,0) size 755x36 |
text run at (0,0) width 425: "This first table is the simple test case. Colspan confuses the width " |
text run at (424,0) width 331: "allocation when there is an image in the colspanned" |
- text run at (0,16) width 29: "row." |
- LayoutTable {TABLE} at (0,48) size 620x92 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 618x90 |
- LayoutTableRow {TR} at (0,2) size 618x20 |
- LayoutTableCell {TD} at (2,2) size 413x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 22x16 |
+ text run at (0,18) width 29: "row." |
+ LayoutTable {TABLE} at (0,52) size 620x94 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 618x92 |
+ LayoutTableRow {TR} at (0,2) size 618x22 |
+ LayoutTableCell {TD} at (2,2) size 413x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 22x18 |
text run at (2,2) width 22: "foo" |
- LayoutTableCell {TD} at (417,2) size 199x20 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 21x16 |
+ LayoutTableCell {TD} at (417,2) size 199x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 21x18 |
text run at (2,2) width 21: "bar" |
- LayoutTableRow {TR} at (0,24) size 618x64 |
- LayoutTableCell {TD} at (2,24) size 614x64 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2] |
+ LayoutTableRow {TR} at (0,26) size 618x64 |
+ LayoutTableCell {TD} at (2,26) size 614x64 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2] |
RenderImage {IMG} at (2,2) size 468x60 |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,156) size 769x16 |
- RenderText {#text} at (0,0) size 644x16 |
+ RenderBlock {P} at (0,162) size 769x18 |
+ RenderText {#text} at (0,0) size 644x18 |
text run at (0,0) width 381: "This second table is the same as the first, minus the second " |
text run at (380,0) width 264: "'colspan=2' row. Widths are now correct." |
- LayoutTable {TABLE} at (0,188) size 620x26 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 618x24 |
- LayoutTableRow {TR} at (0,2) size 618x20 |
- LayoutTableCell {TD} at (2,2) size 412x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 22x16 |
+ LayoutTable {TABLE} at (0,196) size 620x28 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 618x26 |
+ LayoutTableRow {TR} at (0,2) size 618x22 |
+ LayoutTableCell {TD} at (2,2) size 412x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 22x18 |
text run at (2,2) width 22: "foo" |
- LayoutTableCell {TD} at (416,2) size 200x20 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 21x16 |
+ LayoutTableCell {TD} at (416,2) size 200x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 21x18 |
text run at (2,2) width 21: "bar" |
- RenderBlock {P} at (0,230) size 769x48 |
- RenderText {#text} at (0,0) size 764x48 |
+ RenderBlock {P} at (0,240) size 769x54 |
+ RenderText {#text} at (0,0) size 764x54 |
text run at (0,0) width 372: "An observation: Note that as the image-width approaches " |
text run at (371,0) width 393: "the table-width, the two columns approach equal width (error" |
- text run at (0,16) width 72: "increases). " |
- text run at (71,16) width 616: "Conversely, below some threshold image-width (which is about 390px or 30px less than the TD" |
- text run at (0,32) width 287: "WIDTH=420), the error is (apparently) zero." |
- RenderBlock {P} at (0,294) size 769x16 |
- RenderText {#text} at (0,0) size 176x16 |
+ text run at (0,18) width 72: "increases). " |
+ text run at (71,18) width 616: "Conversely, below some threshold image-width (which is about 390px or 30px less than the TD" |
+ text run at (0,36) width 287: "WIDTH=420), the error is (apparently) zero." |
+ RenderBlock {P} at (0,310) size 769x18 |
+ RenderText {#text} at (0,0) size 176x18 |
text run at (0,0) width 176: "Here the <img width=600>" |
- LayoutTable {TABLE} at (0,326) size 620x92 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 618x90 |
- LayoutTableRow {TR} at (0,2) size 618x20 |
- LayoutTableCell {TD} at (2,2) size 412x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 22x16 |
+ LayoutTable {TABLE} at (0,344) size 620x94 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 618x92 |
+ LayoutTableRow {TR} at (0,2) size 618x22 |
+ LayoutTableCell {TD} at (2,2) size 412x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 22x18 |
text run at (2,2) width 22: "foo" |
- LayoutTableCell {TD} at (416,2) size 200x20 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 21x16 |
+ LayoutTableCell {TD} at (416,2) size 200x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 21x18 |
text run at (2,2) width 21: "bar" |
- LayoutTableRow {TR} at (0,24) size 618x64 |
- LayoutTableCell {TD} at (2,24) size 614x64 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2] |
+ LayoutTableRow {TR} at (0,26) size 618x64 |
+ LayoutTableCell {TD} at (2,26) size 614x64 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2] |
RenderImage {IMG} at (2,2) size 600x60 |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,434) size 769x16 |
- RenderText {#text} at (0,0) size 318x16 |
+ RenderBlock {P} at (0,454) size 769x18 |
+ RenderText {#text} at (0,0) size 318x18 |
text run at (0,0) width 318: "Here the <img width=400> (error is almost zero)." |
- LayoutTable {TABLE} at (0,466) size 620x26 [bgcolor=#DDDDDD] [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 618x24 |
- LayoutTableRow {TR} at (0,2) size 618x20 |
- LayoutTableCell {TD} at (2,2) size 412x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 139x16 |
+ LayoutTable {TABLE} at (0,488) size 620x28 [bgcolor=#DDDDDD] [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 618x26 |
+ LayoutTableRow {TR} at (0,2) size 618x22 |
+ LayoutTableCell {TD} at (2,2) size 412x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 139x18 |
text run at (2,2) width 139: "foo (single row table)" |
- LayoutTableCell {TD} at (416,2) size 200x20 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 138x16 |
+ LayoutTableCell {TD} at (416,2) size 200x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 138x18 |
text run at (2,2) width 138: "bar (single row table)" |
- LayoutTable {TABLE} at (0,492) size 620x92 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 618x90 |
- LayoutTableRow {TR} at (0,2) size 618x20 |
- LayoutTableCell {TD} at (2,2) size 413x20 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 22x16 |
+ LayoutTable {TABLE} at (0,516) size 620x94 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 618x92 |
+ LayoutTableRow {TR} at (0,2) size 618x22 |
+ LayoutTableCell {TD} at (2,2) size 413x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 22x18 |
text run at (2,2) width 22: "foo" |
- LayoutTableCell {TD} at (417,2) size 199x20 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
- RenderText {#text} at (2,2) size 21x16 |
+ LayoutTableCell {TD} at (417,2) size 199x22 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] |
+ RenderText {#text} at (2,2) size 21x18 |
text run at (2,2) width 21: "bar" |
- LayoutTableRow {TR} at (0,24) size 618x64 |
- LayoutTableCell {TD} at (2,24) size 614x64 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2] |
+ LayoutTableRow {TR} at (0,26) size 618x64 |
+ LayoutTableCell {TD} at (2,26) size 614x64 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2] |
RenderImage {IMG} at (2,2) size 400x60 |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,600) size 769x48 |
- RenderText {#text} at (0,0) size 767x48 |
+ RenderBlock {P} at (0,626) size 769x54 |
+ RenderText {#text} at (0,0) size 767x54 |
text run at (0,0) width 767: "I tested the above with M4 and May01 build for win95. (The above examples assume that images load normally -- N.B." |
- text run at (0,16) width 753: "for May01 the images initially load, and the width error is visually apparent, but then the images get replaced by their" |
- text run at (0,32) width 591: "ALT text, and the width error is no longer present -- this is, of course, a different issue/bug.)" |
+ text run at (0,18) width 753: "for May01 the images initially load, and the width error is visually apparent, but then the images get replaced by their" |
+ text run at (0,36) width 591: "ALT text, and the width error is no longer present -- this is, of course, a different issue/bug.)" |