Index: LayoutTests/platform/mac/css1/basic/inheritance-expected.txt |
diff --git a/LayoutTests/platform/mac/css1/basic/inheritance-expected.txt b/LayoutTests/platform/mac/css1/basic/inheritance-expected.txt |
index 75df467138bdc553f258218358f3b7596db4dd62..5b2fbe61c1f5067551b6ae357905823979904463 100644 |
--- a/LayoutTests/platform/mac/css1/basic/inheritance-expected.txt |
+++ b/LayoutTests/platform/mac/css1/basic/inheritance-expected.txt |
@@ -1,189 +1,189 @@ |
-layer at (0,0) size 800x600 scrollHeight 679 |
+layer at (0,0) size 800x600 scrollHeight 731 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 800x679 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600 |
- RenderBlock {HTML} at (0,0) size 800x678.59 |
- RenderBody {BODY} at (8,8) size 784x662.59 [color=#008000] [bgcolor=#CCCCCC] |
- RenderBlock {P} at (0,0) size 784x16 |
- RenderText {#text} at (0,0) size 363x16 |
+layer at (0,0) size 800x731 backgroundClip at (0,0) size 800x600 clip at (0,0) size 800x600 outlineClip at (0,0) size 800x600 |
+ RenderBlock {HTML} at (0,0) size 800x730.59 |
+ RenderBody {BODY} at (8,8) size 784x714.59 [color=#008000] [bgcolor=#CCCCCC] |
+ RenderBlock {P} at (0,0) size 784x18 |
+ 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 784x91 |
- RenderText {#text} at (0,0) size 266x91 |
+ RenderBlock {PRE} at (0,34) size 784x105 |
+ RenderText {#text} at (0,0) size 266x105 |
text run at (0,0) width 157: "BODY {color: green;}" |
text run at (156,0) width 1: " " |
- text run at (0,13) width 133: "H3 {color: blue;}" |
- text run at (132,13) width 1: " " |
- text run at (0,26) width 149: "EM {color: purple;}" |
- text run at (148,26) width 1: " " |
- text run at (0,39) width 203: ".one {font-style: italic;}" |
- text run at (202,39) width 1: " " |
- text run at (0,52) width 266: ".two {text-decoration: underline;}" |
- text run at (265,52) width 1: " " |
- text run at (0,65) width 149: "#two {color: navy;}" |
- text run at (148,65) width 1: " " |
- text run at (0,78) width 180: ".three {color: purple;}" |
- text run at (179,78) width 1: " " |
- RenderBlock {HR} at (0,136) size 784x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {H3} at (0,156.72) size 784x19 [color=#0000FF] |
- RenderText {#text} at (0,0) size 216x19 |
+ text run at (0,15) width 133: "H3 {color: blue;}" |
+ text run at (132,15) width 1: " " |
+ text run at (0,30) width 149: "EM {color: purple;}" |
+ text run at (148,30) width 1: " " |
+ text run at (0,45) width 203: ".one {font-style: italic;}" |
+ text run at (202,45) width 1: " " |
+ text run at (0,60) width 266: ".two {text-decoration: underline;}" |
+ text run at (265,60) width 1: " " |
+ text run at (0,75) width 149: "#two {color: navy;}" |
+ text run at (148,75) width 1: " " |
+ text run at (0,90) width 180: ".three {color: purple;}" |
+ text run at (179,90) width 1: " " |
+ RenderBlock {HR} at (0,152) size 784x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {H3} at (0,172.72) size 784x22 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 216x22 |
text run at (0,0) width 216: "This sentence should show " |
- RenderInline {STRONG} at (0,0) size 35x19 |
- RenderText {#text} at (215,0) size 35x19 |
+ RenderInline {STRONG} at (0,0) size 35x22 |
+ RenderText {#text} at (215,0) size 35x22 |
text run at (215,0) width 35: "blue" |
- RenderText {#text} at (249,0) size 41x19 |
+ RenderText {#text} at (249,0) size 41x22 |
text run at (249,0) width 41: " and " |
- RenderInline {EM} at (0,0) size 50x19 [color=#800080] |
- RenderText {#text} at (289,0) size 50x19 |
+ RenderInline {EM} at (0,0) size 50x22 [color=#800080] |
+ RenderText {#text} at (289,0) size 50x22 |
text run at (289,0) width 50: "purple" |
- RenderText {#text} at (338,0) size 6x19 |
+ RenderText {#text} at (338,0) size 6x22 |
text run at (338,0) width 6: "." |
- RenderBlock {H3} at (0,194.44) size 784x19 [color=#0000FF] |
- RenderText {#text} at (0,0) size 194x19 |
+ RenderBlock {H3} at (0,213.44) size 784x22 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 194x22 |
text run at (0,0) width 194: "This sentence should be " |
- RenderInline {SPAN} at (0,0) size 34x19 |
- RenderText {#text} at (193,0) size 34x19 |
+ RenderInline {SPAN} at (0,0) size 34x22 |
+ RenderText {#text} at (193,0) size 34x22 |
text run at (193,0) width 34: "blue" |
- RenderText {#text} at (226,0) size 101x19 |
+ RenderText {#text} at (226,0) size 101x22 |
text run at (226,0) width 101: " throughout." |
- RenderBlock {P} at (0,232.16) size 784x16 |
- RenderText {#text} at (0,0) size 230x16 |
+ RenderBlock {P} at (0,254.16) size 784x18 |
+ RenderText {#text} at (0,0) size 230x18 |
text run at (0,0) width 230: "This should be green except for the " |
- RenderInline {EM} at (0,0) size 119x16 [color=#800080] |
- RenderText {#text} at (229,0) size 119x16 |
+ RenderInline {EM} at (0,0) size 119x18 [color=#800080] |
+ RenderText {#text} at (229,0) size 119x18 |
text run at (229,0) width 119: "emphasized words" |
- RenderText {#text} at (347,0) size 163x16 |
+ RenderText {#text} at (347,0) size 163x18 |
text run at (347,0) width 163: ", which should be purple." |
- RenderBlock {H3} at (0,266.88) size 784x19 [color=#0000FF] |
- RenderText {#text} at (0,0) size 288x19 |
+ RenderBlock {H3} at (0,290.88) size 784x22 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 288x22 |
text run at (0,0) width 288: "This should be blue and underlined." |
- RenderBlock {P} at (0,304.59) size 784x16 |
- RenderText {#text} at (0,0) size 299x16 |
+ RenderBlock {P} at (0,331.59) size 784x18 |
+ RenderText {#text} at (0,0) size 299x18 |
text run at (0,0) width 299: "This sentence should be underlined, including " |
- RenderInline {TT} at (0,0) size 71x13 |
- RenderText {#text} at (298,2) size 71x13 |
+ RenderInline {TT} at (0,0) size 71x15 |
+ RenderText {#text} at (298,2) size 71x15 |
text run at (298,2) width 71: "this part" |
- RenderText {#text} at (368,0) size 9x16 |
+ RenderText {#text} at (368,0) size 9x18 |
text run at (368,0) width 9: ", " |
- RenderInline {I} at (0,0) size 55x16 |
- RenderText {#text} at (376,0) size 55x16 |
+ RenderInline {I} at (0,0) size 55x18 |
+ RenderText {#text} at (376,0) size 55x18 |
text run at (376,0) width 55: "this part" |
- RenderText {#text} at (430,0) size 9x16 |
+ RenderText {#text} at (430,0) size 9x18 |
text run at (430,0) width 9: ", " |
- RenderInline {EM} at (0,0) size 54x16 [color=#800080] |
- RenderText {#text} at (438,0) size 54x16 |
+ RenderInline {EM} at (0,0) size 54x18 [color=#800080] |
+ RenderText {#text} at (438,0) size 54x18 |
text run at (438,0) width 54: "this part" |
- RenderText {#text} at (491,0) size 37x16 |
+ RenderText {#text} at (491,0) size 37x18 |
text run at (491,0) width 37: ", and " |
- RenderInline {STRONG} at (0,0) size 59x16 |
- RenderText {#text} at (527,0) size 59x16 |
+ RenderInline {STRONG} at (0,0) size 59x18 |
+ RenderText {#text} at (527,0) size 59x18 |
text run at (527,0) width 59: "this part" |
- RenderText {#text} at (585,0) size 5x16 |
+ RenderText {#text} at (585,0) size 5x18 |
text run at (585,0) width 5: "." |
- RenderBlock {P} at (0,336.59) size 784x16 [color=#000080] |
- RenderText {#text} at (0,0) size 444x16 |
+ RenderBlock {P} at (0,365.59) size 784x18 [color=#000080] |
+ RenderText {#text} at (0,0) size 444x18 |
text run at (0,0) width 444: "This sentence should also be underlined, as well as dark blue (navy), " |
- RenderInline {TT} at (0,0) size 149x13 |
- RenderText {#text} at (443,2) size 149x13 |
+ RenderInline {TT} at (0,0) size 149x15 |
+ RenderText {#text} at (443,2) size 149x15 |
text run at (443,2) width 149: "including this part" |
- RenderText {#text} at (591,0) size 5x16 |
+ RenderText {#text} at (591,0) size 5x18 |
text run at (591,0) width 5: "." |
- RenderBlock {P} at (0,368.59) size 784x16 [color=#800080] |
- RenderText {#text} at (0,0) size 271x16 |
+ RenderBlock {P} at (0,399.59) size 784x18 [color=#800080] |
+ RenderText {#text} at (0,0) size 271x18 |
text run at (0,0) width 271: "This sentence should be purple, including " |
- RenderInline {STRONG} at (0,0) size 59x16 |
- RenderText {#text} at (270,0) size 59x16 |
+ RenderInline {STRONG} at (0,0) size 59x18 |
+ RenderText {#text} at (270,0) size 59x18 |
text run at (270,0) width 59: "this part" |
- RenderText {#text} at (328,0) size 32x16 |
+ RenderText {#text} at (328,0) size 32x18 |
text run at (328,0) width 32: " and " |
- RenderInline {SPAN} at (0,0) size 178x16 |
- RenderText {#text} at (359,0) size 178x16 |
+ RenderInline {SPAN} at (0,0) size 178x18 |
+ RenderText {#text} at (359,0) size 178x18 |
text run at (359,0) width 178: "this part (which is spanned)" |
- RenderText {#text} at (536,0) size 5x16 |
+ RenderText {#text} at (536,0) size 5x18 |
text run at (536,0) width 5: "." |
- LayoutTable {TABLE} at (0,400.59) size 618x262 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 616x260 |
- LayoutTableRow {TR} at (0,0) size 616x24 |
- LayoutTableCell {TD} at (0,0) size 616x24 [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,433.59) size 618x281 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 616x279 |
+ LayoutTableRow {TR} at (0,0) size 616x26 |
+ LayoutTableCell {TD} at (0,0) size 616x26 [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 616x236 |
- LayoutTableCell {TD} at (0,130) 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 616x253 |
+ LayoutTableCell {TD} at (0,139) 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 604x235.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderBlock {H3} at (4,4) size 596x19 [color=#0000FF] |
- RenderText {#text} at (0,0) size 216x19 |
+ LayoutTableCell {TD} at (12,26) size 604x252.88 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderBlock {H3} at (4,4) size 596x22 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 216x22 |
text run at (0,0) width 216: "This sentence should show " |
- RenderInline {STRONG} at (0,0) size 35x19 |
- RenderText {#text} at (215,0) size 35x19 |
+ RenderInline {STRONG} at (0,0) size 35x22 |
+ RenderText {#text} at (215,0) size 35x22 |
text run at (215,0) width 35: "blue" |
- RenderText {#text} at (249,0) size 41x19 |
+ RenderText {#text} at (249,0) size 41x22 |
text run at (249,0) width 41: " and " |
- RenderInline {EM} at (0,0) size 50x19 [color=#800080] |
- RenderText {#text} at (289,0) size 50x19 |
+ RenderInline {EM} at (0,0) size 50x22 [color=#800080] |
+ RenderText {#text} at (289,0) size 50x22 |
text run at (289,0) width 50: "purple" |
- RenderText {#text} at (338,0) size 6x19 |
+ RenderText {#text} at (338,0) size 6x22 |
text run at (338,0) width 6: "." |
- RenderBlock {H3} at (4,41.72) size 596x19 [color=#0000FF] |
- RenderText {#text} at (0,0) size 194x19 |
+ RenderBlock {H3} at (4,44.72) size 596x22 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 194x22 |
text run at (0,0) width 194: "This sentence should be " |
- RenderInline {SPAN} at (0,0) size 34x19 |
- RenderText {#text} at (193,0) size 34x19 |
+ RenderInline {SPAN} at (0,0) size 34x22 |
+ RenderText {#text} at (193,0) size 34x22 |
text run at (193,0) width 34: "blue" |
- RenderText {#text} at (226,0) size 101x19 |
+ RenderText {#text} at (226,0) size 101x22 |
text run at (226,0) width 101: " throughout." |
- RenderBlock {P} at (4,79.44) size 596x16 |
- RenderText {#text} at (0,0) size 230x16 |
+ RenderBlock {P} at (4,85.44) size 596x18 |
+ RenderText {#text} at (0,0) size 230x18 |
text run at (0,0) width 230: "This should be green except for the " |
- RenderInline {EM} at (0,0) size 119x16 [color=#800080] |
- RenderText {#text} at (229,0) size 119x16 |
+ RenderInline {EM} at (0,0) size 119x18 [color=#800080] |
+ RenderText {#text} at (229,0) size 119x18 |
text run at (229,0) width 119: "emphasized words" |
- RenderText {#text} at (347,0) size 163x16 |
+ RenderText {#text} at (347,0) size 163x18 |
text run at (347,0) width 163: ", which should be purple." |
- RenderBlock {H3} at (4,114.16) size 596x19 [color=#0000FF] |
- RenderText {#text} at (0,0) size 288x19 |
+ RenderBlock {H3} at (4,122.16) size 596x22 [color=#0000FF] |
+ RenderText {#text} at (0,0) size 288x22 |
text run at (0,0) width 288: "This should be blue and underlined." |
- RenderBlock {P} at (4,151.88) size 596x16 |
- RenderText {#text} at (0,0) size 299x16 |
+ RenderBlock {P} at (4,162.88) size 596x18 |
+ RenderText {#text} at (0,0) size 299x18 |
text run at (0,0) width 299: "This sentence should be underlined, including " |
- RenderInline {TT} at (0,0) size 71x13 |
- RenderText {#text} at (298,2) size 71x13 |
+ RenderInline {TT} at (0,0) size 71x15 |
+ RenderText {#text} at (298,2) size 71x15 |
text run at (298,2) width 71: "this part" |
- RenderText {#text} at (368,0) size 9x16 |
+ RenderText {#text} at (368,0) size 9x18 |
text run at (368,0) width 9: ", " |
- RenderInline {I} at (0,0) size 55x16 |
- RenderText {#text} at (376,0) size 55x16 |
+ RenderInline {I} at (0,0) size 55x18 |
+ RenderText {#text} at (376,0) size 55x18 |
text run at (376,0) width 55: "this part" |
- RenderText {#text} at (430,0) size 9x16 |
+ RenderText {#text} at (430,0) size 9x18 |
text run at (430,0) width 9: ", " |
- RenderInline {EM} at (0,0) size 54x16 [color=#800080] |
- RenderText {#text} at (438,0) size 54x16 |
+ RenderInline {EM} at (0,0) size 54x18 [color=#800080] |
+ RenderText {#text} at (438,0) size 54x18 |
text run at (438,0) width 54: "this part" |
- RenderText {#text} at (491,0) size 37x16 |
+ RenderText {#text} at (491,0) size 37x18 |
text run at (491,0) width 37: ", and " |
- RenderInline {STRONG} at (0,0) size 59x16 |
- RenderText {#text} at (527,0) size 59x16 |
+ RenderInline {STRONG} at (0,0) size 59x18 |
+ RenderText {#text} at (527,0) size 59x18 |
text run at (527,0) width 59: "this part" |
- RenderText {#text} at (585,0) size 5x16 |
+ RenderText {#text} at (585,0) size 5x18 |
text run at (585,0) width 5: "." |
- RenderBlock {P} at (4,183.88) size 596x16 [color=#000080] |
- RenderText {#text} at (0,0) size 444x16 |
+ RenderBlock {P} at (4,196.88) size 596x18 [color=#000080] |
+ RenderText {#text} at (0,0) size 444x18 |
text run at (0,0) width 444: "This sentence should also be underlined, as well as dark blue (navy), " |
- RenderInline {TT} at (0,0) size 149x13 |
- RenderText {#text} at (443,2) size 149x13 |
+ RenderInline {TT} at (0,0) size 149x15 |
+ RenderText {#text} at (443,2) size 149x15 |
text run at (443,2) width 149: "including this part" |
- RenderText {#text} at (591,0) size 5x16 |
+ RenderText {#text} at (591,0) size 5x18 |
text run at (591,0) width 5: "." |
- RenderBlock {P} at (4,215.88) size 596x16 [color=#800080] |
- RenderText {#text} at (0,0) size 271x16 |
+ RenderBlock {P} at (4,230.88) size 596x18 [color=#800080] |
+ RenderText {#text} at (0,0) size 271x18 |
text run at (0,0) width 271: "This sentence should be purple, including " |
- RenderInline {STRONG} at (0,0) size 59x16 |
- RenderText {#text} at (270,0) size 59x16 |
+ RenderInline {STRONG} at (0,0) size 59x18 |
+ RenderText {#text} at (270,0) size 59x18 |
text run at (270,0) width 59: "this part" |
- RenderText {#text} at (328,0) size 32x16 |
+ RenderText {#text} at (328,0) size 32x18 |
text run at (328,0) width 32: " and " |
- RenderInline {SPAN} at (0,0) size 178x16 |
- RenderText {#text} at (359,0) size 178x16 |
+ RenderInline {SPAN} at (0,0) size 178x18 |
+ RenderText {#text} at (359,0) size 178x18 |
text run at (359,0) width 178: "this part (which is spanned)" |
- RenderText {#text} at (536,0) size 5x16 |
+ RenderText {#text} at (536,0) size 5x18 |
text run at (536,0) width 5: "." |