author | L. David Baron <dbaron@dbaron.org> |
Thu, 09 Sep 2010 08:21:46 -0700 | |
changeset 52284 | 1ad67ed26a45194e67cc4e1b6538343558af6f65 |
parent 52283 | 3f2ae0cc2cb894e2f3e8af95aede888d3b7713e1 |
child 52285 | 36bcecd7cd32bc1fd584d4e7bac43505f6d0c765 |
push id | 1 |
push user | root |
push date | Tue, 26 Apr 2011 22:38:44 +0000 |
treeherder | mozilla-beta@bfdb6e623a36 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bzbarsky |
bugs | 585715 |
milestone | 2.0b6pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
layout/style/nsCSSParser.cpp | file | annotate | diff | comparison | revisions | |
layout/style/test/property_database.js | file | annotate | diff | comparison | revisions |
--- a/layout/style/nsCSSParser.cpp +++ b/layout/style/nsCSSParser.cpp @@ -149,16 +149,17 @@ namespace css = mozilla::css; #define VARIANT_HCK (VARIANT_HK | VARIANT_COLOR) #define VARIANT_HUK (VARIANT_HK | VARIANT_URL) #define VARIANT_HUO (VARIANT_INHERIT | VARIANT_URL | VARIANT_NONE) #define VARIANT_AHUO (VARIANT_AUTO | VARIANT_HUO) #define VARIANT_HPN (VARIANT_INHERIT | VARIANT_PERCENT | VARIANT_NUMBER) #define VARIANT_HN (VARIANT_INHERIT | VARIANT_NUMBER) #define VARIANT_HON (VARIANT_HN | VARIANT_NONE) #define VARIANT_HOS (VARIANT_INHERIT | VARIANT_NONE | VARIANT_STRING) +#define VARIANT_LPN (VARIANT_LP | VARIANT_NUMBER) #define VARIANT_TIMING_FUNCTION (VARIANT_KEYWORD | VARIANT_CUBIC_BEZIER) #define VARIANT_UK (VARIANT_URL | VARIANT_KEYWORD) #define VARIANT_UO (VARIANT_URL | VARIANT_NONE) #define VARIANT_ANGLE_OR_ZERO (VARIANT_ANGLE | VARIANT_ZERO_ANGLE) #define VARIANT_TRANSFORM_LPCALC (VARIANT_LP | VARIANT_CALC | \ VARIANT_CALC_NO_MIN_MAX) #define VARIANT_IMAGE (VARIANT_URL | VARIANT_NONE | VARIANT_GRADIENT | \ VARIANT_IMAGE_RECT | VARIANT_ELEMENT) @@ -9029,19 +9030,17 @@ CSSParserImpl::ParseDasharray() if (ParseVariant(value, VARIANT_INHERIT | VARIANT_NONE, nsnull)) { // 'inherit', 'initial', and 'none' are only allowed on their own if (!ExpectEndProperty()) { return PR_FALSE; } } else { nsCSSValueList *cur = value.SetListValue(); for (;;) { - if (!ParseVariant(cur->mValue, - VARIANT_LENGTH | VARIANT_PERCENT | VARIANT_NUMBER, - nsnull)) { + if (!ParseNonNegativeVariant(cur->mValue, VARIANT_LPN, nsnull)) { return PR_FALSE; } if (CheckEndProperty()) { break; } // skip optional commas between elements (void)ExpectSymbol(',', PR_TRUE);
--- a/layout/style/test/property_database.js +++ b/layout/style/test/property_database.js @@ -2862,17 +2862,17 @@ var gCSSProperties = { invalid_values: [] }, "stroke-dasharray": { domProp: "strokeDasharray", inherited: true, type: CSS_TYPE_LONGHAND, initial_values: [ "none" ], other_values: [ "5px,3px,2px", "5px 3px 2px", " 5px ,3px , 2px ", "1px", "5%", "3em" ], - invalid_values: [] + invalid_values: [ "-5px,3px,2px", "5px,3px,-2px" ] }, "stroke-dashoffset": { domProp: "strokeDashoffset", inherited: true, type: CSS_TYPE_LONGHAND, initial_values: [ "0", "-0px", "0em" ], other_values: [ "3px", "3%", "1em" ], invalid_values: []