X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=LayoutTests%2Fcss1%2Funits%2Flength_units-expected.txt;h=f5d8fc5e6810ba1b348d7d286ba90799b41b9c51;hp=7d57ce58f5196b46bd4ffaa0a3ec067c3507c413;hb=c988541c0f55e781539acc63ec53ec1b3cd3f7b5;hpb=df8b3c1c060bc1f3955465415f1f415907b31b6d

diff --git a/LayoutTests/css1/units/length_units-expected.txt b/LayoutTests/css1/units/length_units-expected.txt
index 7d57ce5..f5d8fc5 100644
--- a/LayoutTests/css1/units/length_units-expected.txt
+++ b/LayoutTests/css1/units/length_units-expected.txt
@@ -1,185 +1,184 @@
-layer at (0,0) size 800x1657
+layer at (0,0) size 800x1592
   RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x1657
-  RenderBlock {HTML} at (0,0) size 800x1657
-    RenderBody {BODY} at (8,8) size 784x1641 [bgcolor=#CCCCCC]
-      RenderBlock {P} at (0,0) size 784x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 385x17
-          text run at (0,0) width 385: "The style declarations which apply to the text below are:"
-      RenderBlock {PRE} at (0,31) size 784x176 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 624x176
+layer at (0,0) size 800x1592
+  RenderBlock {HTML} at (0,0) size 800x1592
+    RenderBody {BODY} at (8,8) size 784x1576 [bgcolor=#CCCCCC]
+      RenderBlock {P} at (0,0) size 784x18
+        RenderText {TEXT} at (0,0) size 355x18
+          text run at (0,0) width 355: "The style declarations which apply to the text below are:"
+      RenderBlock {PRE} at (0,34) size 784x165
+        RenderText {TEXT} at (0,0) size 624x165
           text run at (0,0) width 184: ".zero {margin-left: 0;}"
-          text run at (0,16) width 160: ".one {margin-left: 3"
-          text run at (160,16) width 32: "em;}"
-          text run at (0,32) width 160: ".two {margin-left: 3"
-          text run at (160,32) width 32: "ex;}"
-          text run at (0,48) width 184: ".three {margin-left: 36"
-          text run at (184,48) width 32: "px;}"
-          text run at (0,64) width 184: ".four {margin-left: 0.5"
-          text run at (184,64) width 32: "in;}"
-          text run at (0,80) width 192: ".five {margin-left: 1.27"
-          text run at (192,80) width 32: "cm;}"
-          text run at (0,96) width 184: ".six {margin-left: 12.7"
-          text run at (184,96) width 32: "mm;}"
-          text run at (0,112) width 184: ".seven {margin-left: 36"
-          text run at (184,112) width 32: "pt;}"
-          text run at (0,128) width 176: ".eight {margin-left: 3"
-          text run at (176,128) width 32: "pc;}"
-          text run at (0,144) width 176: ".nine {margin-left: +3"
-          text run at (176,144) width 32: "pc;}"
-          text run at (0,160) width 152: ".ten {font-size: 40"
-          text run at (152,160) width 144: "px; border-left: 1"
-          text run at (296,160) width 328: "ex solid purple; background-color: aqua;}"
-      RenderBlock {HR} at (1,221) size 782x2 [bgcolor=#000000]
-      RenderBlock {P} at (0,237) size 784x34 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 784x34
-          text run at (0,0) width 784: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer)"
-          text run at (0,17) width 428: "edges should therefore be appropriately shifted to the right of "
-        RenderInline {EM} at (0,0) size 22x16
-          RenderText {TEXT} at (428,18) size 22x16
-            text run at (428,18) width 22: "this"
-        RenderText {TEXT} at (450,17) size 155x17
-          text run at (450,17) width 155: " paragraph's left edge."
-      RenderBlock {P} at (42,285) size 742x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 337x17
-          text run at (0,0) width 311: "This paragraph should have a left margin of 3"
-          text run at (311,0) width 26: "em."
-      RenderBlock {P} at (26,316) size 758x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 333x17
-          text run at (0,0) width 311: "This paragraph should have a left margin of 3"
-          text run at (311,0) width 22: "ex."
-      RenderBlock {P} at (36,347) size 748x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 370x17
-          text run at (0,0) width 370: "This paragraph should have a left margin of 36 pixels."
-      RenderBlock {P} at (48,378) size 736x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 387x17
-          text run at (0,0) width 387: "This paragraph should have a left margin of half an inch."
-      RenderBlock {P} at (48,409) size 736x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 360x17
-          text run at (0,0) width 334: "This paragraph should have a left margin of 1.27"
-          text run at (334,0) width 26: "cm."
-      RenderBlock {P} at (48,440) size 736x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 366x17
-          text run at (0,0) width 334: "This paragraph should have a left margin of 12.7"
-          text run at (334,0) width 32: "mm."
-      RenderBlock {P} at (48,471) size 736x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 372x17
-          text run at (0,0) width 372: "This paragraph should have a left margin of 36 points."
-      RenderBlock {P} at (48,502) size 736x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 355x17
-          text run at (0,0) width 355: "This paragraph should have a left margin of 3 picas."
-      RenderBlock {P} at (48,533) size 736x17 [bgcolor=#000000]
-        RenderText {TEXT} at (0,0) size 642x17
-          text run at (0,0) width 642: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)."
-      RenderBlock {P} at (0,590) size 784x288 [bgcolor=#00FFFF]
-        RenderText {TEXT} at (25,0) size 382x47
-          text run at (25,0) width 382: "This element has a "
-        RenderInline {CODE} at (0,0) size 216x46 [bgcolor=#000000]
-          RenderText {TEXT} at (407,3) size 216x46
-            text run at (407,3) width 216: "font-size"
-        RenderText {TEXT} at (623,0) size 66x47
-          text run at (623,0) width 66: " of "
-        RenderInline {CODE} at (0,0) size 96x46 [bgcolor=#000000]
-          RenderText {TEXT} at (689,3) size 96x46
-            text run at (689,3) width 48: "40"
-            text run at (737,3) width 48: "px"
-        RenderText {TEXT} at (25,49) size 122x47
-          text run at (25,49) width 122: "and a "
-        RenderInline {CODE} at (0,0) size 264x46 [bgcolor=#000000]
-          RenderText {TEXT} at (147,52) size 264x46
-            text run at (147,52) width 264: "border-left"
-        RenderText {TEXT} at (411,49) size 66x47
-          text run at (411,49) width 66: " of "
-        RenderInline {CODE} at (0,0) size 668x95 [bgcolor=#000000]
-          RenderText {TEXT} at (477,52) size 668x95
-            text run at (477,52) width 24: "1"
-            text run at (501,52) width 192: "ex solid"
-            text run at (25,101) width 144: "purple"
-        RenderText {TEXT} at (169,98) size 724x190
-          text run at (169,98) width 26: ". "
-          text run at (195,98) width 500: "This should make the left"
-          text run at (25,147) width 724: "border the same number of pixels as"
-          text run at (25,194) width 681: "the lower-case 'x' in this element's"
-          text run at (25,241) width 554: "font, as well as solid purple."
-      RenderTable {TABLE} at (0,918) size 784x723 [bgcolor=#000000]
-        RenderTableSection {TBODY} at (1,1) size 0x721
+          text run at (0,15) width 160: ".one {margin-left: 3"
+          text run at (160,15) width 32: "em;}"
+          text run at (0,30) width 160: ".two {margin-left: 3"
+          text run at (160,30) width 32: "ex;}"
+          text run at (0,45) width 184: ".three {margin-left: 36"
+          text run at (184,45) width 32: "px;}"
+          text run at (0,60) width 184: ".four {margin-left: 0.5"
+          text run at (184,60) width 32: "in;}"
+          text run at (0,75) width 192: ".five {margin-left: 1.27"
+          text run at (192,75) width 32: "cm;}"
+          text run at (0,90) width 184: ".six {margin-left: 12.7"
+          text run at (184,90) width 32: "mm;}"
+          text run at (0,105) width 184: ".seven {margin-left: 36"
+          text run at (184,105) width 32: "pt;}"
+          text run at (0,120) width 176: ".eight {margin-left: 3"
+          text run at (176,120) width 32: "pc;}"
+          text run at (0,135) width 176: ".nine {margin-left: +3"
+          text run at (176,135) width 32: "pc;}"
+          text run at (0,150) width 152: ".ten {font-size: 40"
+          text run at (152,150) width 144: "px; border-left: 1"
+          text run at (296,150) width 328: "ex solid purple; background-color: aqua;}"
+      RenderBlock {HR} at (0,212) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,230) size 784x36
+        RenderText {TEXT} at (0,0) size 761x36
+          text run at (0,0) width 761: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges"
+          text run at (0,18) width 347: "should therefore be appropriately shifted to the right of "
+        RenderInline {EM} at (0,0) size 22x18
+          RenderText {TEXT} at (347,18) size 22x18
+            text run at (347,18) width 22: "this"
+        RenderText {TEXT} at (369,18) size 138x18
+          text run at (369,18) width 138: " paragraph's left edge."
+      RenderBlock {P} at (48,282) size 736x18
+        RenderText {TEXT} at (0,0) size 310x18
+          text run at (0,0) width 287: "This paragraph should have a left margin of 3"
+          text run at (287,0) width 23: "em."
+      RenderBlock {P} at (24,316) size 760x18
+        RenderText {TEXT} at (0,0) size 306x18
+          text run at (0,0) width 287: "This paragraph should have a left margin of 3"
+          text run at (287,0) width 19: "ex."
+      RenderBlock {P} at (36,350) size 748x18
+        RenderText {TEXT} at (0,0) size 340x18
+          text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels."
+      RenderBlock {P} at (48,384) size 736x18
+        RenderText {TEXT} at (0,0) size 357x18
+          text run at (0,0) width 357: "This paragraph should have a left margin of half an inch."
+      RenderBlock {P} at (48,418) size 736x18
+        RenderText {TEXT} at (0,0) size 330x18
+          text run at (0,0) width 307: "This paragraph should have a left margin of 1.27"
+          text run at (307,0) width 23: "cm."
+      RenderBlock {P} at (48,452) size 736x18
+        RenderText {TEXT} at (0,0) size 335x18
+          text run at (0,0) width 307: "This paragraph should have a left margin of 12.7"
+          text run at (307,0) width 28: "mm."
+      RenderBlock {P} at (48,486) size 736x18
+        RenderText {TEXT} at (0,0) size 341x18
+          text run at (0,0) width 341: "This paragraph should have a left margin of 36 points."
+      RenderBlock {P} at (48,520) size 736x18
+        RenderText {TEXT} at (0,0) size 327x18
+          text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas."
+      RenderBlock {P} at (48,554) size 736x18
+        RenderText {TEXT} at (0,0) size 591x18
+          text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)."
+      RenderBlock {P} at (0,612) size 784x230 [bgcolor=#00FFFF] [border: (20px solid #800080)]
+        RenderText {TEXT} at (20,0) size 310x46
+          text run at (20,0) width 310: "This element has a "
+        RenderInline {CODE} at (0,0) size 216x46
+          RenderText {TEXT} at (330,0) size 216x46
+            text run at (330,0) width 216: "font-size"
+        RenderText {TEXT} at (546,0) size 53x46
+          text run at (546,0) width 53: " of "
+        RenderInline {CODE} at (0,0) size 96x46
+          RenderText {TEXT} at (599,0) size 96x46
+            text run at (599,0) width 48: "40"
+            text run at (647,0) width 48: "px"
+        RenderText {TEXT} at (695,0) size 743x92
+          text run at (695,0) width 68: " and"
+          text run at (20,46) width 28: "a "
+        RenderInline {CODE} at (0,0) size 264x46
+          RenderText {TEXT} at (48,46) size 264x46
+            text run at (48,46) width 264: "border-left"
+        RenderText {TEXT} at (312,46) size 53x46
+          text run at (312,46) width 53: " of "
+        RenderInline {CODE} at (0,0) size 384x46
+          RenderText {TEXT} at (365,46) size 384x46
+            text run at (365,46) width 24: "1"
+            text run at (389,46) width 360: "ex solid purple"
+        RenderText {TEXT} at (749,46) size 739x184
+          text run at (749,46) width 10: "."
+          text run at (20,92) width 673: "This should make the left border the same"
+          text run at (20,138) width 711: "number of pixels as the lower-case 'x' in this"
+          text run at (20,184) width 611: "element's font, as well as solid purple."
+      RenderTable {TABLE} at (0,882) size 784x694 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 0x692
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (0,0) size 782x25 [bgcolor=#C0C0C0] [r=0 c=0 rs=1 cs=2]
-              RenderInline {STRONG} at (0,0) size 164x17 [bgcolor=#000000]
-                RenderText {TEXT} at (4,4) size 164x17
-                  text run at (4,4) width 164: "TABLE Testing Section"
+            RenderTableCell {TD} at (0,0) size 782x26 [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"
           RenderTableRow {TR} at (0,0) size 0x0
-            RenderTableCell {TD} at (0,360) size 12x25 [bgcolor=#C0C0C0] [r=1 c=0 rs=1 cs=1]
-              RenderText {TEXT} at (4,4) size 4x17
+            RenderTableCell {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: " "
-            RenderTableCell {TD} at (12,25) size 770x696 [r=1 c=1 rs=1 cs=1]
-              RenderBlock {P} at (4,4) size 762x34
-                RenderText {TEXT} at (0,0) size 734x34
-                  text run at (0,0) width 734: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left"
-                  text run at (0,17) width 478: "(outer) edges should therefore be appropriately shifted to the right of "
-                RenderInline {EM} at (0,0) size 22x16
-                  RenderText {TEXT} at (478,18) size 22x16
-                    text run at (478,18) width 22: "this"
-                RenderText {TEXT} at (500,17) size 155x17
-                  text run at (500,17) width 155: " paragraph's left edge."
-              RenderBlock {P} at (46,52) size 720x17
-                RenderText {TEXT} at (0,0) size 337x17
-                  text run at (0,0) width 311: "This paragraph should have a left margin of 3"
-                  text run at (311,0) width 26: "em."
-              RenderBlock {P} at (30,83) size 736x17
-                RenderText {TEXT} at (0,0) size 333x17
-                  text run at (0,0) width 311: "This paragraph should have a left margin of 3"
-                  text run at (311,0) width 22: "ex."
-              RenderBlock {P} at (40,114) size 726x17
-                RenderText {TEXT} at (0,0) size 370x17
-                  text run at (0,0) width 370: "This paragraph should have a left margin of 36 pixels."
-              RenderBlock {P} at (52,145) size 714x17
-                RenderText {TEXT} at (0,0) size 387x17
-                  text run at (0,0) width 387: "This paragraph should have a left margin of half an inch."
-              RenderBlock {P} at (52,176) size 714x17
-                RenderText {TEXT} at (0,0) size 360x17
-                  text run at (0,0) width 334: "This paragraph should have a left margin of 1.27"
-                  text run at (334,0) width 26: "cm."
-              RenderBlock {P} at (52,207) size 714x17
-                RenderText {TEXT} at (0,0) size 366x17
-                  text run at (0,0) width 334: "This paragraph should have a left margin of 12.7"
-                  text run at (334,0) width 32: "mm."
-              RenderBlock {P} at (52,238) size 714x17
-                RenderText {TEXT} at (0,0) size 372x17
-                  text run at (0,0) width 372: "This paragraph should have a left margin of 36 points."
-              RenderBlock {P} at (52,269) size 714x17
-                RenderText {TEXT} at (0,0) size 355x17
-                  text run at (0,0) width 355: "This paragraph should have a left margin of 3 picas."
-              RenderBlock {P} at (52,300) size 714x17
-                RenderText {TEXT} at (0,0) size 642x17
-                  text run at (0,0) width 642: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)."
-              RenderBlock {P} at (4,357) size 762x335 [bgcolor=#00FFFF]
-                RenderText {TEXT} at (25,0) size 382x47
-                  text run at (25,0) width 382: "This element has a "
-                RenderInline {CODE} at (0,0) size 216x46 [bgcolor=#000000]
-                  RenderText {TEXT} at (407,3) size 216x46
-                    text run at (407,3) width 216: "font-size"
-                RenderText {TEXT} at (623,0) size 53x47
-                  text run at (623,0) width 53: " of"
-                RenderInline {CODE} at (0,0) size 96x46 [bgcolor=#000000]
-                  RenderText {TEXT} at (25,52) size 96x46
-                    text run at (25,52) width 96: "40px"
-                RenderText {TEXT} at (121,49) size 135x47
-                  text run at (121,49) width 135: " and a "
-                RenderInline {CODE} at (0,0) size 264x46 [bgcolor=#000000]
-                  RenderText {TEXT} at (256,52) size 264x46
-                    text run at (256,52) width 264: "border-left"
-                RenderText {TEXT} at (520,49) size 66x47
-                  text run at (520,49) width 66: " of "
-                RenderInline {CODE} at (0,0) size 633x95 [bgcolor=#000000]
-                  RenderText {TEXT} at (586,52) size 633x95
-                    text run at (586,52) width 24: "1"
-                    text run at (610,52) width 48: "ex"
-                    text run at (25,101) width 288: "solid purple"
-                RenderText {TEXT} at (313,98) size 737x237
-                  text run at (313,98) width 26: ". "
-                  text run at (339,98) width 423: "This should make the"
-                  text run at (25,147) width 616: "left border the same number of"
-                  text run at (25,194) width 667: "pixels as the lower-case 'x' in this"
-                  text run at (25,241) width 601: "element's font, as well as solid"
-                  text run at (25,288) width 139: "purple."
+            RenderTableCell {TD} at (12,26) size 770x666 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock {P} at (4,4) size 762x36
+                RenderText {TEXT} at (0,0) size 761x36
+                  text run at (0,0) width 761: "This paragraph has no left margin. The following paragraphs have all been given a left margin and their left (outer) edges"
+                  text run at (0,18) width 347: "should therefore be appropriately shifted to the right of "
+                RenderInline {EM} at (0,0) size 22x18
+                  RenderText {TEXT} at (347,18) size 22x18
+                    text run at (347,18) width 22: "this"
+                RenderText {TEXT} at (369,18) size 138x18
+                  text run at (369,18) width 138: " paragraph's left edge."
+              RenderBlock {P} at (52,56) size 714x18
+                RenderText {TEXT} at (0,0) size 310x18
+                  text run at (0,0) width 287: "This paragraph should have a left margin of 3"
+                  text run at (287,0) width 23: "em."
+              RenderBlock {P} at (28,90) size 738x18
+                RenderText {TEXT} at (0,0) size 306x18
+                  text run at (0,0) width 287: "This paragraph should have a left margin of 3"
+                  text run at (287,0) width 19: "ex."
+              RenderBlock {P} at (40,124) size 726x18
+                RenderText {TEXT} at (0,0) size 340x18
+                  text run at (0,0) width 340: "This paragraph should have a left margin of 36 pixels."
+              RenderBlock {P} at (52,158) size 714x18
+                RenderText {TEXT} at (0,0) size 357x18
+                  text run at (0,0) width 357: "This paragraph should have a left margin of half an inch."
+              RenderBlock {P} at (52,192) size 714x18
+                RenderText {TEXT} at (0,0) size 330x18
+                  text run at (0,0) width 307: "This paragraph should have a left margin of 1.27"
+                  text run at (307,0) width 23: "cm."
+              RenderBlock {P} at (52,226) size 714x18
+                RenderText {TEXT} at (0,0) size 335x18
+                  text run at (0,0) width 307: "This paragraph should have a left margin of 12.7"
+                  text run at (307,0) width 28: "mm."
+              RenderBlock {P} at (52,260) size 714x18
+                RenderText {TEXT} at (0,0) size 341x18
+                  text run at (0,0) width 341: "This paragraph should have a left margin of 36 points."
+              RenderBlock {P} at (52,294) size 714x18
+                RenderText {TEXT} at (0,0) size 327x18
+                  text run at (0,0) width 327: "This paragraph should have a left margin of 3 picas."
+              RenderBlock {P} at (52,328) size 714x18
+                RenderText {TEXT} at (0,0) size 591x18
+                  text run at (0,0) width 591: "This paragraph should have a left margin of 3 picas (the plus sign should make no difference)."
+              RenderBlock {P} at (4,386) size 762x276 [bgcolor=#00FFFF] [border: (20px solid #800080)]
+                RenderText {TEXT} at (20,0) size 310x46
+                  text run at (20,0) width 310: "This element has a "
+                RenderInline {CODE} at (0,0) size 216x46
+                  RenderText {TEXT} at (330,0) size 216x46
+                    text run at (330,0) width 216: "font-size"
+                RenderText {TEXT} at (546,0) size 53x46
+                  text run at (546,0) width 53: " of "
+                RenderInline {CODE} at (0,0) size 96x46
+                  RenderText {TEXT} at (599,0) size 96x46
+                    text run at (599,0) width 48: "40"
+                    text run at (647,0) width 48: "px"
+                RenderText {TEXT} at (20,46) size 96x46
+                  text run at (20,46) width 96: "and a "
+                RenderInline {CODE} at (0,0) size 264x46
+                  RenderText {TEXT} at (116,46) size 264x46
+                    text run at (116,46) width 264: "border-left"
+                RenderText {TEXT} at (380,46) size 53x46
+                  text run at (380,46) width 53: " of "
+                RenderInline {CODE} at (0,0) size 629x92
+                  RenderText {TEXT} at (433,46) size 629x92
+                    text run at (433,46) width 24: "1"
+                    text run at (457,46) width 192: "ex solid"
+                    text run at (20,92) width 144: "purple"
+                RenderText {TEXT} at (164,92) size 710x184
+                  text run at (164,92) width 20: ". "
+                  text run at (184,92) width 521: "This should make the left border"
+                  text run at (20,138) width 710: "the same number of pixels as the lower-case"
+                  text run at (20,184) width 642: "'x' in this element's font, as well as solid"
+                  text run at (20,230) width 112: "purple."