Support interpolation of animatable shorthand properties containing var()

third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/css/resolver/CSSVariableResolver.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/CSSValueKeywords.h"
 #include "core/StyleBuilderFunctions.h"
 #include "core/StylePropertyShorthand.h"
@@ skipping 135 matching lines @@
         } else if (range.peek().type() == AtKeywordToken && equalIgnoringASCIICase(range.peek().value(), "apply")
             && RuntimeEnabledFeatures::cssApplyAtRulesEnabled()) {
             resolveApplyAtRule(range, result);
         } else {
             result.append(range.consume());
         }
     }
     return success;
 }
 
+const CSSValue* CSSVariableResolver::resolveVariableReferences(const StyleResolverState& state, CSSPropertyID id, const CSSValue& value)
+{
+    ASSERT(!isShorthandProperty(id));
+
+    if (value.isPendingSubstitutionValue())
+        return resolvePendingSubstitutions(state, id, toCSSPendingSubstitutionValue(value));
+
+    if (value.isVariableReferenceValue())
+        return resolveVariableReferences(state, id, toCSSVariableReferenceValue(value));
+
+    NOTREACHED();
+    return nullptr;
+}
+
 const CSSValue* CSSVariableResolver::resolveVariableReferences(const StyleResolverState& state, CSSPropertyID id, const CSSVariableReferenceValue& value)
 {
-    ASSERT(!isShorthandProperty(id));
-
     CSSVariableResolver resolver(state);
     Vector<CSSParserToken> tokens;
     if (!resolver.resolveTokenRange(value.variableDataValue()->tokens(), tokens))
         return CSSUnsetValue::create();
     const CSSValue* result = CSSPropertyParser::parseSingleValue(id, tokens, strictCSSParserContext());
     if (!result)
         return CSSUnsetValue::create();
     return result;
 }
 
-const CSSValue* CSSVariableResolver::resolvePendingSubstitutions(StyleResolverState& state, CSSPropertyID id, const CSSPendingSubstitutionValue& pendingValue)
+const CSSValue* CSSVariableResolver::resolvePendingSubstitutions(const StyleResolverState& state, CSSPropertyID id, const CSSPendingSubstitutionValue& pendingValue)
 {
     // Longhands from shorthand references follow this path.
-    HeapHashMap<CSSPropertyID, Member<const CSSValue>>& propertyCache = state.parsedPropertiesForPendingSubstitution(pendingValue);
+    HeapHashMap<CSSPropertyID, Member<const CSSValue>>& propertyCache = state.parsedPropertiesForPendingSubstitutionCache(pendingValue);
 
     const CSSValue* value = propertyCache.get(id);
     if (!value) {
         // TODO(timloh): We shouldn't retry this for all longhands if the shorthand ends up invalid
         CSSVariableReferenceValue* shorthandValue = pendingValue.shorthandValue();
         CSSPropertyID shorthandPropertyId = pendingValue.shorthandPropertyId();
 
         CSSVariableResolver resolver(state);
 
         Vector<CSSParserToken> tokens;
@@ skipping 33 matching lines @@
 CSSVariableResolver::CSSVariableResolver(const StyleResolverState& state)
     : m_styleResolverState(state)
     , m_styleVariableData(state.style()->variables())
     , m_registry(state.document().propertyRegistry())
 {
 }
 
 DEFINE_TRACE(CSSVariableResolver) { visitor->trace(m_registry); }
 
 } // namespace blink