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 12345fbbe933319d680f84e2952dacaf01e52212..688d9c41f3cd3b80bd8bfbcc55a2e3978b1feb0f 100644
--- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
+++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.h
@@ -63,8 +63,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.
@@ -219,8 +219,8 @@ class CORE_EXPORT StyleResolver final
   // and isImportant is required.
   class NeedsApplyPass {
    public:
-    bool Get(CSSPropertyPriority priority, bool is_important) const {
-      return flags_[GetIndex(priority, is_important)];
+    bool Get(CSSPropertyPriority priority, bool isImportant) const {
+      return flags_[GetIndex(priority, isImportant)];
     }
     void Set(CSSPropertyPriority priority, bool is_important) {
       flags_[GetIndex(priority, is_important)] = true;
@@ -260,6 +260,8 @@ class CORE_EXPORT StyleResolver final
                                       NeedsApplyPass&);
   void CalculateAnimationUpdate(StyleResolverState&,
                                 const Element* animating_element);
+  void ApplyAnimatedCustomProperties(StyleResolverState&);
+  void ApplyAnimatedCustomProperty(StyleResolverState&, const PropertyHandle&);
   bool ApplyAnimatedStandardProperties(StyleResolverState&, const Element*);
 
   void ApplyCallbackSelectors(StyleResolverState&);
@@ -278,8 +280,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&,
@@ -294,7 +296,7 @@ class CORE_EXPORT StyleResolver final
 
   bool PseudoStyleForElementInternal(Element&,
                                      const PseudoStyleRequest&,
-                                     const ComputedStyle* parent_style,
+                                     const ComputedStyle* parentStyle,
                                      StyleResolverState&);
   bool HasAuthorBackground(const StyleResolverState&);
   bool HasAuthorBorder(const StyleResolverState&);