WIP Support var() references in registered custom property keyframes

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

Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.h
diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
index 663c767e04b2e91a6cde97a0109981d509165a9a..8353ad6ffabe2e261c27a5c563e560353cddd6d1 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
@@ -52,6 +52,7 @@ class MatchResult;
 class RuleSet;
 class StylePropertySet;
 class StyleRuleUsageTracker;
+class CSSVariableResolver;
 
 enum StyleSharingBehavior {
   kAllowStyleSharing,
@@ -63,8 +64,8 @@ enum RuleMatchingBehavior { kMatchAllRules, kMatchAllRulesExcludingSMIL };
 const unsigned kStyleSharingListSize = 15;
 const unsigned kStyleSharingMaxDepth = 32;
 using StyleSharingList = HeapDeque<Member<Element>, kStyleSharingListSize>;
-using ActiveInterpolationsMap =
-    HashMap<PropertyHandle, Vector<RefPtr<Interpolation>, 1>>;
+using ActiveInterpolations = Vector<RefPtr<Interpolation>, 1>;
+using ActiveInterpolationsMap = HashMap<PropertyHandle, ActiveInterpolations>;
 
 // This class selects a ComputedStyle for a given element based on a collection
 // of stylesheets.
@@ -157,6 +158,10 @@ class CORE_EXPORT StyleResolver final
   void SetRuleUsageTracker(StyleRuleUsageTracker*);
   void UpdateMediaType();
 
+  static void ApplyAnimatedCustomProperty(StyleResolverState&,
+                                          CSSVariableResolver&,
+                                          const PropertyHandle&);
+
   DECLARE_TRACE();
 
  private:
@@ -260,6 +265,11 @@ class CORE_EXPORT StyleResolver final
                                       NeedsApplyPass&);
   void CalculateAnimationUpdate(StyleResolverState&,
                                 const Element* animating_element);
+  void ApplyAnimatedCustomProperties(StyleResolverState&);
+  static void ApplyAnimatedCustomProperty(StyleResolverState&,
+                                          CSSVariableResolver&,
+                                          const PropertyHandle&,
+                                          const ActiveInterpolations&);
   bool ApplyAnimatedStandardProperties(StyleResolverState&, const Element*);
 
   void ApplyCallbackSelectors(StyleResolverState&);
@@ -278,8 +288,8 @@ class CORE_EXPORT StyleResolver final
                        NeedsApplyPass&,
                        PropertyWhitelistType = kPropertyWhitelistNone);
   template <CSSPropertyPriority priority>
-  void ApplyAnimatedProperties(StyleResolverState&,
-                               const ActiveInterpolationsMap&);
+  void ApplyAnimatedStandardProperties(StyleResolverState&,
+                                       const ActiveInterpolationsMap&);
   template <CSSPropertyPriority priority>
   void ApplyAllProperty(StyleResolverState&,
                         const CSSValue&,