| Index: Source/core/css/CSSGrammar.y.in
|
| diff --git a/Source/core/css/CSSGrammar.y.in b/Source/core/css/CSSGrammar.y.in
|
| index 63cacac5d92c0b9126962dfc1a6daed64bafde8e..6f375f2e6d33acd194a77e85fba727bad7d65a98 100644
|
| --- a/Source/core/css/CSSGrammar.y.in
|
| +++ b/Source/core/css/CSSGrammar.y.in
|
| @@ -1670,7 +1670,7 @@ valid_expr:
|
| if ($$) {
|
| if ($2) {
|
| CSSParserValue v;
|
| - v.id = 0;
|
| + v.id = CSSValueInvalid;
|
| v.unit = CSSParserValue::Operator;
|
| v.iValue = $2;
|
| $$->addValue(v);
|
| @@ -1701,21 +1701,21 @@ operator:
|
| term:
|
| unary_term maybe_space { $$ = $1; }
|
| | unary_operator unary_term maybe_space { $$ = $2; $$.fValue *= $1; }
|
| - | STRING maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; }
|
| + | STRING maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_STRING; }
|
| | IDENT maybe_space {
|
| $$.id = cssValueKeywordID($1);
|
| $$.unit = CSSPrimitiveValue::CSS_IDENT;
|
| $$.string = $1;
|
| }
|
| /* We might need to actually parse the number from a dimension, but we can't just put something that uses $$.string into unary_term. */
|
| - | DIMEN maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
|
| - | unary_operator DIMEN maybe_space { $$.id = 0; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
|
| - | URI maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; }
|
| - | UNICODERANGE maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
|
| - | HEX maybe_space { $$.id = 0; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
|
| - | '#' maybe_space { $$.id = 0; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
|
| + | DIMEN maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
|
| + | unary_operator DIMEN maybe_space { $$.id = CSSValueInvalid; $$.string = $2; $$.unit = CSSPrimitiveValue::CSS_DIMENSION; }
|
| + | URI maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_URI; }
|
| + | UNICODERANGE maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
|
| + | HEX maybe_space { $$.id = CSSValueInvalid; $$.string = $1; $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
|
| + | '#' maybe_space { $$.id = CSSValueInvalid; $$.string = CSSParserString(); $$.unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; } /* Handle error case: "color: #;" */
|
| | VARFUNCTION maybe_space IDENT closing_parenthesis maybe_space {
|
| - $$.id = 0;
|
| + $$.id = CSSValueInvalid;
|
| $$.string = $3;
|
| $$.unit = CSSPrimitiveValue::CSS_VARIABLE_NAME;
|
| }
|
| @@ -1730,7 +1730,7 @@ term:
|
| $$ = $1;
|
| }
|
| | '%' maybe_space { /* Handle width: %; */
|
| - $$.id = 0; $$.unit = 0;
|
| + $$.id = CSSValueInvalid; $$.unit = 0;
|
| }
|
| ;
|
|
|
| @@ -1777,7 +1777,7 @@ function:
|
| CSSParserFunction* f = parser->createFloatingFunction();
|
| f->name = $1;
|
| f->args = parser->sinkFloatingValueList($3);
|
| - $$.id = 0;
|
| + $$.id = CSSValueInvalid;
|
| $$.unit = CSSParserValue::Function;
|
| $$.function = f;
|
| } else
|
| @@ -1788,7 +1788,7 @@ function:
|
| f->name = $1;
|
| CSSParserValueList* valueList = parser->createFloatingValueList();
|
| f->args = parser->sinkFloatingValueList(valueList);
|
| - $$.id = 0;
|
| + $$.id = CSSValueInvalid;
|
| $$.unit = CSSParserValue::Function;
|
| $$.function = f;
|
| } |
|
| @@ -1800,7 +1800,7 @@ function:
|
| calc_func_term:
|
| unary_term { $$ = $1; }
|
| | VARFUNCTION maybe_space IDENT closing_parenthesis {
|
| - $$.id = 0;
|
| + $$.id = CSSValueInvalid;
|
| $$.string = $3;
|
| $$.unit = CSSPrimitiveValue::CSS_VARIABLE_NAME;
|
| }
|
| @@ -1832,7 +1832,7 @@ calc_func_paren_expr:
|
| if ($3) {
|
| $$ = $3;
|
| CSSParserValue v;
|
| - v.id = 0;
|
| + v.id = CSSValueInvalid;
|
| v.unit = CSSParserValue::Operator;
|
| v.iValue = '(';
|
| $$->insertValueAt(0, v);
|
| @@ -1860,7 +1860,7 @@ valid_calc_func_expr:
|
| if ($1 && $2) {
|
| $$ = $1;
|
| CSSParserValue v;
|
| - v.id = 0;
|
| + v.id = CSSValueInvalid;
|
| v.unit = CSSParserValue::Operator;
|
| v.iValue = $2;
|
| $$->addValue(v);
|
| @@ -1873,7 +1873,7 @@ valid_calc_func_expr:
|
| if ($1 && $2 && $3) {
|
| $$ = $1;
|
| CSSParserValue v;
|
| - v.id = 0;
|
| + v.id = CSSValueInvalid;
|
| v.unit = CSSParserValue::Operator;
|
| v.iValue = $2;
|
| $$->addValue(v);
|
| @@ -1892,7 +1892,7 @@ calc_func_expr_list:
|
| if ($1 && $4) {
|
| $$ = $1;
|
| CSSParserValue v;
|
| - v.id = 0;
|
| + v.id = CSSValueInvalid;
|
| v.unit = CSSParserValue::Operator;
|
| v.iValue = ',';
|
| $$->addValue(v);
|
| @@ -1907,7 +1907,7 @@ calc_function:
|
| CSSParserFunction* f = parser->createFloatingFunction();
|
| f->name = $1;
|
| f->args = parser->sinkFloatingValueList($3);
|
| - $$.id = 0;
|
| + $$.id = CSSValueInvalid;
|
| $$.unit = CSSParserValue::Function;
|
| $$.function = f;
|
| }
|
| @@ -1931,7 +1931,7 @@ min_or_max_function:
|
| CSSParserFunction* f = parser->createFloatingFunction();
|
| f->name = $1;
|
| f->args = parser->sinkFloatingValueList($3);
|
| - $$.id = 0;
|
| + $$.id = CSSValueInvalid;
|
| $$.unit = CSSParserValue::Function;
|
| $$.function = f;
|
| }
|
|
|