Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-lengths-expected.txt (123404 => 123405)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-lengths-expected.txt 2012-07-23 23:46:01 UTC (rev 123404)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-lengths-expected.txt 2012-07-23 23:56:38 UTC (rev 123405)
@@ -37,6 +37,20 @@
PASS computedStyle("-webkit-shape-inside", "circle(1px, 1px, 1p)") is "auto"
PASS innerStyle("-webkit-shape-inside", "circle(1px, 1px, calc())") is null
PASS computedStyle("-webkit-shape-inside", "circle(1px, 1px, calc())") is "auto"
+PASS innerStyle("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is null
+PASS computedStyle("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)") is "auto"
+PASS innerStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is null
+PASS computedStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)") is "auto"
+PASS innerStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is null
+PASS computedStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)") is "auto"
+PASS innerStyle("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is null
+PASS computedStyle("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)") is "auto"
+PASS innerStyle("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is null
+PASS computedStyle("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)") is "auto"
+PASS innerStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is null
+PASS computedStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)") is "auto"
+PASS innerStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is null
+PASS computedStyle("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)") is "auto"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-lengths.html (123404 => 123405)
--- trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-lengths.html 2012-07-23 23:46:01 UTC (rev 123404)
+++ trunk/LayoutTests/fast/exclusions/parsing-wrap-shape-lengths.html 2012-07-23 23:56:38 UTC (rev 123405)
@@ -88,6 +88,18 @@
negativeTest("-webkit-shape-inside", "circle(1px, 1px, px)");
negativeTest("-webkit-shape-inside", "circle(1px, 1px, 1p)");
negativeTest("-webkit-shape-inside", "circle(1px, 1px, calc())");
+
+// reject negative radiuses
+negativeTest("-webkit-shape-inside", "circle(-1.5px, +1.5px, -1.5px)");
+negativeTest("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, -1pt, 1pc)");
+negativeTest("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, 1px, 1pt, -1pc)");
+negativeTest("-webkit-shape-inside", "ellipse(1em, 1em, -1em, 1em)");
+negativeTest("-webkit-shape-inside", "ellipse(1em, 1em, 1em, -1em)");
+
+// reject negative height and width
+negativeTest("-webkit-shape-inside", "rectangle(1cm, 1mm, -1in, 1px, 1pt, 1pc)");
+negativeTest("-webkit-shape-inside", "rectangle(1cm, 1mm, 1in, -1px, 1pt, 1pc)");
+
</script>
<script src=""
</body>
Modified: trunk/Source/WebCore/css/CSSParser.cpp (123404 => 123405)
--- trunk/Source/WebCore/css/CSSParser.cpp 2012-07-23 23:46:01 UTC (rev 123404)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2012-07-23 23:56:38 UTC (rev 123405)
@@ -4469,7 +4469,12 @@
unsigned argumentNumber = 0;
CSSParserValue* argument = args->current();
while (argument) {
- if (!validUnit(argument, FLength | FPercent))
+ Units unitFlags = FLength | FPercent;
+ if (argumentNumber > 1) {
+ // Arguments width, height, rx, and ry cannot be negative.
+ unitFlags = unitFlags | FNonNeg;
+ }
+ if (!validUnit(argument, unitFlags))
return 0;
RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
@@ -4522,7 +4527,13 @@
unsigned argumentNumber = 0;
CSSParserValue* argument = args->current();
while (argument) {
- if (!validUnit(argument, FLength | FPercent))
+ Units unitFlags = FLength | FPercent;
+ if (argumentNumber == 2) {
+ // Argument radius cannot be negative.
+ unitFlags = unitFlags | FNonNeg;
+ }
+
+ if (!validUnit(argument, unitFlags))
return 0;
RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);
@@ -4565,7 +4576,12 @@
unsigned argumentNumber = 0;
CSSParserValue* argument = args->current();
while (argument) {
- if (!validUnit(argument, FLength | FPercent))
+ Units unitFlags = FLength | FPercent;
+ if (argumentNumber > 1) {
+ // Arguments radiusX and radiusY cannot be negative.
+ unitFlags = unitFlags | FNonNeg;
+ }
+ if (!validUnit(argument, unitFlags))
return 0;
RefPtr<CSSPrimitiveValue> length = createPrimitiveNumericValue(argument);