Index: Source/core/css/CSSParser.cpp |
diff --git a/Source/core/css/CSSParser.cpp b/Source/core/css/CSSParser.cpp |
index 49cae46c98d5b25b8b5677354c065582a6ecd50b..85b391dc3a29a7b3c71c23682f03cdc4531d55c0 100644 |
--- a/Source/core/css/CSSParser.cpp |
+++ b/Source/core/css/CSSParser.cpp |
@@ -761,27 +761,27 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int |
if (valueID == CSSValueStart || valueID == CSSValueEnd || valueID == CSSValueCenter || valueID == CSSValueJustify) |
return true; |
break; |
- case CSSPropertyWebkitAlignContent: |
+ case CSSPropertyAlignContent: |
if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround || valueID == CSSValueStretch) |
return true; |
break; |
- case CSSPropertyWebkitAlignItems: |
+ case CSSPropertyAlignItems: |
if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) |
return true; |
break; |
- case CSSPropertyWebkitAlignSelf: |
+ case CSSPropertyAlignSelf: |
if (valueID == CSSValueAuto || valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueBaseline || valueID == CSSValueStretch) |
return true; |
break; |
- case CSSPropertyWebkitFlexDirection: |
+ case CSSPropertyFlexDirection: |
if (valueID == CSSValueRow || valueID == CSSValueRowReverse || valueID == CSSValueColumn || valueID == CSSValueColumnReverse) |
return true; |
break; |
- case CSSPropertyWebkitFlexWrap: |
+ case CSSPropertyFlexWrap: |
if (valueID == CSSValueNowrap || valueID == CSSValueWrap || valueID == CSSValueWrapReverse) |
return true; |
break; |
- case CSSPropertyWebkitJustifyContent: |
+ case CSSPropertyJustifyContent: |
if (valueID == CSSValueFlexStart || valueID == CSSValueFlexEnd || valueID == CSSValueCenter || valueID == CSSValueSpaceBetween || valueID == CSSValueSpaceAround) |
return true; |
break; |
@@ -984,12 +984,12 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId) |
case CSSPropertyWebkitColumnBreakBefore: |
case CSSPropertyWebkitColumnBreakInside: |
case CSSPropertyWebkitColumnRuleStyle: |
- case CSSPropertyWebkitAlignContent: |
- case CSSPropertyWebkitAlignItems: |
- case CSSPropertyWebkitAlignSelf: |
- case CSSPropertyWebkitFlexDirection: |
- case CSSPropertyWebkitFlexWrap: |
- case CSSPropertyWebkitJustifyContent: |
+ case CSSPropertyAlignContent: |
+ case CSSPropertyAlignItems: |
+ case CSSPropertyAlignSelf: |
+ case CSSPropertyFlexDirection: |
+ case CSSPropertyFlexWrap: |
+ case CSSPropertyJustifyContent: |
case CSSPropertyWebkitFontKerning: |
case CSSPropertyWebkitFontSmoothing: |
case CSSPropertyWebkitHyphens: |
@@ -2286,28 +2286,28 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
validPrimitive = true; |
break; |
- case CSSPropertyWebkitFlex: { |
+ case CSSPropertyFlex: { |
ShorthandScope scope(this, propId); |
if (id == CSSValueNone) { |
- addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); |
- addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); |
- addProperty(CSSPropertyWebkitFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important); |
+ addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); |
+ addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(0, CSSPrimitiveValue::CSS_NUMBER), important); |
+ addProperty(CSSPropertyFlexBasis, cssValuePool().createIdentifierValue(CSSValueAuto), important); |
return true; |
} |
return parseFlex(m_valueList.get(), important); |
} |
- case CSSPropertyWebkitFlexBasis: |
+ case CSSPropertyFlexBasis: |
// FIXME: Support intrinsic dimensions too. |
if (id == CSSValueAuto) |
validPrimitive = true; |
else |
validPrimitive = (!id && validUnit(value, FLength | FPercent | FNonNeg)); |
break; |
- case CSSPropertyWebkitFlexGrow: |
- case CSSPropertyWebkitFlexShrink: |
+ case CSSPropertyFlexGrow: |
+ case CSSPropertyFlexShrink: |
validPrimitive = validUnit(value, FNumber | FNonNeg); |
break; |
- case CSSPropertyWebkitOrder: |
+ case CSSPropertyOrder: |
if (validUnit(value, FInteger, CSSStrictMode)) { |
// We restrict the smallest value to int min + 2 because we use int min and int min + 1 as special values in a hash set. |
parsedValue = cssValuePool().createValue(max(static_cast<double>(std::numeric_limits<int>::min() + 2), value->fValue), |
@@ -2646,8 +2646,8 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
case CSSPropertyPadding: |
// <padding-width>{1,4} | inherit |
return parse4Values(propId, paddingShorthand().properties(), important); |
- case CSSPropertyWebkitFlexFlow: |
- return parseShorthand(propId, webkitFlexFlowShorthand(), important); |
+ case CSSPropertyFlexFlow: |
+ return parseShorthand(propId, flexFlowShorthand(), important); |
case CSSPropertyFont: |
// [ [ 'font-style' || 'font-variant' || 'font-weight' ]? 'font-size' [ / 'line-height' ]? |
// 'font-family' ] | caption | icon | menu | message-box | small-caption | status-bar | inherit |
@@ -2794,12 +2794,12 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
case CSSPropertyWebkitColumnBreakBefore: |
case CSSPropertyWebkitColumnBreakInside: |
case CSSPropertyWebkitColumnRuleStyle: |
- case CSSPropertyWebkitAlignContent: |
- case CSSPropertyWebkitAlignItems: |
- case CSSPropertyWebkitAlignSelf: |
- case CSSPropertyWebkitFlexDirection: |
- case CSSPropertyWebkitFlexWrap: |
- case CSSPropertyWebkitJustifyContent: |
+ case CSSPropertyAlignContent: |
+ case CSSPropertyAlignItems: |
+ case CSSPropertyAlignSelf: |
+ case CSSPropertyFlexDirection: |
+ case CSSPropertyFlexWrap: |
+ case CSSPropertyJustifyContent: |
case CSSPropertyWebkitFontKerning: |
case CSSPropertyWebkitFontSmoothing: |
case CSSPropertyWebkitHyphens: |
@@ -6285,9 +6285,9 @@ bool CSSParser::parseFlex(CSSParserValueList* args, bool important) |
if (!flexBasis) |
flexBasis = cssValuePool().createValue(0, CSSPrimitiveValue::CSS_PX); |
- addProperty(CSSPropertyWebkitFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important); |
- addProperty(CSSPropertyWebkitFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important); |
- addProperty(CSSPropertyWebkitFlexBasis, flexBasis, important); |
+ addProperty(CSSPropertyFlexGrow, cssValuePool().createValue(clampToFloat(flexGrow), CSSPrimitiveValue::CSS_NUMBER), important); |
+ addProperty(CSSPropertyFlexShrink, cssValuePool().createValue(clampToFloat(flexShrink), CSSPrimitiveValue::CSS_NUMBER), important); |
+ addProperty(CSSPropertyFlexBasis, flexBasis, important); |
return true; |
} |