Index: LayoutTests/platform/win/css1/basic/containment-expected.txt |
diff --git a/LayoutTests/platform/win/css1/basic/containment-expected.txt b/LayoutTests/platform/win/css1/basic/containment-expected.txt |
index 75503afbe9ff13d096727e8c7432bede05f69b2b..484cc8a6db98ed11764513d4e57d8e4ea9545817 100644 |
--- a/LayoutTests/platform/win/css1/basic/containment-expected.txt |
+++ b/LayoutTests/platform/win/css1/basic/containment-expected.txt |
@@ -1,88 +1,88 @@ |
-layer at (0,0) size 785x961 |
+layer at (0,0) size 785x971 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x961 |
- RenderBlock {HTML} at (0,0) size 785x961 |
- RenderBody {BODY} at (8,8) size 769x945 [bgcolor=#CCCCCC] |
+layer at (0,0) size 785x971 |
+ RenderBlock {HTML} at (0,0) size 785x971 |
+ RenderBody {BODY} at (8,8) size 769x955 [bgcolor=#CCCCCC] |
RenderBlock {P} at (0,0) size 769x18 |
RenderText {#text} at (0,0) size 363x17 |
text run at (0,0) width 363: "The style declarations which apply to the text below are:" |
- RenderBlock {PRE} at (0,34) size 769x150 |
- RenderText {#text} at (0,0) size 710x150 |
- text run at (0,0) width 609: "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"linktest.css\" title=\"Default SS\">" |
- text run at (608,0) width 1: " " |
- text run at (0,15) width 710: "<LINK rel=\"alternate stylesheet\" type=\"text/css\" href=\"linktest2.css\" title=\"Alternate SS\">" |
- text run at (709,15) width 1: " " |
- text run at (0,30) width 203: "@import url(imptest1.css);" |
- text run at (202,30) width 1: " " |
- text run at (0,45) width 188: "@import \"imptest1a.css\";" |
- text run at (187,45) width 1: " " |
- text run at (0,60) width 125: "UL {color: red;}" |
- text run at (124,60) width 1: " " |
- text run at (0,75) width 172: ".four {color: purple;}" |
- text run at (171,75) width 1: " " |
- text run at (0,90) width 203: "@import url(imptest2.css);" |
- text run at (202,90) width 1: " " |
- text run at (0,105) width 32: "<!--" |
- text run at (31,105) width 1: " " |
- text run at (0,120) width 164: "P.six {color: green;}" |
- text run at (163,120) width 1: " " |
- text run at (0,135) width 24: "-->" |
- text run at (23,135) width 1: " " |
- RenderBlock {HR} at (0,197) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,215) size 769x18 |
+ RenderBlock {PRE} at (0,34) size 769x160 |
+ RenderText {#text} at (0,0) size 728x160 |
+ text run at (0,0) width 624: "<LINK rel=\"stylesheet\" type=\"text/css\" href=\"linktest.css\" title=\"Default SS\">" |
+ text run at (624,0) width 0: " " |
+ text run at (0,16) width 728: "<LINK rel=\"alternate stylesheet\" type=\"text/css\" href=\"linktest2.css\" title=\"Alternate SS\">" |
+ text run at (728,16) width 0: " " |
+ text run at (0,32) width 208: "@import url(imptest1.css);" |
+ text run at (208,32) width 0: " " |
+ text run at (0,48) width 192: "@import \"imptest1a.css\";" |
+ text run at (192,48) width 0: " " |
+ text run at (0,64) width 128: "UL {color: red;}" |
+ text run at (128,64) width 0: " " |
+ text run at (0,80) width 176: ".four {color: purple;}" |
+ text run at (176,80) width 0: " " |
+ text run at (0,96) width 208: "@import url(imptest2.css);" |
+ text run at (208,96) width 0: " " |
+ text run at (0,112) width 32: "<!--" |
+ text run at (32,112) width 0: " " |
+ text run at (0,128) width 168: "P.six {color: green;}" |
+ text run at (168,128) width 0: " " |
+ text run at (0,144) width 24: "-->" |
+ text run at (24,144) width 0: " " |
+ RenderBlock {HR} at (0,207) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,225) size 769x18 |
RenderText {#text} at (0,0) size 412x17 |
text run at (0,0) width 412: "This sentence should be underlined due to the linked style sheet " |
- RenderInline {CODE} at (0,0) size 95x15 |
- RenderText {#text} at (411,3) size 95x15 |
- text run at (411,3) width 95: "linktest.css" |
- RenderText {#text} at (505,0) size 258x17 |
- text run at (505,0) width 258: ", the reference to which is shown above." |
- RenderBlock {P} at (0,249) size 769x36 |
+ RenderInline {CODE} at (0,0) size 97x16 |
+ RenderText {#text} at (411,2) size 97x16 |
+ text run at (411,2) width 97: "linktest.css" |
+ RenderText {#text} at (507,0) size 259x17 |
+ text run at (507,0) width 259: ", the reference to which is shown above." |
+ RenderBlock {P} at (0,259) size 769x36 |
RenderText {#text} at (0,0) size 449x17 |
text run at (0,0) width 449: "This sentence should NOT be underlined due to the linked style sheet " |
- RenderInline {CODE} at (0,0) size 103x15 |
- RenderText {#text} at (448,3) size 103x15 |
- text run at (448,3) width 103: "linktest2.css" |
- RenderText {#text} at (550,0) size 9x17 |
- text run at (550,0) width 9: ", " |
- RenderInline {STRONG} at (0,0) size 42x17 |
- RenderText {#text} at (558,0) size 42x17 |
- text run at (558,0) width 42: "unless" |
- RenderText {#text} at (599,0) size 751x35 |
- text run at (599,0) width 152: " the external style sheet" |
+ RenderInline {CODE} at (0,0) size 105x16 |
+ RenderText {#text} at (448,2) size 105x16 |
+ text run at (448,2) width 105: "linktest2.css" |
+ RenderText {#text} at (552,0) size 9x17 |
+ text run at (552,0) width 9: ", " |
+ RenderInline {STRONG} at (0,0) size 43x17 |
+ RenderText {#text} at (560,0) size 43x17 |
+ text run at (560,0) width 43: "unless" |
+ RenderText {#text} at (602,0) size 753x35 |
+ text run at (602,0) width 151: " the external style sheet" |
text run at (0,18) width 330: "\"Alternate SS\" has been selected via the user agent." |
- RenderBlock {UL} at (0,301) size 769x54 [color=#FF0000] |
+ RenderBlock {UL} at (0,311) size 769x54 [color=#FF0000] |
RenderListItem {LI} at (40,0) size 729x18 [color=#008000] |
RenderListMarker at (-17,0) size 7x17: bullet |
RenderText {#text} at (0,0) size 398x17 |
text run at (0,0) width 398: "This sentence should be green due to an imported style sheet [" |
- RenderInline {CODE} at (0,0) size 204x15 |
- RenderText {#text} at (397,3) size 204x15 |
- text run at (397,3) width 204: "@import url(imptest1.css);" |
- RenderText {#text} at (600,0) size 10x17 |
- text run at (600,0) width 10: "]." |
+ RenderInline {CODE} at (0,0) size 209x16 |
+ RenderText {#text} at (397,2) size 209x16 |
+ text run at (397,2) width 209: "@import url(imptest1.css);" |
+ RenderText {#text} at (605,0) size 10x17 |
+ text run at (605,0) width 10: "]." |
RenderListItem {LI} at (40,18) size 729x18 [color=#800080] |
RenderListMarker at (-17,0) size 7x17: bullet |
RenderText {#text} at (0,0) size 404x17 |
text run at (0,0) width 404: "This sentence should be purple due to an imported style sheet [" |
- RenderInline {CODE} at (0,0) size 180x15 |
- RenderText {#text} at (403,3) size 180x15 |
- text run at (403,3) width 180: "@import \"imptest1a.css\"" |
- RenderText {#text} at (582,0) size 10x17 |
- text run at (582,0) width 10: "]." |
+ RenderInline {CODE} at (0,0) size 185x16 |
+ RenderText {#text} at (403,2) size 185x16 |
+ text run at (403,2) width 185: "@import \"imptest1a.css\"" |
+ RenderText {#text} at (587,0) size 10x17 |
+ text run at (587,0) width 10: "]." |
RenderListItem {LI} at (40,36) size 729x18 [color=#008000] |
RenderListMarker at (-17,0) size 7x17: bullet |
RenderText {#text} at (0,0) size 400x17 |
text run at (0,0) width 400: "This sentence should be green thanks to the STYLE attribute [" |
- RenderInline {CODE} at (0,0) size 164x15 |
- RenderText {#text} at (399,3) size 164x15 |
- text run at (399,3) width 164: "STYLE=\"color: green;\"" |
- RenderText {#text} at (562,0) size 11x17 |
- text run at (562,0) width 11: "]." |
- RenderBlock {P} at (0,371) size 769x18 [color=#800080] |
+ RenderInline {CODE} at (0,0) size 169x16 |
+ RenderText {#text} at (399,2) size 169x16 |
+ text run at (399,2) width 169: "STYLE=\"color: green;\"" |
+ RenderText {#text} at (567,0) size 10x17 |
+ text run at (567,0) width 10: "]." |
+ RenderBlock {P} at (0,381) size 769x18 [color=#800080] |
RenderText {#text} at (0,0) size 510x17 |
text run at (0,0) width 510: "This sentence should be purple, and it doesn't have a terminating paragraph tag." |
- RenderBlock {OL} at (0,405) size 769x54 |
+ RenderBlock {OL} at (0,415) size 769x54 |
RenderListItem {LI} at (40,0) size 729x18 |
RenderListMarker at (-20,0) size 16x17: "1" |
RenderText {#text} at (0,0) size 204x17 |
@@ -95,24 +95,24 @@ layer at (0,0) size 785x961 |
RenderListMarker at (-20,0) size 16x17: "3" |
RenderText {#text} at (0,0) size 512x17 |
text run at (0,0) width 512: "If it IS purple, then the browser hasn't correctly parsed the preceding paragraph." |
- RenderBlock {P} at (0,475) size 769x36 |
+ RenderBlock {P} at (0,485) size 769x36 |
RenderText {#text} at (0,0) size 715x17 |
text run at (0,0) width 200: "This sentence should be black. " |
text run at (199,0) width 516: "If it is red, then the browser has inappropriately imported the styles from the file" |
- RenderInline {TT} at (0,0) size 94x15 |
- RenderText {#text} at (0,21) size 94x15 |
- text run at (0,21) width 94: "imptest2.css" |
- RenderText {#text} at (93,18) size 35x17 |
- text run at (93,18) width 35: " (see " |
- RenderInline {A} at (0,0) size 70x17 [color=#0000FF] |
- RenderText {#text} at (127,18) size 70x17 |
- text run at (127,18) width 70: "section 3.0" |
- RenderText {#text} at (196,18) size 283x17 |
- text run at (196,18) width 283: " of the CSS1 specification for more details)." |
- RenderBlock {P} at (0,527) size 769x18 [color=#008000] |
+ RenderInline {TT} at (0,0) size 96x16 |
+ RenderText {#text} at (0,20) size 96x16 |
+ text run at (0,20) width 96: "imptest2.css" |
+ RenderText {#text} at (96,18) size 34x17 |
+ text run at (96,18) width 34: " (see " |
+ RenderInline {A} at (0,0) size 71x17 [color=#0000FF] |
+ RenderText {#text} at (129,18) size 71x17 |
+ text run at (129,18) width 71: "section 3.0" |
+ RenderText {#text} at (199,18) size 282x17 |
+ text run at (199,18) width 282: " of the CSS1 specification for more details)." |
+ RenderBlock {P} at (0,537) size 769x18 [color=#008000] |
RenderText {#text} at (0,0) size 206x17 |
text run at (0,0) width 206: "This paragraph should be green." |
- RenderTable {TABLE} at (0,561) size 769x384 [border: (1px outset #808080)] |
+ RenderTable {TABLE} at (0,571) size 769x384 [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 767x382 |
RenderTableRow {TR} at (0,0) size 767x26 |
RenderTableCell {TD} at (0,0) size 767x26 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2] |
@@ -127,54 +127,54 @@ layer at (0,0) size 785x961 |
RenderBlock {P} at (4,4) size 747x36 |
RenderText {#text} at (0,0) size 412x17 |
text run at (0,0) width 412: "This sentence should be underlined due to the linked style sheet " |
- RenderInline {CODE} at (0,0) size 95x15 |
- RenderText {#text} at (411,3) size 95x15 |
- text run at (411,3) width 95: "linktest.css" |
- RenderText {#text} at (505,0) size 717x35 |
- text run at (505,0) width 212: ", the reference to which is shown" |
+ RenderInline {CODE} at (0,0) size 97x16 |
+ RenderText {#text} at (411,2) size 97x16 |
+ text run at (411,2) width 97: "linktest.css" |
+ RenderText {#text} at (507,0) size 719x35 |
+ text run at (507,0) width 212: ", the reference to which is shown" |
text run at (0,18) width 43: "above." |
RenderBlock {P} at (4,56) size 747x36 |
RenderText {#text} at (0,0) size 449x17 |
text run at (0,0) width 449: "This sentence should NOT be underlined due to the linked style sheet " |
- RenderInline {CODE} at (0,0) size 103x15 |
- RenderText {#text} at (448,3) size 103x15 |
- text run at (448,3) width 103: "linktest2.css" |
- RenderText {#text} at (550,0) size 9x17 |
- text run at (550,0) width 9: ", " |
- RenderInline {STRONG} at (0,0) size 42x17 |
- RenderText {#text} at (558,0) size 42x17 |
- text run at (558,0) width 42: "unless" |
- RenderText {#text} at (599,0) size 714x35 |
- text run at (599,0) width 115: " the external style" |
+ RenderInline {CODE} at (0,0) size 105x16 |
+ RenderText {#text} at (448,2) size 105x16 |
+ text run at (448,2) width 105: "linktest2.css" |
+ RenderText {#text} at (552,0) size 9x17 |
+ text run at (552,0) width 9: ", " |
+ RenderInline {STRONG} at (0,0) size 43x17 |
+ RenderText {#text} at (560,0) size 43x17 |
+ text run at (560,0) width 43: "unless" |
+ RenderText {#text} at (602,0) size 716x35 |
+ text run at (602,0) width 114: " the external style" |
text run at (0,18) width 367: "sheet \"Alternate SS\" has been selected via the user agent." |
RenderBlock {UL} at (4,108) size 747x54 [color=#FF0000] |
RenderListItem {LI} at (40,0) size 707x18 [color=#008000] |
RenderListMarker at (-17,0) size 7x17: bullet |
RenderText {#text} at (0,0) size 398x17 |
text run at (0,0) width 398: "This sentence should be green due to an imported style sheet [" |
- RenderInline {CODE} at (0,0) size 204x15 |
- RenderText {#text} at (397,3) size 204x15 |
- text run at (397,3) width 204: "@import url(imptest1.css);" |
- RenderText {#text} at (600,0) size 10x17 |
- text run at (600,0) width 10: "]." |
+ RenderInline {CODE} at (0,0) size 209x16 |
+ RenderText {#text} at (397,2) size 209x16 |
+ text run at (397,2) width 209: "@import url(imptest1.css);" |
+ RenderText {#text} at (605,0) size 10x17 |
+ text run at (605,0) width 10: "]." |
RenderListItem {LI} at (40,18) size 707x18 [color=#800080] |
RenderListMarker at (-17,0) size 7x17: bullet |
RenderText {#text} at (0,0) size 404x17 |
text run at (0,0) width 404: "This sentence should be purple due to an imported style sheet [" |
- RenderInline {CODE} at (0,0) size 180x15 |
- RenderText {#text} at (403,3) size 180x15 |
- text run at (403,3) width 180: "@import \"imptest1a.css\"" |
- RenderText {#text} at (582,0) size 10x17 |
- text run at (582,0) width 10: "]." |
+ RenderInline {CODE} at (0,0) size 185x16 |
+ RenderText {#text} at (403,2) size 185x16 |
+ text run at (403,2) width 185: "@import \"imptest1a.css\"" |
+ RenderText {#text} at (587,0) size 10x17 |
+ text run at (587,0) width 10: "]." |
RenderListItem {LI} at (40,36) size 707x18 [color=#008000] |
RenderListMarker at (-17,0) size 7x17: bullet |
RenderText {#text} at (0,0) size 400x17 |
text run at (0,0) width 400: "This sentence should be green thanks to the STYLE attribute [" |
- RenderInline {CODE} at (0,0) size 164x15 |
- RenderText {#text} at (399,3) size 164x15 |
- text run at (399,3) width 164: "STYLE=\"color: green;\"" |
- RenderText {#text} at (562,0) size 11x17 |
- text run at (562,0) width 11: "]." |
+ RenderInline {CODE} at (0,0) size 169x16 |
+ RenderText {#text} at (399,2) size 169x16 |
+ text run at (399,2) width 169: "STYLE=\"color: green;\"" |
+ RenderText {#text} at (567,0) size 10x17 |
+ text run at (567,0) width 10: "]." |
RenderBlock {P} at (4,178) size 747x18 [color=#800080] |
RenderText {#text} at (0,0) size 510x17 |
text run at (0,0) width 510: "This sentence should be purple, and it doesn't have a terminating paragraph tag." |
@@ -195,16 +195,16 @@ layer at (0,0) size 785x961 |
RenderText {#text} at (0,0) size 715x17 |
text run at (0,0) width 200: "This sentence should be black. " |
text run at (199,0) width 516: "If it is red, then the browser has inappropriately imported the styles from the file" |
- RenderInline {TT} at (0,0) size 94x15 |
- RenderText {#text} at (0,21) size 94x15 |
- text run at (0,21) width 94: "imptest2.css" |
- RenderText {#text} at (93,18) size 35x17 |
- text run at (93,18) width 35: " (see " |
- RenderInline {A} at (0,0) size 70x17 [color=#0000FF] |
- RenderText {#text} at (127,18) size 70x17 |
- text run at (127,18) width 70: "section 3.0" |
- RenderText {#text} at (196,18) size 283x17 |
- text run at (196,18) width 283: " of the CSS1 specification for more details)." |
+ RenderInline {TT} at (0,0) size 96x16 |
+ RenderText {#text} at (0,20) size 96x16 |
+ text run at (0,20) width 96: "imptest2.css" |
+ RenderText {#text} at (96,18) size 34x17 |
+ text run at (96,18) width 34: " (see " |
+ RenderInline {A} at (0,0) size 71x17 [color=#0000FF] |
+ RenderText {#text} at (129,18) size 71x17 |
+ text run at (129,18) width 71: "section 3.0" |
+ RenderText {#text} at (199,18) size 282x17 |
+ text run at (199,18) width 282: " of the CSS1 specification for more details)." |
RenderBlock {P} at (4,334) size 747x18 [color=#008000] |
RenderText {#text} at (0,0) size 206x17 |
text run at (0,0) width 206: "This paragraph should be green." |