| Index: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| diff --git a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| index f7cd5a62aa4a02c17d56a0adf334bbd5c3ed85b9..8a622e7237ae3378e67b0346ea93ab2891ad7bb6 100644
|
| --- a/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| +++ b/third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp
|
| @@ -2054,8 +2054,8 @@ const CSSValue* CSSPropertyParser::parseSingleValue(
|
| return consumeIdent(m_range);
|
| }
|
|
|
| - // Gets the parsing function for our current property from the property API.
|
| - // If it has been implemented, we call this function, otherwise we manually
|
| + // Gets the parsing method for our current property from the property API.
|
| + // If it has been implemented, we call this method, otherwise we manually
|
| // parse this value in the switch statement below. As we implement APIs for
|
| // other properties, those properties will be taken out of the switch
|
| // statement.
|
| @@ -3524,6 +3524,16 @@ bool CSSPropertyParser::parseShorthand(CSSPropertyID unresolvedProperty,
|
| bool important) {
|
| CSSPropertyID property = resolveCSSPropertyID(unresolvedProperty);
|
|
|
| + // Gets the parsing method for our current property from the property API.
|
| + // If it has been implemented, we call this method, otherwise we manually
|
| + // parse this value in the switch statement below. As we implement APIs for
|
| + // other properties, those properties will be taken out of the switch
|
| + // statement.
|
| + const CSSPropertyDescriptor& cssPropertyDesc =
|
| + CSSPropertyDescriptor::get(property);
|
| + if (cssPropertyDesc.parseShorthand)
|
| + return cssPropertyDesc.parseShorthand(important, m_range, m_context);
|
| +
|
| switch (property) {
|
| case CSSPropertyWebkitMarginCollapse: {
|
| CSSValueID id = m_range.consumeIncludingWhitespace().id();
|
|
|