Index: third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp |
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp |
index a9c2c3fd23485341f1c1488774e71c557a1df671..47752a01be89c89a84a64deefdd8f9a8afbbccb0 100644 |
--- a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp |
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp |
@@ -5,6 +5,7 @@ |
#include "config.h" |
#include "core/css/parser/CSSParserImpl.h" |
+#include "core/css/CSSCustomPropertyDeclaration.h" |
#include "core/css/CSSKeyframesRule.h" |
#include "core/css/CSSStyleSheet.h" |
#include "core/css/StylePropertySet.h" |
@@ -20,6 +21,7 @@ |
#include "core/css/parser/CSSSelectorParser.h" |
#include "core/css/parser/CSSSupportsParser.h" |
#include "core/css/parser/CSSTokenizer.h" |
+#include "core/css/parser/CSSVariableParser.h" |
#include "core/css/parser/MediaQueryParser.h" |
#include "core/dom/Document.h" |
#include "core/dom/Element.h" |
@@ -56,10 +58,13 @@ static inline void filterProperties(bool important, const WillBeHeapVector<CSSPr |
const CSSProperty& property = input[i]; |
if (property.isImportant() != important) |
continue; |
- const unsigned propertyIDIndex = property.id() - firstCSSProperty; |
- if (seenProperties.get(propertyIDIndex)) |
- continue; |
- seenProperties.set(propertyIDIndex); |
+ const unsigned propertyIDIndex = property.id(); |
+ // All custom properties use the same CSSPropertyID so we can't remove repeated definitions |
+ if (property.id() != CSSPropertyVariable) { |
+ if (seenProperties.get(propertyIDIndex)) |
+ continue; |
+ seenProperties.set(propertyIDIndex); |
+ } |
output[--unusedEntries] = property; |
} |
} |
@@ -672,7 +677,8 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ |
CSSParserTokenRange rangeCopy = range; // For inspector callbacks |
ASSERT(range.peek().type() == IdentToken); |
- CSSPropertyID unresolvedProperty = range.consumeIncludingWhitespace().parseAsUnresolvedCSSPropertyID(); |
+ const CSSParserToken& token = range.consumeIncludingWhitespace(); |
+ CSSPropertyID unresolvedProperty = token.parseAsUnresolvedCSSPropertyID(); |
if (range.consume().type() != ColonToken) |
return; // Parse error |
@@ -690,6 +696,11 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ |
declarationValueEnd = last; |
} |
} |
+ if (RuntimeEnabledFeatures::cssVariablesEnabled() && unresolvedProperty == CSSPropertyInvalid && CSSVariableParser::isValidVariableName(token)) { |
+ AtomicString variableName = token.value(); |
+ consumeVariableDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEnd), variableName, important); |
+ return; |
+ } |
if (important && (ruleType == StyleRule::FontFace || ruleType == StyleRule::Keyframes)) |
return; |
@@ -710,6 +721,12 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range, StyleRule::Typ |
consumeDeclarationValue(range.makeSubRange(&range.peek(), declarationValueEnd), unresolvedProperty, important, ruleType); |
} |
+void CSSParserImpl::consumeVariableDeclarationValue(CSSParserTokenRange range, const AtomicString& variableName, bool important) |
+{ |
+ if (RefPtrWillBeRawPtr<CSSCustomPropertyDeclaration> value = CSSVariableParser::parseDeclarationValue(variableName, range)) |
+ m_parsedProperties.append(CSSProperty(CSSPropertyVariable, value.release(), important)); |
+} |
+ |
void CSSParserImpl::consumeDeclarationValue(CSSParserTokenRange range, CSSPropertyID unresolvedProperty, bool important, StyleRule::Type ruleType) |
{ |
CSSPropertyParser::parseValue(unresolvedProperty, important, range, m_context, m_parsedProperties, ruleType); |