Index: LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt |
diff --git a/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt b/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt |
index 91c86386bc5b779481d4c56bff771cf6900d7317..53ebefed92c0fceb4d1cb3dd5d631b6f29c59edd 100644 |
--- a/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt |
+++ b/LayoutTests/fast/shapes/parsing/parsing-shape-lengths-expected.txt |
@@ -3,76 +3,52 @@ Test that basic shapes accept different length units |
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". |
-PASS getStyleValue("shape-inside", "circle(0, 0, 0)") is "circle(0px, 0px, 0px)" |
-PASS getStyleValue("shape-inside", "circle(-1px, +1px, 1px)") is "circle(-1px, 1px, 1px)" |
-PASS getStyleValue("shape-inside", "circle(-1.5px, +1.5px, 1.5px)") is "circle(-1.5px, 1.5px, 1.5px)" |
-PASS getStyleValue("shape-inside", "circle(-.5px, +.5px, .5px)") is "circle(-0.5px, 0.5px, 0.5px)" |
-PASS getStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)" |
-PASS getStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, 1pc)" |
+PASS getStyleValue("shape-inside", "circle(0 at 0 0)") is "circle(0px at 0% 0%)" |
+PASS getStyleValue("shape-inside", "circle(1px at +1px -1px)") is "circle(1px at 1px -1px)" |
+PASS getStyleValue("shape-inside", "circle(1.5px at -1.5px +1.5px)") is "circle(1.5px at -1.5px 1.5px)" |
+PASS getStyleValue("shape-inside", "circle(.5px at -.5px +.5px)") is "circle(0.5px at -0.5px 0.5px)" |
PASS getStyleValue("shape-inside", "inset(1cm 1mm 1in 1px round 1pt 1pc)") is "inset(1cm 1mm 1in 1px round 1pt 1pc 1pt 1pc / 1pt 1pc 1pt 1pc)" |
-PASS getStyleValue("shape-inside", "inset(-1cm 1mm 1in 1px round 1pt 1pc)") is "inset(-1cm 1mm 1in 1px round 1pt 1pc 1pt 1pc / 1pt 1pc 1pt 1pc)" |
-PASS getStyleValue("shape-inside", "inset(-1cm 1mm -1in 1px round 1pt 1pc)") is "inset(-1cm 1mm -1in 1px round 1pt 1pc 1pt 1pc / 1pt 1pc 1pt 1pc)" |
-PASS getStyleValue("shape-inside", "circle(-1em, +1em, 1em)") is "circle(-1em, 1em, 1em)" |
-PASS getStyleValue("shape-inside", "circle(-1.5em, +1.5em, 1.5em)") is "circle(-1.5em, 1.5em, 1.5em)" |
-PASS getStyleValue("shape-inside", "circle(-.5em, +.5em, .5em)") is "circle(-0.5em, 0.5em, 0.5em)" |
-PASS getStyleValue("shape-inside", "circle(1ex, 1ex, 1ex)") is "circle(1ex, 1ex, 1ex)" |
-PASS getStyleValue("shape-inside", "circle(1rem, 1rem, 1rem)") is "circle(1rem, 1rem, 1rem)" |
-PASS getComputedStyleValue("shape-inside", "circle(.5em, 1em, 1.5em)") is "circle(4px, 8px, 12px)" |
-PASS getComputedStyleValue("shape-inside", "circle(.5rem, 1rem, 1.5rem)") is "circle(8px, 16px, 24px)" |
-PASS getStyleValue("shape-inside", "circle(1vw, 1vw, 1vw)") is "circle(1vw, 1vw, 1vw)" |
-PASS getStyleValue("shape-inside", "circle(1vh, 1vh, 1vh)") is "circle(1vh, 1vh, 1vh)" |
-PASS getStyleValue("shape-inside", "circle(1vmin, 1vmin, 1vmin)") is "circle(1vmin, 1vmin, 1vmin)" |
-PASS getComputedStyleValue("shape-inside", "circle(.5vw, 1vw, 1.5vw)") is "circle(4px, 8px, 12px)" |
-PASS getComputedStyleValue("shape-inside", "circle(.5vh, 1vh, 1.5vh)") is "circle(3px, 6px, 9px)" |
-PASS getComputedStyleValue("shape-inside", "circle(.5vmin, 1vmin, 1.5vmin)") is "circle(3px, 6px, 9px)" |
-PASS getStyleValue("shape-inside", "circle(100%, 100%, 100%)") is "circle(100%, 100%, 100%)" |
-PASS getStyleValue("shape-inside", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "rectangle(45%, 45%, 90%, 60%, 25%, 10%)" |
-PASS getStyleValue("shape-inside", "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)" |
+PASS getStyleValue("shape-inside", "inset(-1px 1px 1px 1px round 1px 1px 1px 1px)") is "inset(-1px 1px 1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)" |
+PASS getStyleValue("shape-inside", "inset(1px -1px 1px 1px round 1px 1px 1px 1px)") is "inset(1px -1px 1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)" |
+PASS getStyleValue("shape-inside", "inset(1px 1px -1px 1px round 1px 1px 1px 1px)") is "inset(1px 1px -1px 1px round 1px 1px 1px 1px / 1px 1px 1px 1px)" |
+PASS getStyleValue("shape-inside", "inset(1px 1px 1px -1px round 1px 1px 1px 1px)") is "inset(1px 1px 1px -1px round 1px 1px 1px 1px / 1px 1px 1px 1px)" |
+PASS getStyleValue("shape-inside", "circle(1em at -1em +1em)") is "circle(1em at -1em 1em)" |
+PASS getStyleValue("shape-inside", "circle(1.5em at -1.5em +1.5em)") is "circle(1.5em at -1.5em 1.5em)" |
+PASS getStyleValue("shape-inside", "circle(.5em at -.5em +.5em)") is "circle(0.5em at -0.5em 0.5em)" |
+PASS getStyleValue("shape-inside", "circle(1ex at 1ex 1ex)") is "circle(1ex at 1ex 1ex)" |
+PASS getStyleValue("shape-inside", "circle(1rem at 1rem 1rem)") is "circle(1rem at 1rem 1rem)" |
+PASS getComputedStyleValue("shape-inside", "circle(1.5em at .5em 1em)") is "circle(12px at 4px 8px)" |
+PASS getComputedStyleValue("shape-inside", "circle(1.5rem at .5rem 1rem)") is "circle(24px at 8px 16px)" |
+PASS getStyleValue("shape-inside", "circle(1vw at 1vw 1vw)") is "circle(1vw at 1vw 1vw)" |
+PASS getStyleValue("shape-inside", "circle(1vh at 1vh 1vh)") is "circle(1vh at 1vh 1vh)" |
+PASS getStyleValue("shape-inside", "circle(1vmin at 1vmin 1vmin)") is "circle(1vmin at 1vmin 1vmin)" |
+PASS getComputedStyleValue("shape-inside", "circle(1.5vw at .5vw 1vw)") is "circle(12px at 4px 8px)" |
+PASS getComputedStyleValue("shape-inside", "circle(1.5vh at .5vh 1vh)") is "circle(9px at 3px 6px)" |
+PASS getComputedStyleValue("shape-inside", "circle(1.5vmin at .5vmin 1vmin)") is "circle(9px at 3px 6px)" |
+PASS getStyleValue("shape-inside", "circle(100% at 100% 100%)") is "circle(100% at 100% 100%)" |
PASS getStyleValue("shape-inside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)" |
-PASS getStyleValue("shape-inside", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)" |
+PASS getStyleValue("shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)" |
PASS getStyleValue("shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)" |
-PASS getComputedStyleValue("shape-inside", "circle(50%, 100%, 150%)") is "circle(50%, 100%, 150%)" |
-PASS getComputedStyleValue("shape-inside", "rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "rectangle(45%, 45%, 90%, 60%, 25%, 10%)" |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)") is "inset-rectangle(45%, 45%, 90%, 60%, 25%, 10%)" |
+PASS getComputedStyleValue("shape-inside", "circle(150% at 50% 100%)") is "circle(150% at 50% 100%)" |
PASS getComputedStyleValue("shape-inside", "inset(45% 45% 90% 60% round 25% 10%)") is "inset(45% 45% 90% 60% round 25% 10% 25% 10% / 25% 10% 25% 10%)" |
-PASS getComputedStyleValue("shape-inside", "ellipse(100%, 100%, 100%, 100%)") is "ellipse(100%, 100%, 100%, 100%)" |
+PASS getComputedStyleValue("shape-inside", "ellipse(100% 100% at 100% 100%)") is "ellipse(100% 100% at 100% 100%)" |
PASS getComputedStyleValue("shape-inside", "polygon(10% 20%, 30% 40%, 40% 50%)") is "polygon(10% 20%, 30% 40%, 40% 50%)" |
-PASS getStyleValue("shape-inside", "circle(1px, 1px, 1)") is null |
-PASS getComputedStyleValue("shape-inside", "circle(1px, 1px, 1)") is "none" |
-PASS getStyleValue("shape-inside", "circle(1px, 1px, px)") is null |
-PASS getComputedStyleValue("shape-inside", "circle(1px, 1px, px)") is "none" |
-PASS getStyleValue("shape-inside", "circle(1px, 1px, 1p)") is null |
-PASS getComputedStyleValue("shape-inside", "circle(1px, 1px, 1p)") is "none" |
-PASS getStyleValue("shape-inside", "circle(1px, 1px, calc())") is null |
-PASS getComputedStyleValue("shape-inside", "circle(1px, 1px, calc())") is "none" |
-PASS getStyleValue("shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is null |
-PASS getComputedStyleValue("shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "none" |
-PASS getStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "none" |
-PASS getStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "none" |
+PASS getStyleValue("shape-inside", "circle(1 at 1px 1px)") is null |
+PASS getComputedStyleValue("shape-inside", "circle(1 at 1px 1px)") is "none" |
+PASS getStyleValue("shape-inside", "circle(px at 1px 1px)") is null |
+PASS getComputedStyleValue("shape-inside", "circle(px at 1px 1px)") is "none" |
+PASS getStyleValue("shape-inside", "circle(1p at 1px 1px)") is null |
+PASS getComputedStyleValue("shape-inside", "circle(1p at 1px 1px)") is "none" |
+PASS getStyleValue("shape-inside", "circle(calc( at 1px 1px))") is null |
+PASS getComputedStyleValue("shape-inside", "circle(calc( at 1px 1px))") is "none" |
+PASS getStyleValue("shape-inside", "circle(-1.5px at -1.5px +1.5px)") is null |
+PASS getComputedStyleValue("shape-inside", "circle(-1.5px at -1.5px +1.5px)") is "none" |
PASS getStyleValue("shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is null |
PASS getComputedStyleValue("shape-inside", "inset(1cm 1mm 1in 1px round 1pt -1pc)") is "none" |
-PASS getStyleValue("shape-inside", "ellipse(1em, 1em, -1em, 1em)") is null |
-PASS getComputedStyleValue("shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "none" |
-PASS getStyleValue("shape-inside", "ellipse(1em, 1em, 1em, -1em)") is null |
-PASS getComputedStyleValue("shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "none" |
-PASS getStyleValue("shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(-1cm, 1mm, 1in, 1px, 1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(1cm, -1mm, 1in, 1px, 1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "none" |
-PASS getStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null |
-PASS getComputedStyleValue("shape-inside", "inset-rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "none" |
+PASS getStyleValue("shape-inside", "ellipse(-1em 1em at 1em 1em)") is null |
+PASS getComputedStyleValue("shape-inside", "ellipse(-1em 1em at 1em 1em)") is "none" |
+PASS getStyleValue("shape-inside", "ellipse(1em -1em at 1em 1em)") is null |
+PASS getComputedStyleValue("shape-inside", "ellipse(1em -1em at 1em 1em)") is "none" |
PASS successfullyParsed is true |
TEST COMPLETE |