Index: LayoutTests/platform/mac/css1/units/length_units-expected.txt |
diff --git a/LayoutTests/platform/mac/css1/units/length_units-expected.txt b/LayoutTests/platform/mac/css1/units/length_units-expected.txt |
index 8765def28d0cfda1c6f23d48ee463bf5f3c7479e..c1110988a43a6c57e420af75c491ac4874e6a42c 100644 |
--- a/LayoutTests/platform/mac/css1/units/length_units-expected.txt |
+++ b/LayoutTests/platform/mac/css1/units/length_units-expected.txt |
@@ -1,172 +1,172 @@ |
-layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1456 |
+layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 1592 |
RenderView at (0,0) size 800x600 |
-layer at (0,0) size 785x1456 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
- RenderBlock {HTML} at (0,0) size 785x1456 |
- RenderBody {BODY} at (8,8) size 769x1440 [bgcolor=#CCCCCC] |
- RenderBlock {P} at (0,0) size 769x16 |
- RenderText {#text} at (0,0) size 363x16 |
+layer at (0,0) size 785x1592 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 outlineClip at (0,0) size 785x600 |
+ RenderBlock {HTML} at (0,0) size 785x1592 |
+ RenderBody {BODY} at (8,8) size 769x1576 [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 609x143 |
+ RenderBlock {PRE} at (0,34) size 769x165 |
+ RenderText {#text} at (0,0) size 609x165 |
text run at (0,0) width 180: ".zero {margin-left: 0;}" |
text run at (179,0) width 1: " " |
- text run at (0,13) width 188: ".one {margin-left: 3em;}" |
- text run at (187,13) width 1: " " |
- text run at (0,26) width 188: ".two {margin-left: 3ex;}" |
- text run at (187,26) width 1: " " |
- text run at (0,39) width 211: ".three {margin-left: 36px;}" |
- text run at (210,39) width 1: " " |
- text run at (0,52) width 211: ".four {margin-left: 0.5in;}" |
- text run at (210,52) width 1: " " |
- text run at (0,65) width 219: ".five {margin-left: 1.27cm;}" |
- text run at (218,65) width 1: " " |
- text run at (0,78) width 211: ".six {margin-left: 12.7mm;}" |
- text run at (210,78) width 1: " " |
- text run at (0,91) width 211: ".seven {margin-left: 36pt;}" |
- text run at (210,91) width 1: " " |
- text run at (0,104) width 203: ".eight {margin-left: 3pc;}" |
- text run at (202,104) width 1: " " |
- text run at (0,117) width 203: ".nine {margin-left: +3pc;}" |
- text run at (202,117) width 1: " " |
- text run at (0,130) width 609: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" |
- text run at (608,130) width 1: " " |
- RenderBlock {HR} at (0,188) size 769x2 [border: (1px inset #EEEEEE)] |
- RenderBlock {P} at (0,206) size 769x32 |
- RenderText {#text} at (0,0) size 737x32 |
+ text run at (0,15) width 188: ".one {margin-left: 3em;}" |
+ text run at (187,15) width 1: " " |
+ text run at (0,30) width 188: ".two {margin-left: 3ex;}" |
+ text run at (187,30) width 1: " " |
+ text run at (0,45) width 211: ".three {margin-left: 36px;}" |
+ text run at (210,45) width 1: " " |
+ text run at (0,60) width 211: ".four {margin-left: 0.5in;}" |
+ text run at (210,60) width 1: " " |
+ text run at (0,75) width 219: ".five {margin-left: 1.27cm;}" |
+ text run at (218,75) width 1: " " |
+ text run at (0,90) width 211: ".six {margin-left: 12.7mm;}" |
+ text run at (210,90) width 1: " " |
+ text run at (0,105) width 211: ".seven {margin-left: 36pt;}" |
+ text run at (210,105) width 1: " " |
+ text run at (0,120) width 203: ".eight {margin-left: 3pc;}" |
+ text run at (202,120) width 1: " " |
+ text run at (0,135) width 203: ".nine {margin-left: +3pc;}" |
+ text run at (202,135) width 1: " " |
+ text run at (0,150) width 609: ".ten {font-size: 40px; border-left: 1ex solid purple; background-color: aqua;}" |
+ text run at (608,150) width 1: " " |
+ RenderBlock {HR} at (0,212) size 769x2 [border: (1px inset #EEEEEE)] |
+ RenderBlock {P} at (0,230) size 769x36 |
+ RenderText {#text} at (0,0) size 737x36 |
text run at (0,0) width 737: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" |
- text run at (0,16) width 397: "edges should therefore be appropriately shifted to the right of " |
- RenderInline {EM} at (0,0) size 24x16 |
- RenderText {#text} at (396,16) size 24x16 |
- text run at (396,16) width 24: "this" |
- RenderText {#text} at (419,16) size 142x16 |
- text run at (419,16) width 142: " paragraph's left edge." |
- RenderBlock {P} at (48,254) size 721x16 |
- RenderText {#text} at (0,0) size 316x16 |
+ text run at (0,18) width 397: "edges should therefore be appropriately shifted to the right of " |
+ RenderInline {EM} at (0,0) size 24x18 |
+ RenderText {#text} at (396,18) size 24x18 |
+ text run at (396,18) width 24: "this" |
+ RenderText {#text} at (419,18) size 142x18 |
+ text run at (419,18) width 142: " paragraph's left edge." |
+ RenderBlock {P} at (48,282) size 721x18 |
+ RenderText {#text} at (0,0) size 316x18 |
text run at (0,0) width 316: "This paragraph should have a left margin of 3em." |
- RenderBlock {P} at (22.13,286) size 746.88x16 |
- RenderText {#text} at (0,0) size 312x16 |
+ RenderBlock {P} at (22.13,316) size 746.88x18 |
+ RenderText {#text} at (0,0) size 312x18 |
text run at (0,0) width 312: "This paragraph should have a left margin of 3ex." |
- RenderBlock {P} at (36,318) size 733x16 |
- RenderText {#text} at (0,0) size 347x16 |
+ RenderBlock {P} at (36,350) size 733x18 |
+ RenderText {#text} at (0,0) size 347x18 |
text run at (0,0) width 347: "This paragraph should have a left margin of 36 pixels." |
- RenderBlock {P} at (48,350) size 721x16 |
- RenderText {#text} at (0,0) size 364x16 |
+ RenderBlock {P} at (48,384) size 721x18 |
+ RenderText {#text} at (0,0) size 364x18 |
text run at (0,0) width 364: "This paragraph should have a left margin of half an inch." |
- RenderBlock {P} at (48,382) size 721x16 |
- RenderText {#text} at (0,0) size 336x16 |
+ RenderBlock {P} at (48,418) size 721x18 |
+ RenderText {#text} at (0,0) size 336x18 |
text run at (0,0) width 336: "This paragraph should have a left margin of 1.27cm." |
- RenderBlock {P} at (48,414) size 721x16 |
- RenderText {#text} at (0,0) size 342x16 |
+ RenderBlock {P} at (48,452) size 721x18 |
+ RenderText {#text} at (0,0) size 342x18 |
text run at (0,0) width 342: "This paragraph should have a left margin of 12.7mm." |
- RenderBlock {P} at (48,446) size 721x16 |
- RenderText {#text} at (0,0) size 348x16 |
+ RenderBlock {P} at (48,486) size 721x18 |
+ RenderText {#text} at (0,0) size 348x18 |
text run at (0,0) width 348: "This paragraph should have a left margin of 36 points." |
- RenderBlock {P} at (48,478) size 721x16 |
- RenderText {#text} at (0,0) size 334x16 |
+ RenderBlock {P} at (48,520) size 721x18 |
+ RenderText {#text} at (0,0) size 334x18 |
text run at (0,0) width 334: "This paragraph should have a left margin of 3 picas." |
- RenderBlock {P} at (48,510) size 721x16 |
- RenderText {#text} at (0,0) size 603x16 |
+ RenderBlock {P} at (48,554) size 721x18 |
+ RenderText {#text} at (0,0) size 603x18 |
text run at (0,0) width 603: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." |
- RenderBlock {P} at (0,566) size 769x200 [bgcolor=#00FFFF] [border: none (18px solid #800080)] |
- RenderText {#text} at (18,0) size 309x40 |
+ RenderBlock {P} at (0,612) size 769x230 [bgcolor=#00FFFF] [border: none (18px solid #800080)] |
+ RenderText {#text} at (18,0) size 309x46 |
text run at (18,0) width 309: "This element has a " |
- RenderInline {CODE} at (0,0) size 217x40 |
- RenderText {#text} at (326,0) size 217x40 |
+ RenderInline {CODE} at (0,0) size 217x46 |
+ RenderText {#text} at (326,0) size 217x46 |
text run at (326,0) width 217: "font-size" |
- RenderText {#text} at (542,0) size 55x40 |
+ RenderText {#text} at (542,0) size 55x46 |
text run at (542,0) width 55: " of " |
- RenderInline {CODE} at (0,0) size 97x40 |
- RenderText {#text} at (596,0) size 97x40 |
+ RenderInline {CODE} at (0,0) size 97x46 |
+ RenderText {#text} at (596,0) size 97x46 |
text run at (596,0) width 97: "40px" |
- RenderText {#text} at (692,0) size 742x80 |
+ RenderText {#text} at (692,0) size 742x92 |
text run at (692,0) width 68: " and" |
- text run at (18,40) width 28: "a " |
- RenderInline {CODE} at (0,0) size 265x40 |
- RenderText {#text} at (45,40) size 265x40 |
- text run at (45,40) width 265: "border-left" |
- RenderText {#text} at (309,40) size 55x40 |
- text run at (309,40) width 55: " of " |
- RenderInline {CODE} at (0,0) size 385x40 |
- RenderText {#text} at (363,40) size 385x40 |
- text run at (363,40) width 385: "1ex solid purple" |
- RenderText {#text} at (747,40) size 740x160 |
- text run at (747,40) width 11: "." |
- text run at (18,80) width 673: "This should make the left border the same" |
- text run at (18,120) width 710: "number of pixels as the lower-case 'x' in this" |
- text run at (18,160) width 610: "element's font, as well as solid purple." |
- LayoutTable {TABLE} at (0,806) size 769x634 [border: (1px outset #808080)] |
- LayoutTableSection {TBODY} at (1,1) size 767x632 |
- 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 (18,46) width 28: "a " |
+ RenderInline {CODE} at (0,0) size 265x46 |
+ RenderText {#text} at (45,46) size 265x46 |
+ text run at (45,46) width 265: "border-left" |
+ RenderText {#text} at (309,46) size 55x46 |
+ text run at (309,46) width 55: " of " |
+ RenderInline {CODE} at (0,0) size 385x46 |
+ RenderText {#text} at (363,46) size 385x46 |
+ text run at (363,46) width 385: "1ex solid purple" |
+ RenderText {#text} at (747,46) size 740x184 |
+ text run at (747,46) width 11: "." |
+ text run at (18,92) width 673: "This should make the left border the same" |
+ text run at (18,138) width 710: "number of pixels as the lower-case 'x' in this" |
+ text run at (18,184) width 610: "element's font, as well as solid purple." |
+ LayoutTable {TABLE} at (0,882) size 769x694 [border: (1px outset #808080)] |
+ LayoutTableSection {TBODY} at (1,1) size 767x692 |
+ 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 767x608 |
- LayoutTableCell {TD} at (0,316) 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 767x666 |
+ LayoutTableCell {TD} at (0,346) 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 755x608 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
- RenderBlock {P} at (4,4) size 747x32 |
- RenderText {#text} at (0,0) size 737x32 |
+ LayoutTableCell {TD} at (12,26) size 755x666 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1] |
+ RenderBlock {P} at (4,4) size 747x36 |
+ RenderText {#text} at (0,0) size 737x36 |
text run at (0,0) width 737: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)" |
- text run at (0,16) width 397: "edges should therefore be appropriately shifted to the right of " |
- RenderInline {EM} at (0,0) size 24x16 |
- RenderText {#text} at (396,16) size 24x16 |
- text run at (396,16) width 24: "this" |
- RenderText {#text} at (419,16) size 142x16 |
- text run at (419,16) width 142: " paragraph's left edge." |
- RenderBlock {P} at (52,52) size 699x16 |
- RenderText {#text} at (0,0) size 316x16 |
+ text run at (0,18) width 397: "edges should therefore be appropriately shifted to the right of " |
+ RenderInline {EM} at (0,0) size 24x18 |
+ RenderText {#text} at (396,18) size 24x18 |
+ text run at (396,18) width 24: "this" |
+ RenderText {#text} at (419,18) size 142x18 |
+ text run at (419,18) width 142: " paragraph's left edge." |
+ RenderBlock {P} at (52,56) size 699x18 |
+ RenderText {#text} at (0,0) size 316x18 |
text run at (0,0) width 316: "This paragraph should have a left margin of 3em." |
- RenderBlock {P} at (26.13,84) size 724.88x16 |
- RenderText {#text} at (0,0) size 312x16 |
+ RenderBlock {P} at (26.13,90) size 724.88x18 |
+ RenderText {#text} at (0,0) size 312x18 |
text run at (0,0) width 312: "This paragraph should have a left margin of 3ex." |
- RenderBlock {P} at (40,116) size 711x16 |
- RenderText {#text} at (0,0) size 347x16 |
+ RenderBlock {P} at (40,124) size 711x18 |
+ RenderText {#text} at (0,0) size 347x18 |
text run at (0,0) width 347: "This paragraph should have a left margin of 36 pixels." |
- RenderBlock {P} at (52,148) size 699x16 |
- RenderText {#text} at (0,0) size 364x16 |
+ RenderBlock {P} at (52,158) size 699x18 |
+ RenderText {#text} at (0,0) size 364x18 |
text run at (0,0) width 364: "This paragraph should have a left margin of half an inch." |
- RenderBlock {P} at (52,180) size 699x16 |
- RenderText {#text} at (0,0) size 336x16 |
+ RenderBlock {P} at (52,192) size 699x18 |
+ RenderText {#text} at (0,0) size 336x18 |
text run at (0,0) width 336: "This paragraph should have a left margin of 1.27cm." |
- RenderBlock {P} at (52,212) size 699x16 |
- RenderText {#text} at (0,0) size 342x16 |
+ RenderBlock {P} at (52,226) size 699x18 |
+ RenderText {#text} at (0,0) size 342x18 |
text run at (0,0) width 342: "This paragraph should have a left margin of 12.7mm." |
- RenderBlock {P} at (52,244) size 699x16 |
- RenderText {#text} at (0,0) size 348x16 |
+ RenderBlock {P} at (52,260) size 699x18 |
+ RenderText {#text} at (0,0) size 348x18 |
text run at (0,0) width 348: "This paragraph should have a left margin of 36 points." |
- RenderBlock {P} at (52,276) size 699x16 |
- RenderText {#text} at (0,0) size 334x16 |
+ RenderBlock {P} at (52,294) size 699x18 |
+ RenderText {#text} at (0,0) size 334x18 |
text run at (0,0) width 334: "This paragraph should have a left margin of 3 picas." |
- RenderBlock {P} at (52,308) size 699x16 |
- RenderText {#text} at (0,0) size 603x16 |
+ RenderBlock {P} at (52,328) size 699x18 |
+ RenderText {#text} at (0,0) size 603x18 |
text run at (0,0) width 603: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)." |
- RenderBlock {P} at (4,364) size 747x240 [bgcolor=#00FFFF] [border: none (18px solid #800080)] |
- RenderText {#text} at (18,0) size 309x40 |
+ RenderBlock {P} at (4,386) size 747x276 [bgcolor=#00FFFF] [border: none (18px solid #800080)] |
+ RenderText {#text} at (18,0) size 309x46 |
text run at (18,0) width 309: "This element has a " |
- RenderInline {CODE} at (0,0) size 217x40 |
- RenderText {#text} at (326,0) size 217x40 |
+ RenderInline {CODE} at (0,0) size 217x46 |
+ RenderText {#text} at (326,0) size 217x46 |
text run at (326,0) width 217: "font-size" |
- RenderText {#text} at (542,0) size 55x40 |
+ RenderText {#text} at (542,0) size 55x46 |
text run at (542,0) width 55: " of " |
- RenderInline {CODE} at (0,0) size 97x40 |
- RenderText {#text} at (596,0) size 97x40 |
+ RenderInline {CODE} at (0,0) size 97x46 |
+ RenderText {#text} at (596,0) size 97x46 |
text run at (596,0) width 97: "40px" |
- RenderText {#text} at (18,40) size 96x40 |
- text run at (18,40) width 96: "and a " |
- RenderInline {CODE} at (0,0) size 265x40 |
- RenderText {#text} at (113,40) size 265x40 |
- text run at (113,40) width 265: "border-left" |
- RenderText {#text} at (377,40) size 54x40 |
- text run at (377,40) width 54: " of " |
- RenderInline {CODE} at (0,0) size 629x80 |
- RenderText {#text} at (430,40) size 629x80 |
- text run at (430,40) width 217: "1ex solid" |
- text run at (18,80) width 145: "purple" |
- RenderText {#text} at (162,80) size 708x160 |
- text run at (162,80) width 21: ". " |
- text run at (182,80) width 521: "This should make the left border" |
- text run at (18,120) width 708: "the same number of pixels as the lower-case" |
- text run at (18,160) width 641: "'x' in this element's font, as well as solid" |
- text run at (18,200) width 113: "purple." |
+ RenderText {#text} at (18,46) size 96x46 |
+ text run at (18,46) width 96: "and a " |
+ RenderInline {CODE} at (0,0) size 265x46 |
+ RenderText {#text} at (113,46) size 265x46 |
+ text run at (113,46) width 265: "border-left" |
+ RenderText {#text} at (377,46) size 54x46 |
+ text run at (377,46) width 54: " of " |
+ RenderInline {CODE} at (0,0) size 629x92 |
+ RenderText {#text} at (430,46) size 629x92 |
+ text run at (430,46) width 217: "1ex solid" |
+ text run at (18,92) width 145: "purple" |
+ RenderText {#text} at (162,92) size 708x184 |
+ text run at (162,92) width 21: ". " |
+ text run at (182,92) width 521: "This should make the left border" |
+ text run at (18,138) width 708: "the same number of pixels as the lower-case" |
+ text run at (18,184) width 641: "'x' in this element's font, as well as solid" |
+ text run at (18,230) width 113: "purple." |