wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backout changeset 4e1480ab5116, changeset 576f7d52de4b, and changeset 2a030d4733a0 (bug 773102) because of test failure

Browse Source
This commit is contained in:
Ehsan Akhgari 2012-07-13 20:12:02 -04:00
parent 50635ce7be
commit dc7695ce0e
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
layout/style/nsCSSParser.cpp
View File

@ -83,8 +83,7 @@ using namespace mozilla;
#define VARIANT_ZERO_ANGLE 0x02000000 // unitless zero for angles
#define VARIANT_CALC 0x04000000 // eCSSUnit_Calc
#define VARIANT_ELEMENT 0x08000000 // eCSSUnit_Element
#define VARIANT_POSITIVE_DIMENSION 0x10000000 // Only lengths greater than 0.0
#define VARIANT_NONNEGATIVE_DIMENSION 0x20000000 // Only lengths greater than or equal to 0.0
#define VARIANT_POSITIVE_LENGTH 0x10000000 // Only lengths greater than 0.0
// Common combinations of variants
#define VARIANT_AL (VARIANT_AUTO | VARIANT_LENGTH)
@ -4476,10 +4475,8 @@ CSSParserImpl::ParseVariant(nsCSSValue& aValue,
((aVariantMask & (VARIANT_LENGTH | VARIANT_ZERO_ANGLE)) != 0 &&
eCSSToken_Number == tk->mType &&
tk->mNumber == 0.0f)) {
if (((aVariantMask & VARIANT_POSITIVE_DIMENSION) != 0 &&
tk->mNumber <= 0.0) ||
((aVariantMask & VARIANT_NONNEGATIVE_DIMENSION) != 0 &&
tk->mNumber < 0.0)) {
if ((aVariantMask & VARIANT_POSITIVE_LENGTH) != 0 &&
tk->mNumber <= 0.0) {
UngetToken();
return false;
}
@ -8059,7 +8056,7 @@ static bool GetFunctionParseInformation(nsCSSKeyword aToken,
{VARIANT_ANGLE_OR_ZERO},
{VARIANT_ANGLE_OR_ZERO, VARIANT_ANGLE_OR_ZERO},
{VARIANT_NUMBER},
{VARIANT_LENGTH|VARIANT_POSITIVE_DIMENSION},
{VARIANT_LENGTH|VARIANT_POSITIVE_LENGTH},
{VARIANT_NUMBER, VARIANT_NUMBER},
{VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER},
{VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_NUMBER, VARIANT_ANGLE_OR_ZERO},

6
layout/style/nsCSSPropList.h
View File

@ -382,7 +382,7 @@ CSS_PROP_DISPLAY(
CSS_PROPERTY_PARSE_VALUE_LIST |
CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
"",
VARIANT_TIME | VARIANT_NONNEGATIVE_DIMENSION, // used by list parsing
VARIANT_TIME, // used by list parsing
nsnull,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)
@ -2630,7 +2630,7 @@ CSS_PROP_DISPLAY(
Perspective,
CSS_PROPERTY_PARSE_VALUE,
"",
VARIANT_NONE | VARIANT_INHERIT | VARIANT_LENGTH | VARIANT_POSITIVE_DIMENSION,
VARIANT_NONE | VARIANT_INHERIT | VARIANT_LENGTH | VARIANT_POSITIVE_LENGTH,
nsnull,
offsetof(nsStyleDisplay, mChildPerspective),
eStyleAnimType_Coord)
@ -2689,7 +2689,7 @@ CSS_PROP_DISPLAY(
CSS_PROPERTY_PARSE_VALUE_LIST |
CSS_PROPERTY_VALUE_LIST_USES_COMMAS,
"",
VARIANT_TIME | VARIANT_NONNEGATIVE_DIMENSION, // used by list parsing
VARIANT_TIME, // used by list parsing
nsnull,
CSS_PROP_NO_OFFSET,
eStyleAnimType_None)

8
layout/style/test/property_database.js
View File

@ -73,8 +73,8 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "0s", "0ms" ],
other_values: [ "1s", "250ms", "1s, 250ms, 2.3s"],
invalid_values: [ "0", "0px", "-1ms", "-2s" ]
other_values: [ "1s", "250ms", "-1ms", "-2s", "1s, 250ms, 2.3s"],
invalid_values: [ "0", "0px" ]
},
"animation-fill-mode": {
domProp: "animationFillMode",
@ -3310,8 +3310,8 @@ var gCSSProperties = {
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "0s", "0ms" ],
other_values: [ "1s", "250ms", "1s, 250ms, 2.3s"],
invalid_values: [ "0", "0px", "-1ms", "-2s" ]
other_values: [ "1s", "250ms", "-1ms", "-2s", "1s, 250ms, 2.3s"],
invalid_values: [ "0", "0px" ]
},
"transition-property": {
domProp: "transitionProperty",