Implement animation tainted custom property values

third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp

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 c1bad3372fb9d780282b6e0427ad62ec59205b8a..7e93801ecd31ff8aa1410d6fcd7f0fd961428cae 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserImpl.cpp
@@ -61,10 +61,12 @@ bool CSSParserImpl::parseVariableValue(MutableStylePropertySet* declaration,
                                        const AtomicString& propertyName,
                                        const String& value,
                                        bool important,
-                                       const CSSParserContext& context) {
+                                       const CSSParserContext& context,
+                                       bool isAnimationTainted) {
   CSSParserImpl parser(context);
   CSSTokenizer::Scope scope(value);
-  parser.consumeVariableValue(scope.tokenRange(), propertyName, important);
+  parser.consumeVariableValue(scope.tokenRange(), propertyName, important,
+                              isAnimationTainted);
   if (parser.m_parsedProperties.isEmpty())
     return false;
   return declaration->addParsedProperties(parser.m_parsedProperties);
@@ -854,13 +856,15 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range,
   }
 
   size_t propertiesCount = m_parsedProperties.size();
-  // TODO(timloh): This only be for StyleRule::Style, crbug.com/641873.
+  // TODO(timloh): This should only be for StyleRule::Style/Keyframe, crbug.com/641873.
   if (unresolvedProperty == CSSPropertyVariable) {
     AtomicString variableName = token.value().toAtomicString();
+    bool isAnimationTainted = ruleType == StyleRule::Keyframe;
     consumeVariableValue(range.makeSubRange(&range.peek(), declarationValueEnd),
-                         variableName, important);
+                         variableName, important, isAnimationTainted);
   }
 
+  // TODO(timloh): Should this check occur before the call to consumeVariableValue()?
   if (important &&
       (ruleType == StyleRule::FontFace || ruleType == StyleRule::Keyframe))
     return;
@@ -886,9 +890,11 @@ void CSSParserImpl::consumeDeclaration(CSSParserTokenRange range,
 
 void CSSParserImpl::consumeVariableValue(CSSParserTokenRange range,
                                          const AtomicString& variableName,
-                                         bool important) {
+                                         bool important,
+                                         bool isAnimationTainted) {
   if (CSSCustomPropertyDeclaration* value =
-          CSSVariableParser::parseDeclarationValue(variableName, range))
+          CSSVariableParser::parseDeclarationValue(variableName, range,
+                                                   isAnimationTainted))
     m_parsedProperties.append(
         CSSProperty(CSSPropertyVariable, *value, important));
 }