| Index: Source/core/css/parser/CSSPropertyParser.cpp
|
| diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
|
| index cff57228075f10f03eacfd1a293a91d282d2b6c5..8e76d120235b8f6a8a2a59c798961267650224a4 100644
|
| --- a/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -255,7 +255,7 @@ bool CSSPropertyParser::validUnit(CSSParserValue* value, Units unitflags, CSSPar
|
| return false;
|
| case CSSPrimitiveValue::CSS_PERCENTAGE:
|
| return unitflags & FPercent;
|
| - case CSSParserValue::Q_EMS:
|
| + case CSSPrimitiveValue::CSS_QEM:
|
| if (cssParserMode != UASheetMode)
|
| return false;
|
| /* fallthrough intentional */
|
| @@ -391,7 +391,7 @@ inline PassRefPtrWillBeRawPtr<CSSPrimitiveValue> CSSPropertyParser::parseValidPr
|
| return createPrimitiveNumericValue(value);
|
| if (value->unit >= CSSPrimitiveValue::CSS_DPPX && value->unit <= CSSPrimitiveValue::CSS_DPCM)
|
| return createPrimitiveNumericValue(value);
|
| - if (value->unit >= CSSParserValue::Q_EMS)
|
| + if (value->unit == CSSPrimitiveValue::CSS_QEM)
|
| return CSSPrimitiveValue::createAllowingMarginQuirk(value->fValue, CSSPrimitiveValue::CSS_EMS);
|
| if (isCalculation(value))
|
| return CSSPrimitiveValue::create(m_parsedCalculation.release());
|
| @@ -8143,7 +8143,7 @@ bool CSSPropertyParser::parseSVGValue(CSSPropertyID propId, bool important)
|
| parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitType) value->unit);
|
| else if (value->unit == CSSPrimitiveValue::CSS_REMS || value->unit == CSSPrimitiveValue::CSS_CHS)
|
| parsedValue = CSSPrimitiveValue::create(value->fValue, (CSSPrimitiveValue::UnitType)value->unit);
|
| - else if (value->unit >= CSSParserValue::Q_EMS)
|
| + else if (value->unit == CSSPrimitiveValue::CSS_QEM)
|
| parsedValue = CSSPrimitiveValue::createAllowingMarginQuirk(value->fValue, CSSPrimitiveValue::CSS_EMS);
|
| if (isCalculation(value)) {
|
| // FIXME calc() http://webkit.org/b/16662 : actually create a CSSPrimitiveValue here, ie
|
|
|