Revert of Apply custom property animation

third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp

Index: third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
diff --git a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
index cd9517c12d0bc48412c11b966ca31bb5fa148c2b..fd942c0ca814fa5a684cec29291edad7f5f70445 100644
--- a/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
+++ b/third_party/WebKit/Source/core/animation/css/CSSAnimations.cpp
@@ -231,15 +231,19 @@
   return false;
 }
 
-void CSSAnimations::calculateCompositorAndTransitionUpdate(
-    const Element* animatingElement,
-    Element& element,
-    const ComputedStyle& style,
-    ComputedStyle* parentStyle,
-    CSSAnimationUpdate& animationUpdate) {
+void CSSAnimations::calculateUpdate(const Element* animatingElement,
+                                    Element& element,
+                                    const ComputedStyle& style,
+                                    ComputedStyle* parentStyle,
+                                    CSSAnimationUpdate& animationUpdate,
+                                    StyleResolver* resolver) {
   calculateCompositorAnimationUpdate(animationUpdate, animatingElement, element,
                                      style, parentStyle);
+  calculateAnimationUpdate(animationUpdate, animatingElement, element, style,
+                           parentStyle, resolver);
+  calculateAnimationActiveInterpolations(animationUpdate, animatingElement);
   calculateTransitionUpdate(animationUpdate, animatingElement, style);
+  calculateTransitionActiveInterpolations(animationUpdate, animatingElement);
 }
 
 static const KeyframeEffectModelBase* getKeyframeEffectModelBase(
@@ -423,7 +427,6 @@
                              *cssAnimations->m_runningAnimations[i]->animation);
     }
   }
-  calculateAnimationActiveInterpolations(update, animatingElement);
 }
 
 void CSSAnimations::snapshotCompositorKeyframes(
@@ -823,7 +826,6 @@
       }
     }
   }
-  calculateTransitionActiveInterpolations(update, animatingElement);
 }
 
 void CSSAnimations::cancel() {
@@ -1092,18 +1094,6 @@
   return toShadowRoot(treeScope.rootNode()).host() == element;
 }
 
-bool CSSAnimations::isCustomPropertyHandle(const PropertyHandle& property) {
-  return property.isCSSProperty() &&
-         property.cssProperty() == CSSPropertyVariable;
-}
-
-bool CSSAnimations::isAnimatingCustomProperties(
-    const ElementAnimations* elementAnimations) {
-  return elementAnimations &&
-         elementAnimations->effectStack().affectsProperties(
-             isCustomPropertyHandle);
-}
-
 DEFINE_TRACE(CSSAnimations) {
   visitor->trace(m_transitions);
   visitor->trace(m_pendingUpdate);