Implemented additive animations for length

Source/core/animation/AnimationStack.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "core/animation/StyleInterpolation.h"
 #include "core/animation/css/CSSAnimations.h"
 #include "wtf/BitArray.h"
 #include "wtf/NonCopyingSort.h"
 #include <algorithm>
 
 namespace blink {
 
 namespace {
 
-void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<blink::Interpolation> >& source, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<blink::Interpolation> >& target)
+void copyToActiveInterpolationMap(const WillBeHeapVector<RefPtrWillBeMember<blink::Interpolation>>& source, InterpolationPipelineMap& target)
 {
     for (const auto& interpolation : source) {
-        target.set(toStyleInterpolation(interpolation.get())->id(), interpolation.get());
+        CSSPropertyID property = toStyleInterpolation(interpolation.get())->id();
+
+        if (!target.contains(property))
+            target.set(property, InterpolationPipeline());
+
+        InterpolationPipelineMap::iterator it = target.find(property);
+        InterpolationPipeline& pipeline = it->value;
+
+        // Flush pipeline for a replace -> replace interpolation
+        if (!pipeline.isEmpty() && interpolation->isReplaceOnly())

[alancutter (OOO until 2018), 2015/02/17 03:50:56]

This should be checking for cachedUnderlyingFraction == 0 to match the logic in
applyAnimatedProperties().

+            pipeline.clear();
+
+        pipeline.append(interpolation);
     }
 }
 
 bool compareEffects(const OwnPtrWillBeMember<SampledEffect>& effect1, const OwnPtrWillBeMember<SampledEffect>& effect2)
 {
     ASSERT(effect1 && effect2);
     return effect1->sequenceNumber() < effect2->sequenceNumber();
 }
 
-void copyNewAnimationsToActiveInterpolationMap(const WillBeHeapVector<RawPtrWillBeMember<InertAnimation> >& newAnimations, WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> >& result)
+void copyNewAnimationsToActiveInterpolationMap(const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>& newAnimations, InterpolationPipelineMap& result)
 {
     for (const auto& newAnimation : newAnimations) {
         OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolation>>> sample = nullptr;
         newAnimation->sample(sample);
         if (sample)
             copyToActiveInterpolationMap(*sample, result);
     }
 }
 
 } // namespace
@@ skipping 13 matching lines @@
 
 bool AnimationStack::hasActiveAnimationsOnCompositor(CSSPropertyID property) const
 {
     for (const auto& effect : m_effects) {
         if (effect->animation() && effect->animation()->hasActiveAnimationsOnCompositor(property))
             return true;
     }
     return false;
 }
 
-WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > AnimationStack::activeInterpolations(AnimationStack* animationStack, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation> >* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer> >* suppressedAnimationPlayers, Animation::Priority priority, double timelineCurrentTime)
+InterpolationPipelineMap AnimationStack::activeInterpolations(AnimationStack* animationStack, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlayers, Animation::Priority priority, double timelineCurrentTime)
 {
     // We don't exactly know when new animations will start, but timelineCurrentTime is a good estimate.
 
-    WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > result;
+    InterpolationPipelineMap result;
 
     if (animationStack) {
-        WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> >& effects = animationStack->m_effects;
+        WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>>& effects = animationStack->m_effects;
         // std::sort doesn't work with OwnPtrs
         nonCopyingSort(effects.begin(), effects.end(), compareEffects);
         animationStack->simplifyEffects();
         for (const auto& effect : effects) {
             if (effect->priority() != priority || (suppressedAnimationPlayers && effect->animation() && suppressedAnimationPlayers->contains(effect->animation()->player())))
                 continue;
             copyToActiveInterpolationMap(effect->interpolations(), result);
         }
     }
 
@@ skipping 49 matching lines @@
             FloatBox expandingBox(originalBox);
             if (!CompositorAnimations::instance()->getAnimatedBoundingBox(expandingBox, *anim->effect(), startRange, endRange))
                 return false;
             box.expandTo(expandingBox);
         }
     }
     return true;
 }
 
 } // namespace blink