Index: LayoutTests/platform/win/css1/text_properties/vertical_align-expected.txt |
diff --git a/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.txt b/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.txt |
index 57e7656601bfb4901de9b6a163bcee24f155aeea..bee9a5e6f94e035d09cf33f7ee471be6d990348a 100644 |
--- a/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.txt |
+++ b/LayoutTests/platform/win/css1/text_properties/vertical_align-expected.txt |
@@ -1,49 +1,49 @@ |
-layer at (0,0) size 785x4425 |
+layer at (0,0) size 785x4443 |
RenderView at (0,0) size 785x600 |
-layer at (0,0) size 785x4425 |
- RenderBlock {HTML} at (0,0) size 785x4425.31 |
- RenderBody {BODY} at (8,8) size 769x4409.31 [bgcolor=#CCCCCC] |
+layer at (0,0) size 785x4443 |
+ RenderBlock {HTML} at (0,0) size 785x4443.31 |
+ RenderBody {BODY} at (8,8) size 769x4427.31 [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 769x270 |
- RenderText {#text} at (0,0) size 500x270 |
- text run at (0,0) width 157: "P {font-size: 12pt;}" |
- text run at (156,0) width 1: " " |
- text run at (0,15) width 211: ".one {vertical-align: sub;}" |
- text run at (210,15) width 1: " " |
- text run at (0,30) width 227: ".two {vertical-align: super;}" |
- text run at (226,30) width 1: " " |
- text run at (0,45) width 359: ".three {vertical-align: top; font-size: 12pt;}" |
- text run at (358,45) width 1: " " |
- text run at (0,60) width 391: ".four {vertical-align: text-top; font-size: 12pt;}" |
- text run at (390,60) width 1: " " |
- text run at (0,75) width 375: ".five {vertical-align: middle; font-size: 12pt;}" |
- text run at (374,75) width 1: " " |
- text run at (0,90) width 367: ".six {vertical-align: bottom; font-size: 12pt;}" |
- text run at (366,90) width 1: " " |
- text run at (0,105) width 422: ".seven {vertical-align: text-bottom; font-size: 12pt;}" |
- text run at (421,105) width 1: " " |
- text run at (0,120) width 398: ".eight {vertical-align: baseline; font-size: 12pt;}" |
- text run at (397,120) width 1: " " |
- text run at (0,135) width 500: ".nine {vertical-align: 50%; font-size: 12px; line-height: 16px;}" |
- text run at (499,135) width 1: " " |
- text run at (0,150) width 0: " " |
- text run at (0,165) width 219: "P.example {font-size: 14pt;}" |
- text run at (218,165) width 1: " " |
- text run at (0,180) width 172: "BIG {font-size: 16pt;}" |
- text run at (171,180) width 1: " " |
- text run at (0,195) width 188: "SMALL {font-size: 12pt;}" |
- text run at (187,195) width 1: " " |
- text run at (0,210) width 297: ".ttopalign {vertical-align: text-top;}" |
- text run at (296,210) width 1: " " |
- text run at (0,225) width 250: ".topalign {vertical-align: top;}" |
- text run at (249,225) width 1: " " |
- text run at (0,240) width 274: ".midalign {vertical-align: middle;}" |
- text run at (273,240) width 1: " " |
- text run at (0,255) width 0: " " |
- RenderBlock {HR} at (0,317) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,335) size 769x76 |
+ RenderBlock {PRE} at (0,34) size 769x288 |
+ RenderText {#text} at (0,0) size 512x288 |
+ text run at (0,0) width 160: "P {font-size: 12pt;}" |
+ text run at (160,0) width 0: " " |
+ text run at (0,16) width 216: ".one {vertical-align: sub;}" |
+ text run at (216,16) width 0: " " |
+ text run at (0,32) width 232: ".two {vertical-align: super;}" |
+ text run at (232,32) width 0: " " |
+ text run at (0,48) width 368: ".three {vertical-align: top; font-size: 12pt;}" |
+ text run at (368,48) width 0: " " |
+ text run at (0,64) width 400: ".four {vertical-align: text-top; font-size: 12pt;}" |
+ text run at (400,64) width 0: " " |
+ text run at (0,80) width 384: ".five {vertical-align: middle; font-size: 12pt;}" |
+ text run at (384,80) width 0: " " |
+ text run at (0,96) width 376: ".six {vertical-align: bottom; font-size: 12pt;}" |
+ text run at (376,96) width 0: " " |
+ text run at (0,112) width 432: ".seven {vertical-align: text-bottom; font-size: 12pt;}" |
+ text run at (432,112) width 0: " " |
+ text run at (0,128) width 408: ".eight {vertical-align: baseline; font-size: 12pt;}" |
+ text run at (408,128) width 0: " " |
+ text run at (0,144) width 512: ".nine {vertical-align: 50%; font-size: 12px; line-height: 16px;}" |
+ text run at (512,144) width 0: " " |
+ text run at (0,160) width 0: " " |
+ text run at (0,176) width 224: "P.example {font-size: 14pt;}" |
+ text run at (224,176) width 0: " " |
+ text run at (0,192) width 176: "BIG {font-size: 16pt;}" |
+ text run at (176,192) width 0: " " |
+ text run at (0,208) width 192: "SMALL {font-size: 12pt;}" |
+ text run at (192,208) width 0: " " |
+ text run at (0,224) width 304: ".ttopalign {vertical-align: text-top;}" |
+ text run at (304,224) width 0: " " |
+ text run at (0,240) width 256: ".topalign {vertical-align: top;}" |
+ text run at (256,240) width 0: " " |
+ text run at (0,256) width 280: ".midalign {vertical-align: middle;}" |
+ text run at (280,256) width 0: " " |
+ text run at (0,272) width 0: " " |
+ RenderBlock {HR} at (0,335) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,353) size 769x76 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderInline {SPAN} at (0,0) size 129x17 |
RenderText {#text} at (15,40) size 129x17 |
@@ -52,7 +52,7 @@ layer at (0,0) size 785x4425 |
text run at (143,36) width 292: " in this sentence should be subscript-aligned. " |
text run at (434,36) width 332: "The font size of the superscripted text should not be" |
text run at (0,58) width 262: "different from that of the parent element." |
- RenderBlock {P} at (0,427) size 769x72 |
+ RenderBlock {P} at (0,445) size 769x72 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderInline {SPAN} at (0,0) size 129x17 |
RenderText {#text} at (15,30) size 129x17 |
@@ -61,7 +61,7 @@ layer at (0,0) size 785x4425 |
text run at (143,36) width 304: " in this sentence should be superscript-aligned. " |
text run at (446,36) width 320: "The font size of the subscripted text should not be" |
text run at (0,54) width 262: "different from that of the parent element." |
- RenderBlock {P} at (0,515) size 769x72 |
+ RenderBlock {P} at (0,533) size 769x72 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderInline {SPAN} at (0,0) size 129x17 |
RenderText {#text} at (15,0) size 129x17 |
@@ -69,7 +69,7 @@ layer at (0,0) size 785x4425 |
RenderText {#text} at (143,36) size 729x35 |
text run at (143,36) width 586: " in this sentence should be top-aligned, which will align their tops with the top of the tallest" |
text run at (0,54) width 328: "element in the line (probably the orange rectangle)." |
- RenderBlock {P} at (0,603) size 769x132 |
+ RenderBlock {P} at (0,621) size 769x132 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderText {#text} at (15,36) size 4x17 |
text run at (15,36) width 4: " " |
@@ -83,12 +83,12 @@ layer at (0,0) size 785x4425 |
text run at (0,58) width 755: "which should align their tops with the top of the tallest text" |
text run at (0,95) width 136: "in the line." |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,751) size 769x68 |
+ RenderBlock {P} at (0,769) size 769x68 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderText {#text} at (15,15) size 755x52 |
text run at (15,15) width 740: " The image at the beginning of this sentence should be middle-aligned, which should align its middle with the point" |
text run at (0,50) width 318: "defined as the text baseline plus half the x-height." |
- RenderBlock {P} at (0,835) size 769x124 |
+ RenderBlock {P} at (0,853) size 769x124 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderText {#text} at (15,15) size 4x17 |
text run at (15,15) width 4: " " |
@@ -102,7 +102,7 @@ layer at (0,0) size 785x4425 |
text run at (0,50) width 733: "bottom-aligned, which should align their bottom with the" |
text run at (0,87) width 518: "bottom of the lowest element in the line." |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,975) size 769x161 |
+ RenderBlock {P} at (0,993) size 769x161 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderText {#text} at (15,15) size 4x17 |
text run at (15,15) width 4: " " |
@@ -117,7 +117,7 @@ layer at (0,0) size 785x4425 |
text run at (0,87) width 671: "bottom with the bottom of the lowest text (including" |
text run at (0,124) width 295: "descenders) in the line." |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,1152) size 769x132 |
+ RenderBlock {P} at (0,1170) size 769x132 |
RenderImage {IMG} at (0,0) size 15x50 |
RenderText {#text} at (15,36) size 4x17 |
text run at (15,36) width 4: " " |
@@ -131,19 +131,19 @@ layer at (0,0) size 785x4425 |
text run at (0,58) width 761: "baseline-aligned, which should align their baseline with the" |
text run at (0,95) width 523: "baseline of the rest of the text in the line." |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,1300) size 769x72 |
+ RenderBlock {P} at (0,1318) size 769x72 |
RenderImage {IMG} at (0,0) size 15x50 |
- RenderInline {SPAN} at (0,0) size 97x14 |
- RenderText {#text} at (15,31) size 97x14 |
- text run at (15,31) width 97: "The first four words" |
- RenderText {#text} at (111,36) size 764x35 |
- text run at (111,36) width 653: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," |
+ RenderInline {SPAN} at (0,0) size 98x15 |
+ RenderText {#text} at (15,30) size 98x15 |
+ text run at (15,30) width 98: "The first four words" |
+ RenderText {#text} at (113,36) size 765x35 |
+ text run at (113,36) width 652: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-aligned," |
text run at (0,54) width 385: "which should raise them 8px relative to the natural baseline." |
- RenderBlock {P} at (0,1388) size 769x36 |
+ RenderBlock {P} at (0,1406) size 769x36 |
RenderText {#text} at (0,0) size 760x35 |
text run at (0,0) width 760: "In the following paragraph, all images should be aligned with the top of the 14-point text, which is identical to the first" |
text run at (0,18) width 676: "section of text, whereas any size text should be aligned with the text baseline (which is the default value)." |
- RenderBlock {P} at (0,1442.66) size 769x323 |
+ RenderBlock {P} at (0,1460.66) size 769x323 |
RenderText {#text} at (0,26) size 118x21 |
text run at (0,26) width 118: "This paragraph " |
RenderImage {IMG} at (117.09,26) size 9x30 |
@@ -217,11 +217,11 @@ layer at (0,0) size 785x4425 |
text run at (679,233) width 6: " " |
RenderImage {IMG} at (684.41,233) size 27x90 |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,1784.31) size 769x36 |
+ RenderBlock {P} at (0,1802.31) size 769x36 |
RenderText {#text} at (0,0) size 765x35 |
text run at (0,0) width 765: "In the following paragraph, all images should be aligned with the middle of the default text, whereas any text should be" |
text run at (0,18) width 371: "aligned with the text baseline (which is the default value)." |
- RenderBlock {P} at (0,1836.31) size 769x231 |
+ RenderBlock {P} at (0,1854.31) size 769x231 |
RenderText {#text} at (0,23) size 101x17 |
text run at (0,23) width 101: "This paragraph " |
RenderImage {IMG} at (100.41,18) size 9x30 |
@@ -290,12 +290,12 @@ layer at (0,0) size 785x4425 |
text run at (464,176) width 5: " " |
RenderImage {IMG} at (468.53,141) size 27x90 |
RenderText {#text} at (0,0) size 0x0 |
- RenderBlock {P} at (0,2083.31) size 769x36 |
+ RenderBlock {P} at (0,2101.31) size 769x36 |
RenderText {#text} at (0,0) size 751x35 |
text run at (0,0) width 751: "In the following paragraph, all elements should be aligned with the top of the tallest element on the line, whether that" |
text run at (0,18) width 178: "element is an image or not. " |
text run at (177,18) width 565: "Each fragment of text has been SPANned appropriately in order to cause this to happen." |
- RenderBlock {P} at (0,2135.31) size 769x202 |
+ RenderBlock {P} at (0,2153.31) size 769x202 |
RenderInline {SPAN} at (0,0) size 97x17 |
RenderText {#text} at (0,0) size 97x17 |
text run at (0,0) width 97: "This paragraph" |
@@ -377,7 +377,7 @@ layer at (0,0) size 785x4425 |
text run at (212,112) width 5: " " |
RenderImage {IMG} at (216.02,112) size 27x90 |
RenderText {#text} at (0,0) size 0x0 |
- RenderTable {TABLE} at (0,2353.31) size 769x2056 [border: (1px outset #808080)] |
+ RenderTable {TABLE} at (0,2371.31) size 769x2056 [border: (1px outset #808080)] |
RenderTableSection {TBODY} at (1,1) size 767x2054 |
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] |
@@ -479,11 +479,11 @@ layer at (0,0) size 785x4425 |
RenderText {#text} at (0,0) size 0x0 |
RenderBlock {P} at (4,969) size 747x72 |
RenderImage {IMG} at (0,0) size 15x50 |
- RenderInline {SPAN} at (0,0) size 97x14 |
- RenderText {#text} at (15,31) size 97x14 |
- text run at (15,31) width 97: "The first four words" |
- RenderText {#text} at (111,36) size 713x35 |
- text run at (111,36) width 602: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-" |
+ RenderInline {SPAN} at (0,0) size 98x15 |
+ RenderText {#text} at (15,30) size 98x15 |
+ text run at (15,30) width 98: "The first four words" |
+ RenderText {#text} at (113,36) size 714x35 |
+ text run at (113,36) width 601: " in this sentence should have a font-size of 12px and a line-height of 16px; they are also 50%-" |
text run at (0,54) width 440: "aligned, which should raise them 8px relative to the natural baseline." |
RenderBlock {P} at (4,1057) size 747x36 |
RenderText {#text} at (0,0) size 730x35 |