Index: LayoutTests/fast/shapes/parsing/parsing-test-utils.js |
diff --git a/LayoutTests/fast/shapes/parsing/parsing-test-utils.js b/LayoutTests/fast/shapes/parsing/parsing-test-utils.js |
index 6ef9cb623ba1fb4cef684f19fab8026bccdb5d08..e66918497022b2fc2da06e4dcf9e9346b7d34653 100644 |
--- a/LayoutTests/fast/shapes/parsing/parsing-test-utils.js |
+++ b/LayoutTests/fast/shapes/parsing/parsing-test-utils.js |
@@ -42,38 +42,43 @@ var validShapeValues = [ |
["inset(calc(25%*3 - 10in) 0 0 0)", "inset(calc(75% - 10in) 0px 0px)", "inset(calc(-960px + 75%) 0px 0px)"], |
["inset(10px 10px 10px 10px round calc(25%*3 - 10in))", "inset(10px round calc(75% - 10in))", "inset(10px round calc(-960px + 75%))"], |
- ["circle()", "circle(at 50% 50%)", "circle(closest-side at 50% 50%)"], |
+ ["circle()", "circle(at 50% 50%)", "circle(at 50% 50%)"], |
["circle(farthest-side)", "circle(farthest-side at 50% 50%)"], |
- ["circle(closest-side)", "circle(closest-side at 50% 50%)"], |
+ ["circle()", "circle(at 50% 50%)", "circle(at 50% 50%)"], |
+ ["circle(closest-side at 50px 50px)", "circle(at 50px 50px)", "circle(at 50px 50px)"], |
["circle(10px)", "circle(10px at 50% 50%)"], |
["circle(10px at 10px)", "circle(10px at 10px 50%)"], |
"circle(10px at 10px 10px)", |
- ["circle(at 10px)", "circle(at 10px 50%)", "circle(closest-side at 10px 50%)"], |
- ["circle(at 10px 10px)", "circle(at 10px 10px)", "circle(closest-side at 10px 10px)"], |
- ["circle(at top left)", "circle(at 0% 0%)", "circle(closest-side at 0% 0%)"], |
- ["circle(at right bottom)", "circle(at 100% 100%)", "circle(closest-side at 100% 100%)"], |
+ ["circle(at 10px)", "circle(at 10px 50%)", "circle(at 10px 50%)"], |
+ ["circle(at 10px 10px)", "circle(at 10px 10px)", "circle(at 10px 10px)"], |
+ ["circle(at top left)", "circle(at 0% 0%)", "circle(at 0% 0%)"], |
+ ["circle(at right bottom)", "circle(at 100% 100%)", "circle(at 100% 100%)"], |
["circle(10px at left top 10px)", "circle(10px at 0% 10px)"], |
["circle(10px at top 10px left 10px)", "circle(10px at 10px 10px)"], |
["circle(10px at right 10% bottom 10%)", "circle(10px at 90% 90%)"], |
["circle(10px at right 0px bottom 0px)", "circle(10px at 100% 100%)"], |
["circle(10px at right 10px bottom 10px)", "circle(10px at right 10px bottom 10px)"], |
- ["ellipse()", "ellipse(at 50% 50%)", "ellipse(closest-side closest-side at 50% 50%)"], |
- ["ellipse(10px)", "ellipse(10px at 50% 50%)", "ellipse(10px closest-side at 50% 50%)"], |
+ ["ellipse()", "ellipse(at 50% 50%)", "ellipse(at 50% 50%)"], |
+ ["ellipse(10px)", "ellipse(10px at 50% 50%)", "ellipse(10px at 50% 50%)"], |
["ellipse(10px 20px)", "ellipse(10px 20px at 50% 50%)"], |
- ["ellipse(10px at 10px)", "ellipse(10px at 10px 50%)", "ellipse(10px closest-side at 10px 50%)"], |
+ ["ellipse(10px at 10px)", "ellipse(10px at 10px 50%)", "ellipse(10px at 10px 50%)"], |
["ellipse(10px 20px at 10px)", "ellipse(10px 20px at 10px 50%)"], |
- ["ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px closest-side at 10px 10px)"], |
- ["ellipse(at 10px)", "ellipse(at 10px 50%)", "ellipse(closest-side closest-side at 10px 50%)"], |
- ["ellipse(at 10px 10px)", "ellipse(at 10px 10px)", "ellipse(closest-side closest-side at 10px 10px)"], |
- ["ellipse(at top left)", "ellipse(at 0% 0%)", "ellipse(closest-side closest-side at 0% 0%)"], |
- ["ellipse(at right bottom)", "ellipse(at 100% 100%)", "ellipse(closest-side closest-side at 100% 100%)"], |
- ["ellipse(10px at left top 10px)", "ellipse(10px at 0% 10px)", "ellipse(10px closest-side at 0% 10px)"], |
- ["ellipse(10px at top 10px left 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px closest-side at 10px 10px)"], |
- ["ellipse(10px at right 10px bottom 10px)", "ellipse(10px at right 10px bottom 10px)", "ellipse(10px closest-side at right 10px bottom 10px)"], |
+ ["ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)"], |
+ ["ellipse(at 10px)", "ellipse(at 10px 50%)", "ellipse(at 10px 50%)"], |
+ ["ellipse(at 10px 10px)", "ellipse(at 10px 10px)", "ellipse(at 10px 10px)"], |
+ ["ellipse(at top left)", "ellipse(at 0% 0%)", "ellipse(at 0% 0%)"], |
+ ["ellipse(at right bottom)", "ellipse(at 100% 100%)", "ellipse(at 100% 100%)"], |
+ ["ellipse(10px at left top 10px)", "ellipse(10px at 0% 10px)", "ellipse(10px at 0% 10px)"], |
+ ["ellipse(10px at top 10px left 10px)", "ellipse(10px at 10px 10px)", "ellipse(10px at 10px 10px)"], |
+ ["ellipse(10px at right 10px bottom 10px)", "ellipse(10px at right 10px bottom 10px)", "ellipse(10px at right 10px bottom 10px)"], |
["ellipse(10px 20px at left top 10px)", "ellipse(10px 20px at 0% 10px)"], |
["ellipse(10px 20px at top 10px left 10px)", "ellipse(10px 20px at 10px 10px)"], |
["ellipse(10px 20px at right 10px bottom 10px)", "ellipse(10px 20px at right 10px bottom 10px)"], |
+ ["ellipse(closest-side closest-side at 50px 50px)", "ellipse(at 50px 50px)", "ellipse(at 50px 50px)"], |
+ ["ellipse(farthest-side farthest-side at 50px 50px)", "ellipse(farthest-side farthest-side at 50px 50px)", "ellipse(farthest-side farthest-side at 50px 50px)"], |
+ ["ellipse(closest-side farthest-side at 50px 50px)", "ellipse(closest-side farthest-side at 50px 50px)", "ellipse(closest-side farthest-side at 50px 50px)"], |
+ ["ellipse(farthest-side closest-side at 50px 50px)", "ellipse(farthest-side at 50px 50px)", "ellipse(farthest-side at 50px 50px)"], |
["polygon(10px 20px, 30px 40px, 40px 50px)", "polygon(10px 20px, 30px 40px, 40px 50px)"], |
["polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)", "polygon(evenodd, 10px 20px, 30px 40px, 40px 50px)"], |