Add CSS Transition support to registered custom properties

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc.
  * All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
@@ skipping 1097 matching lines @@
       (animatingElement && animatingElement->hasAnimations())) {
     if (!state.isAnimationInterpolationMapReady())
       calculateAnimationUpdate(state, animatingElement);
   } else if (!state.style()->transitions()) {
     return false;
   }
 
   CSSAnimations::calculateCompositorAnimationUpdate(
       state.animationUpdate(), animatingElement, *element, *state.style(),
       state.parentStyle(), wasViewportResized());
-  CSSAnimations::calculateTransitionUpdate(state.animationUpdate(),
-                                           animatingElement, *state.style());
+  CSSAnimations::calculateTransitionUpdate(
+      state.animationUpdate(), CSSAnimations::PropertyPass::Standard,
+      animatingElement, *state.style());
 
   CSSAnimations::snapshotCompositorKeyframes(
       *element, state.animationUpdate(), *state.style(), state.parentStyle());
 
   if (state.animationUpdate().isEmpty())
     return false;
 
   if (state.style()->insideLink() != EInsideLink::kNotInsideLink) {
     DCHECK(state.applyPropertyToRegularStyle());
     state.setApplyPropertyToVisitedLinkStyle(true);
@@ skipping 475 matching lines @@
     const MatchResult& matchResult,
     const Element* animatingElement) {
   CacheSuccess cacheSuccess = applyMatchedCache(state, matchResult);
   NeedsApplyPass needsApplyPass;
   if (!cacheSuccess.isFullCacheHit()) {
     applyCustomProperties(state, matchResult, ExcludeAnimations, cacheSuccess,
                           needsApplyPass);
     applyMatchedAnimationProperties(state, matchResult, cacheSuccess,
                                     needsApplyPass);
   }
-  if (state.style()->animations() ||
+  if (state.style()->animations() || state.style()->transitions() ||
       (animatingElement && animatingElement->hasAnimations())) {
     calculateAnimationUpdate(state, animatingElement);
     if (state.isAnimatingCustomProperties()) {
       cacheSuccess.setFailed();
       applyCustomProperties(state, matchResult, IncludeAnimations, cacheSuccess,
                             needsApplyPass);
     }
   }
   if (!cacheSuccess.isFullCacheHit()) {
     applyMatchedStandardProperties(state, matchResult, cacheSuccess,
@@ skipping 71 matching lines @@
   // this work.
   applyMatchedProperties<ResolveVariables, UpdateNeedsApplyPass>(
       state, matchResult.authorRules(), false, applyInheritedOnly,
       needsApplyPass);
   applyMatchedProperties<ResolveVariables, CheckNeedsApplyPass>(
       state, matchResult.authorRules(), true, applyInheritedOnly,
       needsApplyPass);
   if (applyAnimations == IncludeAnimations) {
     applyAnimatedProperties<ResolveVariables>(
         state, state.animationUpdate().activeInterpolationsForAnimations());
+    applyAnimatedProperties<ResolveVariables>(
+        state,
+        state.animationUpdate().activeInterpolationsForCustomTransitions());
   }
   // TODO(leviw): stop recalculating every time
   CSSVariableResolver::resolveVariableDefinitions(state);
 
   if (RuntimeEnabledFeatures::cssApplyAtRulesEnabled()) {
     if (cacheCustomPropertiesForApplyAtRules(state,
                                              matchResult.authorRules())) {
       applyMatchedProperties<ResolveVariables, UpdateNeedsApplyPass>(
           state, matchResult.authorRules(), false, applyInheritedOnly,
           needsApplyPass);
       applyMatchedProperties<ResolveVariables, CheckNeedsApplyPass>(
           state, matchResult.authorRules(), true, applyInheritedOnly,
           needsApplyPass);
       if (applyAnimations == IncludeAnimations) {
         applyAnimatedProperties<ResolveVariables>(
             state, state.animationUpdate().activeInterpolationsForAnimations());
+        applyAnimatedProperties<ResolveVariables>(
+            state,
+            state.animationUpdate().activeInterpolationsForCustomTransitions());
       }
       CSSVariableResolver::resolveVariableDefinitions(state);
     }
   }
 }
 
 void StyleResolver::applyMatchedAnimationProperties(
     StyleResolverState& state,
     const MatchResult& matchResult,
     const CacheSuccess& cacheSuccess,
     NeedsApplyPass& needsApplyPass) {
   DCHECK(!cacheSuccess.isFullCacheHit());
   bool applyInheritedOnly = cacheSuccess.shouldApplyInheritedOnly();
 
   applyMatchedProperties<AnimationPropertyPriority, UpdateNeedsApplyPass>(
       state, matchResult.allRules(), false, applyInheritedOnly, needsApplyPass);
   applyMatchedProperties<AnimationPropertyPriority, CheckNeedsApplyPass>(
       state, matchResult.allRules(), true, applyInheritedOnly, needsApplyPass);
 }
 
 void StyleResolver::calculateAnimationUpdate(StyleResolverState& state,
                                              const Element* animatingElement) {
-  DCHECK(state.style()->animations() ||
+  DCHECK(state.style()->animations() || state.style()->transitions() ||
          (animatingElement && animatingElement->hasAnimations()));
   DCHECK(!state.isAnimationInterpolationMapReady());
 
   CSSAnimations::calculateAnimationUpdate(
       state.animationUpdate(), animatingElement, *state.element(),
       *state.style(), state.parentStyle(), this);
+  CSSAnimations::calculateTransitionUpdate(state.animationUpdate(),
+                                           CSSAnimations::PropertyPass::Custom,
+                                           animatingElement, *state.style());
 
   state.setIsAnimationInterpolationMapReady();
 
-  if (state.isAnimatingCustomProperties())
+  if (state.isAnimatingCustomProperties()) {
     return;
+  }
+  if (!state.animationUpdate()
+           .activeInterpolationsForCustomTransitions()
+           .isEmpty()) {
+    state.setIsAnimatingCustomProperties(true);
+    return;
+  }
   for (const auto& propertyHandle :
        state.animationUpdate().activeInterpolationsForAnimations().keys()) {
     if (CSSAnimations::isCustomPropertyHandle(propertyHandle)) {
       state.setIsAnimatingCustomProperties(true);
       return;
     }
   }
 }
 
 void StyleResolver::applyMatchedStandardProperties(
@@ skipping 179 matching lines @@
 
 DEFINE_TRACE(StyleResolver) {
   visitor->trace(m_matchedPropertiesCache);
   visitor->trace(m_selectorFilter);
   visitor->trace(m_styleSharingLists);
   visitor->trace(m_document);
   visitor->trace(m_tracker);
 }
 
 }  // namespace blink