Index: LayoutTests/platform/mac/css1/cascade/cascade_order-expected.txt |
diff --git a/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.txt b/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.txt |
index 1437bc958bc7b205d2198fc37480585c1a0b873e..0921fb2be2601eb3ede5e4d54b20903d0781e2a0 100644 |
--- a/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.txt |
+++ b/LayoutTests/platform/mac/css1/cascade/cascade_order-expected.txt |
@@ -1,142 +1,142 @@ |
-layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 720 |
+layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 790 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 785x720 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
- RenderBlock {HTML} at (0,0) size 785x720 |
- RenderBody {BODY} at (8,8) size 769x704 [bgcolor=#CCCCCC] |
- RenderBlock {P} at (0,0) size 769x16 |
- RenderText {#text} at (0,0) size 363x16 |
+layer at (0,0) size 785x790 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
+ RenderBlock {HTML} at (0,0) size 785x790 |
+ RenderBody {BODY} at (8,8) size 769x774 [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 769x143 |
- RenderText {#text} at (0,0) size 562x143 |
+ RenderBlock {PRE} at (0,34) size 769x165 |
+ RenderText {#text} at (0,0) size 562x165 |
text run at (0,0) width 562: "<LINK rel=\"stylesheet\" type=\"text/css\" HREF=\"../resources/linktest.css\">" |
text run at (561,0) width 1: " " |
- text run at (0,13) width 149: "LI {color: purple;}" |
- text run at (148,13) width 1: " " |
- text run at (0,26) width 157: "UL LI {color: blue;}" |
- text run at (156,26) width 1: " " |
- text run at (0,39) width 180: "UL LI LI {color: gray;}" |
- text run at (179,39) width 1: " " |
- text run at (0,52) width 172: "LI.red {color: green;}" |
- text run at (171,52) width 1: " " |
- text run at (0,65) width 211: "UL LI.mar {color: #660000;}" |
- text run at (210,65) width 1: " " |
- text run at (0,78) width 196: "UL LI#gre {color: green;}" |
- text run at (195,78) width 1: " " |
- text run at (0,91) width 157: ".test {color: blue;}" |
- text run at (156,91) width 1: " " |
- text run at (0,104) width 172: ".test {color: purple;}" |
- text run at (171,104) width 1: " " |
- text run at (0,117) width 289: ".one {text-decoration: line-through;}" |
- text run at (288,117) width 1: " " |
- text run at (0,130) width 0: " " |
- RenderBlock {HR} at (0,188) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {UL} at (0,206) size 769x128 |
- RenderListItem {LI} at (40,0) size 729x16 [color=#0000FF] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 194x16 |
+ text run at (0,15) width 149: "LI {color: purple;}" |
+ text run at (148,15) width 1: " " |
+ text run at (0,30) width 157: "UL LI {color: blue;}" |
+ text run at (156,30) width 1: " " |
+ text run at (0,45) width 180: "UL LI LI {color: gray;}" |
+ text run at (179,45) width 1: " " |
+ text run at (0,60) width 172: "LI.red {color: green;}" |
+ text run at (171,60) width 1: " " |
+ text run at (0,75) width 211: "UL LI.mar {color: #660000;}" |
+ text run at (210,75) width 1: " " |
+ text run at (0,90) width 196: "UL LI#gre {color: green;}" |
+ text run at (195,90) width 1: " " |
+ text run at (0,105) width 157: ".test {color: blue;}" |
+ text run at (156,105) width 1: " " |
+ text run at (0,120) width 172: ".test {color: purple;}" |
+ text run at (171,120) width 1: " " |
+ text run at (0,135) width 289: ".one {text-decoration: line-through;}" |
+ text run at (288,135) width 1: " " |
+ text run at (0,150) width 0: " " |
+ RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {UL} at (0,230) size 769x144 |
+ RenderListItem {LI} at (40,0) size 729x18 [color=#0000FF] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 194x18 |
text run at (0,0) width 194: "This list item should be blue..." |
- RenderListItem {LI} at (40,16) size 729x64 [color=#0000FF] |
- RenderBlock (anonymous) at (0,0) size 729x16 |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 295x16 |
+ RenderListItem {LI} at (40,18) size 729x72 [color=#0000FF] |
+ RenderBlock (anonymous) at (0,0) size 729x18 |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 295x18 |
text run at (0,0) width 295: "...and so should this; neither should be purple." |
- RenderBlock {UL} at (0,16) size 729x48 |
- RenderListItem {LI} at (40,0) size 689x16 [color=#808080] |
- RenderListMarker at (-16,0) size 6x16: white bullet |
- RenderText {#text} at (0,0) size 195x16 |
+ RenderBlock {UL} at (0,18) size 729x54 |
+ RenderListItem {LI} at (40,0) size 689x18 [color=#808080] |
+ RenderListMarker at (-17,0) size 7x18: white bullet |
+ RenderText {#text} at (0,0) size 195x18 |
text run at (0,0) width 195: "This list item should be gray..." |
- RenderListItem {LI} at (40,16) size 689x16 [color=#808080] |
- RenderListMarker at (-16,0) size 6x16: white bullet |
- RenderText {#text} at (0,0) size 116x16 |
+ RenderListItem {LI} at (40,18) size 689x18 [color=#808080] |
+ RenderListMarker at (-17,0) size 7x18: white bullet |
+ RenderText {#text} at (0,0) size 116x18 |
text run at (0,0) width 116: "...as should this...." |
- RenderListItem {LI} at (40,32) size 689x16 [color=#008000] |
- RenderListMarker at (-16,0) size 6x16: white bullet |
- RenderText {#text} at (0,0) size 196x16 |
+ RenderListItem {LI} at (40,36) size 689x18 [color=#008000] |
+ RenderListMarker at (-17,0) size 7x18: white bullet |
+ RenderText {#text} at (0,0) size 196x18 |
text run at (0,0) width 196: "...but this one should be green." |
- RenderListItem {LI} at (40,80) size 729x16 [color=#660000] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 174x16 |
+ RenderListItem {LI} at (40,90) size 729x18 [color=#660000] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 174x18 |
text run at (0,0) width 174: "This ought to be dark red..." |
- RenderListItem {LI} at (40,96) size 729x16 [color=#008000] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 87x16 |
+ RenderListItem {LI} at (40,108) size 729x18 [color=#008000] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 87x18 |
text run at (0,0) width 87: "...this green..." |
- RenderListItem {LI} at (40,112) size 729x16 [color=#0000FF] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 98x16 |
+ RenderListItem {LI} at (40,126) size 729x18 [color=#0000FF] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 98x18 |
text run at (0,0) width 98: "...and this blue." |
- RenderBlock {P} at (0,350) size 769x16 [color=#0000FF] |
- RenderText {#text} at (0,0) size 283x16 |
+ RenderBlock {P} at (0,390) size 769x18 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 283x18 |
text run at (0,0) width 283: "This sentence should be blue (STYLE attr.)." |
- RenderBlock {P} at (0,382) size 769x16 [color=#800080] |
- RenderText {#text} at (0,0) size 208x16 |
+ RenderBlock {P} at (0,424) size 769x18 [color=#800080] |
+ RenderText {#text} at (0,0) size 208x18 |
text run at (0,0) width 208: "This sentence should be purple [" |
- RenderInline {CODE} at (0,0) size 95x13 |
- RenderText {#text} at (207,2) size 95x13 |
+ RenderInline {CODE} at (0,0) size 95x15 |
+ RenderText {#text} at (207,2) size 95x15 |
text run at (207,2) width 95: "class=\"test\"" |
- RenderText {#text} at (301,0) size 10x16 |
+ RenderText {#text} at (301,0) size 10x18 |
text run at (301,0) width 10: "]." |
- RenderBlock {P} at (0,414) size 769x16 |
- RenderText {#text} at (0,0) size 697x16 |
+ RenderBlock {P} at (0,458) size 769x18 |
+ RenderText {#text} at (0,0) size 697x18 |
text run at (0,0) width 697: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." |
- LayoutTable {TABLE} at (0,446) size 719x258 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 717x256 |
- LayoutTableRow {TR} at (0,0) size 717x24 |
- LayoutTableCell {TD} at (0,0) size 717x24 [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 |
+ LayoutTable {TABLE} at (0,492) size 719x282 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 717x280 |
+ LayoutTableRow {TR} at (0,0) size 717x26 |
+ LayoutTableCell {TD} at (0,0) size 717x26 [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 717x232 |
- LayoutTableCell {TD} at (0,128) 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 717x254 |
+ LayoutTableCell {TD} at (0,140) 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 705x232 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderBlock {UL} at (4,4) size 697x128 |
- RenderListItem {LI} at (40,0) size 657x16 [color=#0000FF] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 194x16 |
+ LayoutTableCell {TD} at (12,26) size 705x254 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderBlock {UL} at (4,4) size 697x144 |
+ RenderListItem {LI} at (40,0) size 657x18 [color=#0000FF] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 194x18 |
text run at (0,0) width 194: "This list item should be blue..." |
- RenderListItem {LI} at (40,16) size 657x64 [color=#0000FF] |
- RenderBlock (anonymous) at (0,0) size 657x16 |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 295x16 |
+ RenderListItem {LI} at (40,18) size 657x72 [color=#0000FF] |
+ RenderBlock (anonymous) at (0,0) size 657x18 |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 295x18 |
text run at (0,0) width 295: "...and so should this; neither should be purple." |
- RenderBlock {UL} at (0,16) size 657x48 |
- RenderListItem {LI} at (40,0) size 617x16 [color=#808080] |
- RenderListMarker at (-16,0) size 6x16: white bullet |
- RenderText {#text} at (0,0) size 195x16 |
+ RenderBlock {UL} at (0,18) size 657x54 |
+ RenderListItem {LI} at (40,0) size 617x18 [color=#808080] |
+ RenderListMarker at (-17,0) size 7x18: white bullet |
+ RenderText {#text} at (0,0) size 195x18 |
text run at (0,0) width 195: "This list item should be gray..." |
- RenderListItem {LI} at (40,16) size 617x16 [color=#808080] |
- RenderListMarker at (-16,0) size 6x16: white bullet |
- RenderText {#text} at (0,0) size 116x16 |
+ RenderListItem {LI} at (40,18) size 617x18 [color=#808080] |
+ RenderListMarker at (-17,0) size 7x18: white bullet |
+ RenderText {#text} at (0,0) size 116x18 |
text run at (0,0) width 116: "...as should this...." |
- RenderListItem {LI} at (40,32) size 617x16 [color=#008000] |
- RenderListMarker at (-16,0) size 6x16: white bullet |
- RenderText {#text} at (0,0) size 196x16 |
+ RenderListItem {LI} at (40,36) size 617x18 [color=#008000] |
+ RenderListMarker at (-17,0) size 7x18: white bullet |
+ RenderText {#text} at (0,0) size 196x18 |
text run at (0,0) width 196: "...but this one should be green." |
- RenderListItem {LI} at (40,80) size 657x16 [color=#660000] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 174x16 |
+ RenderListItem {LI} at (40,90) size 657x18 [color=#660000] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 174x18 |
text run at (0,0) width 174: "This ought to be dark red..." |
- RenderListItem {LI} at (40,96) size 657x16 [color=#008000] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 87x16 |
+ RenderListItem {LI} at (40,108) size 657x18 [color=#008000] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 87x18 |
text run at (0,0) width 87: "...this green..." |
- RenderListItem {LI} at (40,112) size 657x16 [color=#0000FF] |
- RenderListMarker at (-16,0) size 6x16: bullet |
- RenderText {#text} at (0,0) size 98x16 |
+ RenderListItem {LI} at (40,126) size 657x18 [color=#0000FF] |
+ RenderListMarker at (-17,0) size 7x18: bullet |
+ RenderText {#text} at (0,0) size 98x18 |
text run at (0,0) width 98: "...and this blue." |
- RenderBlock {P} at (4,148) size 697x16 [color=#0000FF] |
- RenderText {#text} at (0,0) size 283x16 |
+ RenderBlock {P} at (4,164) size 697x18 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 283x18 |
text run at (0,0) width 283: "This sentence should be blue (STYLE attr.)." |
- RenderBlock {P} at (4,180) size 697x16 [color=#800080] |
- RenderText {#text} at (0,0) size 208x16 |
+ RenderBlock {P} at (4,198) size 697x18 [color=#800080] |
+ RenderText {#text} at (0,0) size 208x18 |
text run at (0,0) width 208: "This sentence should be purple [" |
- RenderInline {CODE} at (0,0) size 95x13 |
- RenderText {#text} at (207,2) size 95x13 |
+ RenderInline {CODE} at (0,0) size 95x15 |
+ RenderText {#text} at (207,2) size 95x15 |
text run at (207,2) width 95: "class=\"test\"" |
- RenderText {#text} at (301,0) size 10x16 |
+ RenderText {#text} at (301,0) size 10x18 |
text run at (301,0) width 10: "]." |
- RenderBlock {P} at (4,212) size 697x16 |
- RenderText {#text} at (0,0) size 697x16 |
+ RenderBlock {P} at (4,232) size 697x18 |
+ RenderText {#text} at (0,0) size 697x18 |
text run at (0,0) width 697: "This text should be stricken (overriding the imported underline; only works if LINKed sheets are supported)." |