Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: Source/core/animation/AnimationStack.h

Issue 863863004: Implemented additive animations for length (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: More comprehensive non-negative length layout tests Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/animation/AnimationStack.h
diff --git a/Source/core/animation/AnimationStack.h b/Source/core/animation/AnimationStack.h
index 07009ff80576c80fdb5e235ff4758bb17bcf3813..1c99c6b65bce46f909f86c9c939eaff5005641d7 100644
--- a/Source/core/animation/AnimationStack.h
+++ b/Source/core/animation/AnimationStack.h
@@ -34,6 +34,7 @@
#include "core/animation/Animation.h"
#include "core/animation/AnimationEffect.h"
#include "core/animation/AnimationPlayer.h"
+#include "core/animation/InterpolationPipeline.h"
#include "core/animation/SampledEffect.h"
#include "platform/geometry/FloatBox.h"
#include "wtf/HashSet.h"
@@ -53,7 +54,7 @@ public:
bool isEmpty() const { return m_effects.isEmpty(); }
bool affects(CSSPropertyID) const;
bool hasActiveAnimationsOnCompositor(CSSPropertyID) const;
- static WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation> > activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation> >* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer> >* suppressedAnimationPlayers, Animation::Priority, double timelineCurrentTime);
+ static InterpolationPipelineMap activeInterpolations(AnimationStack*, const WillBeHeapVector<RawPtrWillBeMember<InertAnimation>>* newAnimations, const WillBeHeapHashSet<RawPtrWillBeMember<const AnimationPlayer>>* suppressedAnimationPlayers, Animation::Priority, double timelineCurrentTime);
bool getAnimatedBoundingBox(FloatBox&, CSSPropertyID) const;
void trace(Visitor*);
@@ -61,7 +62,7 @@ public:
private:
void simplifyEffects();
// Effects sorted by priority. Lower priority at the start of the list.
- WillBeHeapVector<OwnPtrWillBeMember<SampledEffect> > m_effects;
+ WillBeHeapVector<OwnPtrWillBeMember<SampledEffect>> m_effects;
friend class AnimationAnimationStackTest;
};

Powered by Google App Engine
This is Rietveld 408576698