Support interpolation of animatable shorthand properties containing var()

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

Index: third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
diff --git a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
index 9ec7c4aebe248ee32bd35024a46e9996c02e2dbf..ad83c7362f09b9291fe8ac686ac30f0ce4555797 100644
--- a/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/CSSVariableResolver.h
@@ -25,16 +25,18 @@ class CSSVariableResolver {
     STACK_ALLOCATED();
 public:
     static void resolveVariableDefinitions(const StyleResolverState&);
-    static const CSSValue* resolvePendingSubstitutions(StyleResolverState&, CSSPropertyID, const CSSPendingSubstitutionValue&);
 
     // Shorthand properties are not supported.
-    static const CSSValue* resolveVariableReferences(const StyleResolverState&, CSSPropertyID, const CSSVariableReferenceValue&);
+    static const CSSValue* resolveVariableReferences(const StyleResolverState&, CSSPropertyID, const CSSValue&);
 
     DECLARE_TRACE();
 
 private:
     CSSVariableResolver(const StyleResolverState&);
 
+    static const CSSValue* resolvePendingSubstitutions(const StyleResolverState&, CSSPropertyID, const CSSPendingSubstitutionValue&);
+    static const CSSValue* resolveVariableReferences(const StyleResolverState&, CSSPropertyID, const CSSVariableReferenceValue&);
+
     // These return false if we encounter a reference to an invalid variable with no fallback
 
     // Resolves a range which may contain var() references or @apply rules