Support per property CSS Animation stacks

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/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 17 matching lines @@
 
 #include "config.h"
 #include "core/css/resolver/StyleResolver.h"
 
 #include "core/CSSPropertyNames.h"
 #include "core/HTMLNames.h"
 #include "core/MediaTypeNames.h"
 #include "core/StylePropertyShorthand.h"
 #include "core/animation/AnimationTimeline.h"
 #include "core/animation/ElementAnimations.h"
+#include "core/animation/InvalidatableStyleInterpolation.h"
 #include "core/animation/KeyframeEffect.h"
 #include "core/animation/StyleInterpolation.h"
 #include "core/animation/animatable/AnimatableValue.h"
 #include "core/animation/css/CSSAnimatableValueFactory.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "core/css/CSSCalculationValue.h"
 #include "core/css/CSSDefaultStyleSheets.h"
 #include "core/css/CSSFontSelector.h"
 #include "core/css/CSSKeyframeRule.h"
 #include "core/css/CSSKeyframesRule.h"
@@ skipping 907 matching lines @@
 
     CSSAnimations::calculateUpdate(animatingElement, *element, *state.style(), state.parentStyle(), state.animationUpdate(), this);
     if (state.animationUpdate().isEmpty())
         return false;
 
     if (state.style()->insideLink() != NotInsideLink) {
         ASSERT(state.applyPropertyToRegularStyle());
         state.setApplyPropertyToVisitedLinkStyle(true);
     }
 
-    const ActiveInterpolationMap& activeInterpolationsForAnimations = state.animationUpdate().activeInterpolationsForAnimations();
-    const ActiveInterpolationMap& activeInterpolationsForTransitions = state.animationUpdate().activeInterpolationsForTransitions();
-    applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsForAnimations);
-    applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsForTransitions);
+    const ActiveInterpolationsMap& activeInterpolationsMapForAnimations = state.animationUpdate().activeInterpolationsForAnimations();
+    const ActiveInterpolationsMap& activeInterpolationsMapForTransitions = state.animationUpdate().activeInterpolationsForTransitions();
+    applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsMapForAnimations);
+    applyAnimatedProperties<HighPropertyPriority>(state, activeInterpolationsMapForTransitions);
 
     updateFont(state);
 
-    applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsForAnimations);
-    applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsForTransitions);
+    applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsMapForAnimations);
+    applyAnimatedProperties<LowPropertyPriority>(state, activeInterpolationsMapForTransitions);
 
     // Start loading resources used by animations.
     loadPendingResources(state);
 
     ASSERT(!state.fontBuilder().fontDirty());
 
     state.setApplyPropertyToVisitedLinkStyle(false);
 
     return true;
 }
@@ skipping 21 matching lines @@
         resolvers.append(scopedResolver);
 
     for (size_t i = 0; i < resolvers.size(); ++i) {
         if (StyleRuleKeyframes* keyframesRule = resolvers[i]->keyframeStylesForAnimation(animationName.impl()))
             return keyframesRule;
     }
     return nullptr;
 }
 
 template <CSSPropertyPriority priority>
-void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const HashMap<PropertyHandle, RefPtr<Interpolation>>& activeInterpolations)
+void StyleResolver::applyAnimatedProperties(StyleResolverState& state, const ActiveInterpolationsMap& activeInterpolationsMap)
 {
-    for (const auto& interpolationEntry : activeInterpolations) {
-        if (!interpolationEntry.key.isCSSProperty())
+    for (const auto& interpolationsVectorEntry : activeInterpolationsMap) {
+        if (!interpolationsVectorEntry.key.isCSSProperty())
             continue;
-        CSSPropertyID property = interpolationEntry.key.cssProperty();
+        CSSPropertyID property = interpolationsVectorEntry.key.cssProperty();
         if (!CSSPropertyPriorityData<priority>::propertyHasPriority(property))
             continue;
-        const StyleInterpolation* interpolation = toStyleInterpolation(interpolationEntry.value.get());
-        interpolation->apply(state);
+        const Interpolation& interpolation = *interpolationsVectorEntry.value.first();
+        if (interpolation.isInvalidatableStyleInterpolation()) {
+            InvalidatableStyleInterpolation::applyStack(interpolationsVectorEntry.value, state);
+        } else {
+            // TODO(alancutter): Remove this old code path once animations have completely migrated to InterpolationTypes.
+            toStyleInterpolation(interpolation).apply(state);
+        }
     }
 }
 
 static inline bool isValidCueStyleProperty(CSSPropertyID id)
 {
     switch (id) {
     case CSSPropertyBackground:
     case CSSPropertyBackgroundAttachment:
     case CSSPropertyBackgroundClip:
     case CSSPropertyBackgroundColor:
@@ skipping 504 matching lines @@
     visitor->trace(m_watchedSelectorsRules);
     visitor->trace(m_treeBoundaryCrossingScopes);
     visitor->trace(m_styleResourceLoader);
     visitor->trace(m_styleSharingLists);
     visitor->trace(m_pendingStyleSheets);
     visitor->trace(m_document);
 #endif
 }
 
 } // namespace blink