| Index: LayoutTests/platform/mac/css1/box_properties/float_margin-expected.txt
|
| diff --git a/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.txt b/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.txt
|
| index 92ab2e4857b86ea68ed3195c15d7a7cd9f93ddd0..7d95dbc91f757f2b93b15f2de273ee999a97526c 100644
|
| --- a/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.txt
|
| +++ b/LayoutTests/platform/mac/css1/box_properties/float_margin-expected.txt
|
| @@ -1,164 +1,164 @@
|
| -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1694
|
| +layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1902
|
| RenderView at (0,0) size 800x600
|
| -layer at (0,0) size 785x1694 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| - RenderBlock {HTML} at (0,0) size 785x1694
|
| - RenderBody {BODY} at (8,8) size 769x1678 [bgcolor=#CCCCCC]
|
| - RenderBlock {P} at (0,0) size 769x16
|
| - RenderText {#text} at (0,0) size 363x16
|
| +layer at (0,0) size 785x1902 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600
|
| + RenderBlock {HTML} at (0,0) size 785x1902
|
| + RenderBody {BODY} at (8,8) size 769x1886 [bgcolor=#CCCCCC]
|
| + RenderBlock {P} at (0,0) size 769x18
|
| + RenderText {#text} at (0,0) size 363x18
|
| text run at (0,0) width 363: "The style declarations which apply to the text below are:"
|
| - RenderBlock {PRE} at (0,32) size 769x117
|
| - RenderText {#text} at (0,0) size 547x117
|
| + RenderBlock {PRE} at (0,34) size 769x135
|
| + RenderText {#text} at (0,0) size 547x135
|
| text run at (0,0) width 336: "P.test {background: white; font-size: 20px;"
|
| text run at (335,0) width 1: " "
|
| - text run at (0,13) width 547: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}"
|
| - text run at (546,13) width 1: " "
|
| - text run at (0,26) width 305: "IMG {padding: 0; border: 0; margin: 0;}"
|
| - text run at (304,26) width 1: " "
|
| - text run at (0,39) width 196: "P.test IMG {float: left;}"
|
| - text run at (195,39) width 1: " "
|
| - text run at (0,52) width 344: "#img2 {margin-top: 30px; margin-left: 30px;}"
|
| - text run at (343,52) width 1: " "
|
| - text run at (0,65) width 359: "#img3 {margin-top: -30px; margin-left: -30px;}"
|
| - text run at (358,65) width 1: " "
|
| - text run at (0,78) width 375: "#img4 {margin-right: 30px; margin-bottom: 30px;}"
|
| - text run at (374,78) width 1: " "
|
| - text run at (0,91) width 391: "#img5 {margin-right: -30px; margin-bottom: -30px;}"
|
| - text run at (390,91) width 1: " "
|
| - text run at (0,104) width 0: " "
|
| - RenderBlock {HR} at (0,162) size 769x2 [border: (1px inset #EEEEEE)]
|
| - RenderBlock {P} at (30,184) size 729x80 [bgcolor=#FFFFFF]
|
| - RenderText {#text} at (0,0) size 724x80
|
| + text run at (0,15) width 547: " margin-left: 30px; margin-right: 10px; padding: 0; border: 0;}"
|
| + text run at (546,15) width 1: " "
|
| + text run at (0,30) width 305: "IMG {padding: 0; border: 0; margin: 0;}"
|
| + text run at (304,30) width 1: " "
|
| + text run at (0,45) width 196: "P.test IMG {float: left;}"
|
| + text run at (195,45) width 1: " "
|
| + text run at (0,60) width 344: "#img2 {margin-top: 30px; margin-left: 30px;}"
|
| + text run at (343,60) width 1: " "
|
| + text run at (0,75) width 359: "#img3 {margin-top: -30px; margin-left: -30px;}"
|
| + text run at (358,75) width 1: " "
|
| + text run at (0,90) width 375: "#img4 {margin-right: 30px; margin-bottom: 30px;}"
|
| + text run at (374,90) width 1: " "
|
| + text run at (0,105) width 391: "#img5 {margin-right: -30px; margin-bottom: -30px;}"
|
| + text run at (390,105) width 1: " "
|
| + text run at (0,120) width 0: " "
|
| + RenderBlock {HR} at (0,182) size 769x2 [border: (1px inset #EEEEEE)]
|
| + RenderBlock {P} at (30,204) size 729x92 [bgcolor=#FFFFFF]
|
| + RenderText {#text} at (0,0) size 724x92
|
| text run at (0,0) width 656: "This paragraph should have a white background which extends to the edges of the"
|
| - text run at (0,20) width 120: "element's box. "
|
| - text run at (119,20) width 438: "There is no padding set on this paragraph whatsoever. "
|
| - text run at (556,20) width 165: "If the background of"
|
| - text run at (0,40) width 724: "the entire box is not white, this may cause problems with the following tests; at any rate, it"
|
| - text run at (0,60) width 220: "must be taken into account."
|
| - RenderBlock {P} at (30,284) size 729x100 [bgcolor=#FFFFFF]
|
| + text run at (0,23) width 120: "element's box. "
|
| + text run at (119,23) width 438: "There is no padding set on this paragraph whatsoever. "
|
| + text run at (556,23) width 165: "If the background of"
|
| + text run at (0,46) width 724: "the entire box is not white, this may cause problems with the following tests; at any rate, it"
|
| + text run at (0,69) width 220: "must be taken into account."
|
| + RenderBlock {P} at (30,316) size 729x115 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (0,0) size 60x60
|
| - RenderText {#text} at (60,0) size 712x100
|
| + RenderText {#text} at (60,0) size 712x115
|
| text run at (60,0) width 627: "The image in the upper left corner of this paragraph should be floated left, and"
|
| - text run at (60,20) width 118: "nothing more. "
|
| - text run at (177,20) width 535: "The edges of the white background should line up with the top and"
|
| - text run at (60,40) width 193: "left edges of the image. "
|
| - text run at (252,40) width 449: "This paragraph should have a white background, first of"
|
| - text run at (0,60) width 422: "all, which extends to the edges of the element's box. "
|
| - text run at (421,60) width 246: "There is no padding set on this"
|
| - text run at (0,80) width 182: "paragraph whatsoever."
|
| - RenderBlock {P} at (30,404) size 729x100 [bgcolor=#FFFFFF]
|
| + text run at (60,23) width 118: "nothing more. "
|
| + text run at (177,23) width 535: "The edges of the white background should line up with the top and"
|
| + text run at (60,46) width 193: "left edges of the image. "
|
| + text run at (252,46) width 449: "This paragraph should have a white background, first of"
|
| + text run at (0,69) width 422: "all, which extends to the edges of the element's box. "
|
| + text run at (421,69) width 246: "There is no padding set on this"
|
| + text run at (0,92) width 182: "paragraph whatsoever."
|
| + RenderBlock {P} at (30,451) size 729x115 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (30,30) size 60x60
|
| - RenderText {#text} at (90,0) size 634x100
|
| + RenderText {#text} at (90,0) size 724x115
|
| text run at (90,0) width 608: "The image in the upper left corner of this paragraph should be pushed down"
|
| - text run at (90,20) width 601: "and to the right 30 pixels each from the upper left corner of the paragraph's"
|
| - text run at (90,40) width 399: "box, and displace the paragraph text accordingly. "
|
| - text run at (488,40) width 236: "This paragraph should have a"
|
| - text run at (90,60) width 629: "white background, first of all, which extends to the edges of the element's box."
|
| - text run at (90,80) width 432: "There is no padding set on this paragraph whatsoever."
|
| - RenderBlock {P} at (30,524) size 729x100 [bgcolor=#FFFFFF]
|
| + text run at (90,23) width 601: "and to the right 30 pixels each from the upper left corner of the paragraph's"
|
| + text run at (90,46) width 399: "box, and displace the paragraph text accordingly. "
|
| + text run at (488,46) width 236: "This paragraph should have a"
|
| + text run at (90,69) width 629: "white background, first of all, which extends to the edges of the element's box."
|
| + text run at (0,92) width 432: "There is no padding set on this paragraph whatsoever."
|
| + RenderBlock {P} at (30,586) size 729x115 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (-30,-30) size 60x60
|
| - RenderText {#text} at (30,0) size 729x100
|
| + RenderText {#text} at (30,0) size 729x115
|
| text run at (30,0) width 699: "The image in the upper left corner of this paragraph should be pushed up and to the left"
|
| - text run at (30,20) width 698: "30 pixels each from the upper left corner of the paragraph's box, thus causing the edges"
|
| - text run at (0,40) width 573: "of the white background to align with the thick gray lines in the image. "
|
| - text run at (572,40) width 122: "This paragraph"
|
| - text run at (0,60) width 704: "should have a white background, first of all, which extends to the edges of the element's"
|
| - text run at (0,80) width 40: "box. "
|
| - text run at (40,80) width 432: "There is no padding set on this paragraph whatsoever."
|
| - RenderBlock {P} at (30,644) size 729x120 [bgcolor=#FFFFFF]
|
| + text run at (30,23) width 698: "30 pixels each from the upper left corner of the paragraph's box, thus causing the edges"
|
| + text run at (0,46) width 573: "of the white background to align with the thick gray lines in the image. "
|
| + text run at (572,46) width 122: "This paragraph"
|
| + text run at (0,69) width 704: "should have a white background, first of all, which extends to the edges of the element's"
|
| + text run at (0,92) width 40: "box. "
|
| + text run at (40,92) width 432: "There is no padding set on this paragraph whatsoever."
|
| + RenderBlock {P} at (30,721) size 729x138 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (0,0) size 60x60
|
| - RenderText {#text} at (90,0) size 722x120
|
| + RenderText {#text} at (90,0) size 722x138
|
| text run at (90,0) width 627: "The image in the upper left corner of this paragraph should be floated left, and"
|
| - text run at (90,20) width 632: "the edges of the white background should line up with the top and left edges of"
|
| - text run at (90,40) width 89: "the image. "
|
| - text run at (178,40) width 533: "However, there should be 30 pixels of space between the right and"
|
| - text run at (90,60) width 483: "bottom edges of the image and the paragraph text around it. "
|
| - text run at (572,60) width 121: "This paragraph"
|
| - text run at (90,80) width 625: "should have a white background, first of all, which extends to the edges of the"
|
| - text run at (0,100) width 120: "element's box. "
|
| - text run at (119,100) width 433: "There is no padding set on this paragraph whatsoever."
|
| - RenderBlock {P} at (30,784) size 729x120 [bgcolor=#FFFFFF]
|
| + text run at (90,23) width 632: "the edges of the white background should line up with the top and left edges of"
|
| + text run at (90,46) width 89: "the image. "
|
| + text run at (178,46) width 533: "However, there should be 30 pixels of space between the right and"
|
| + text run at (90,69) width 483: "bottom edges of the image and the paragraph text around it. "
|
| + text run at (572,69) width 121: "This paragraph"
|
| + text run at (0,92) width 704: "should have a white background, first of all, which extends to the edges of the element's"
|
| + text run at (0,115) width 40: "box. "
|
| + text run at (40,115) width 432: "There is no padding set on this paragraph whatsoever."
|
| + RenderBlock {P} at (30,879) size 729x138 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (0,0) size 60x60
|
| - RenderText {#text} at (30,0) size 722x120
|
| + RenderText {#text} at (30,0) size 722x138
|
| text run at (30,0) width 657: "The image in the upper left corner of this paragraph should be floated left, and the"
|
| - text run at (30,20) width 691: "edges of the white background should line up with the top and left edges of the image."
|
| - text run at (0,40) width 696: "However, the text should overlap the image's right and bottom sides, lining up with the"
|
| - text run at (0,60) width 238: "thick gray lines in the image. "
|
| - text run at (237,60) width 479: "This paragraph should have a white background, first of all,"
|
| - text run at (0,80) width 392: "which extends to the edges of the element's box. "
|
| - text run at (391,80) width 331: "There is no padding set on this paragraph"
|
| - text run at (0,100) width 97: "whatsoever."
|
| - LayoutTable {TABLE} at (0,924) size 769x754 [border: (1px outset #808080)]
|
| - LayoutTableSection {TBODY} at (1,1) size 767x752
|
| - LayoutTableRow {TR} at (0,0) size 767x24
|
| - LayoutTableCell {TD} at (0,0) size 767x24 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
|
| - RenderInline {STRONG} at (0,0) size 163x16
|
| - RenderText {#text} at (4,4) size 163x16
|
| + text run at (30,23) width 691: "edges of the white background should line up with the top and left edges of the image."
|
| + text run at (0,46) width 696: "However, the text should overlap the image's right and bottom sides, lining up with the"
|
| + text run at (0,69) width 238: "thick gray lines in the image. "
|
| + text run at (237,69) width 479: "This paragraph should have a white background, first of all,"
|
| + text run at (0,92) width 392: "which extends to the edges of the element's box. "
|
| + text run at (391,92) width 331: "There is no padding set on this paragraph"
|
| + text run at (0,115) width 97: "whatsoever."
|
| + LayoutTable {TABLE} at (0,1037) size 769x849 [border: (1px outset #808080)]
|
| + LayoutTableSection {TBODY} at (1,1) size 767x847
|
| + LayoutTableRow {TR} at (0,0) size 767x26
|
| + LayoutTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
|
| + RenderInline {STRONG} at (0,0) size 163x18
|
| + RenderText {#text} at (4,4) size 163x18
|
| text run at (4,4) width 163: "TABLE Testing Section"
|
| - LayoutTableRow {TR} at (0,24) size 767x728
|
| - LayoutTableCell {TD} at (0,376) size 12x24 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
|
| - RenderText {#text} at (4,4) size 4x16
|
| + LayoutTableRow {TR} at (0,26) size 767x821
|
| + LayoutTableCell {TD} at (0,423) size 12x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
|
| + RenderText {#text} at (4,4) size 4x18
|
| text run at (4,4) width 4: " "
|
| - LayoutTableCell {TD} at (12,24) size 755x728 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
|
| - RenderBlock {P} at (34,4) size 707x80 [bgcolor=#FFFFFF]
|
| - RenderText {#text} at (0,0) size 699x80
|
| + LayoutTableCell {TD} at (12,26) size 755x821 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
|
| + RenderBlock {P} at (34,4) size 707x92 [bgcolor=#FFFFFF]
|
| + RenderText {#text} at (0,0) size 699x92
|
| text run at (0,0) width 656: "This paragraph should have a white background which extends to the edges of the"
|
| - text run at (0,20) width 120: "element's box. "
|
| - text run at (119,20) width 438: "There is no padding set on this paragraph whatsoever. "
|
| - text run at (556,20) width 143: "If the background"
|
| - text run at (0,40) width 690: "of the entire box is not white, this may cause problems with the following tests; at any"
|
| - text run at (0,60) width 276: "rate, it must be taken into account."
|
| - RenderBlock {P} at (34,104) size 707x100 [bgcolor=#FFFFFF]
|
| + text run at (0,23) width 120: "element's box. "
|
| + text run at (119,23) width 438: "There is no padding set on this paragraph whatsoever. "
|
| + text run at (556,23) width 143: "If the background"
|
| + text run at (0,46) width 690: "of the entire box is not white, this may cause problems with the following tests; at any"
|
| + text run at (0,69) width 276: "rate, it must be taken into account."
|
| + RenderBlock {P} at (34,116) size 707x115 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (0,0) size 60x60
|
| - RenderText {#text} at (60,0) size 692x100
|
| + RenderText {#text} at (60,0) size 692x115
|
| text run at (60,0) width 627: "The image in the upper left corner of this paragraph should be floated left, and"
|
| - text run at (60,20) width 118: "nothing more. "
|
| - text run at (177,20) width 501: "The edges of the white background should line up with the top"
|
| - text run at (60,40) width 227: "and left edges of the image. "
|
| - text run at (286,40) width 390: "This paragraph should have a white background,"
|
| - text run at (0,60) width 481: "first of all, which extends to the edges of the element's box. "
|
| - text run at (480,60) width 212: "There is no padding set on"
|
| - text run at (0,80) width 215: "this paragraph whatsoever."
|
| - RenderBlock {P} at (34,224) size 707x100 [bgcolor=#FFFFFF]
|
| + text run at (60,23) width 118: "nothing more. "
|
| + text run at (177,23) width 501: "The edges of the white background should line up with the top"
|
| + text run at (60,46) width 227: "and left edges of the image. "
|
| + text run at (286,46) width 390: "This paragraph should have a white background,"
|
| + text run at (0,69) width 481: "first of all, which extends to the edges of the element's box. "
|
| + text run at (480,69) width 212: "There is no padding set on"
|
| + text run at (0,92) width 215: "this paragraph whatsoever."
|
| + RenderBlock {P} at (34,251) size 707x115 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (30,30) size 60x60
|
| - RenderText {#text} at (90,0) size 608x100
|
| + RenderText {#text} at (90,0) size 698x115
|
| text run at (90,0) width 608: "The image in the upper left corner of this paragraph should be pushed down"
|
| - text run at (90,20) width 601: "and to the right 30 pixels each from the upper left corner of the paragraph's"
|
| - text run at (90,40) width 399: "box, and displace the paragraph text accordingly. "
|
| - text run at (488,40) width 180: "This paragraph should"
|
| - text run at (90,60) width 566: "have a white background, first of all, which extends to the edges of the"
|
| - text run at (90,80) width 120: "element's box. "
|
| - text run at (209,80) width 433: "There is no padding set on this paragraph whatsoever."
|
| - RenderBlock {P} at (34,344) size 707x100 [bgcolor=#FFFFFF]
|
| + text run at (90,23) width 601: "and to the right 30 pixels each from the upper left corner of the paragraph's"
|
| + text run at (90,46) width 399: "box, and displace the paragraph text accordingly. "
|
| + text run at (488,46) width 180: "This paragraph should"
|
| + text run at (90,69) width 566: "have a white background, first of all, which extends to the edges of the"
|
| + text run at (0,92) width 120: "element's box. "
|
| + text run at (119,92) width 433: "There is no padding set on this paragraph whatsoever."
|
| + RenderBlock {P} at (34,386) size 707x115 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (-30,-30) size 60x60
|
| - RenderText {#text} at (30,0) size 697x100
|
| + RenderText {#text} at (30,0) size 697x115
|
| text run at (30,0) width 667: "The image in the upper left corner of this paragraph should be pushed up and to the"
|
| - text run at (30,20) width 650: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing"
|
| - text run at (0,40) width 653: "the edges of the white background to align with the thick gray lines in the image. "
|
| - text run at (652,40) width 37: "This"
|
| - text run at (0,60) width 680: "paragraph should have a white background, first of all, which extends to the edges of"
|
| - text run at (0,80) width 150: "the element's box. "
|
| - text run at (149,80) width 432: "There is no padding set on this paragraph whatsoever."
|
| - RenderBlock {P} at (34,464) size 707x120 [bgcolor=#FFFFFF]
|
| + text run at (30,23) width 650: "left 30 pixels each from the upper left corner of the paragraph's box, thus causing"
|
| + text run at (0,46) width 653: "the edges of the white background to align with the thick gray lines in the image. "
|
| + text run at (652,46) width 37: "This"
|
| + text run at (0,69) width 680: "paragraph should have a white background, first of all, which extends to the edges of"
|
| + text run at (0,92) width 150: "the element's box. "
|
| + text run at (149,92) width 432: "There is no padding set on this paragraph whatsoever."
|
| + RenderBlock {P} at (34,521) size 707x138 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (0,0) size 60x60
|
| - RenderText {#text} at (90,0) size 706x120
|
| + RenderText {#text} at (90,0) size 706x138
|
| text run at (90,0) width 594: "The image in the upper left corner of this paragraph should be floated left,"
|
| - text run at (90,20) width 594: "and the edges of the white background should line up with the top and left"
|
| - text run at (90,40) width 161: "edges of the image. "
|
| - text run at (250,40) width 456: "However, there should be 30 pixels of space between the"
|
| - text run at (90,60) width 559: "right and bottom edges of the image and the paragraph text around it. "
|
| - text run at (648,60) width 37: "This"
|
| - text run at (90,80) width 608: "paragraph should have a white background, first of all, which extends to the"
|
| - text run at (0,100) width 222: "edges of the element's box. "
|
| - text run at (221,100) width 432: "There is no padding set on this paragraph whatsoever."
|
| - RenderBlock {P} at (34,604) size 707x120 [bgcolor=#FFFFFF]
|
| + text run at (90,23) width 594: "and the edges of the white background should line up with the top and left"
|
| + text run at (90,46) width 161: "edges of the image. "
|
| + text run at (250,46) width 456: "However, there should be 30 pixels of space between the"
|
| + text run at (90,69) width 559: "right and bottom edges of the image and the paragraph text around it. "
|
| + text run at (648,69) width 37: "This"
|
| + text run at (0,92) width 680: "paragraph should have a white background, first of all, which extends to the edges of"
|
| + text run at (0,115) width 150: "the element's box. "
|
| + text run at (149,115) width 432: "There is no padding set on this paragraph whatsoever."
|
| + RenderBlock {P} at (34,679) size 707x138 [bgcolor=#FFFFFF]
|
| RenderImage {IMG} at (0,0) size 60x60
|
| - RenderText {#text} at (30,0) size 697x120
|
| + RenderText {#text} at (30,0) size 697x138
|
| text run at (30,0) width 657: "The image in the upper left corner of this paragraph should be floated left, and the"
|
| - text run at (30,20) width 632: "edges of the white background should line up with the top and left edges of the"
|
| - text run at (0,40) width 59: "image. "
|
| - text run at (58,40) width 627: "However, the text should overlap the image's right and bottom sides, lining up"
|
| - text run at (0,60) width 308: "with the thick gray lines in the image. "
|
| - text run at (307,60) width 390: "This paragraph should have a white background,"
|
| - text run at (0,80) width 481: "first of all, which extends to the edges of the element's box. "
|
| - text run at (480,80) width 212: "There is no padding set on"
|
| - text run at (0,100) width 215: "this paragraph whatsoever."
|
| + text run at (30,23) width 632: "edges of the white background should line up with the top and left edges of the"
|
| + text run at (0,46) width 59: "image. "
|
| + text run at (58,46) width 627: "However, the text should overlap the image's right and bottom sides, lining up"
|
| + text run at (0,69) width 308: "with the thick gray lines in the image. "
|
| + text run at (307,69) width 390: "This paragraph should have a white background,"
|
| + text run at (0,92) width 481: "first of all, which extends to the edges of the element's box. "
|
| + text run at (480,92) width 212: "There is no padding set on"
|
| + text run at (0,115) width 215: "this paragraph whatsoever."
|
|
|
Chromium Code Reviews
