Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(543)

Unified Diff: Source/core/css/parser/CSSPropertyParser.cpp

Issue 1169803004: Make __qems a CSSPrimitiveValue unit type (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/css/parser/CSSPropertyParser.cpp
diff --git a/Source/core/css/parser/CSSPropertyParser.cpp b/Source/core/css/parser/CSSPropertyParser.cpp
index 10b55b207e1a9d87621a2c67b128c0698129f6b1..3d1b991ece96117034dec39f6936a347be5ca6ba 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());
@@ -8144,7 +8144,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
« Source/core/css/CSSPrimitiveValue.cpp ('K') | « Source/core/css/parser/CSSParserValues.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698