Source/core/animation/AnimationStack.h - Issue 863863004: Implemented additive animations for length

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Fixed AnimationStackTest 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

« no previous file with comments | « LayoutTests/web-animations-api/w3c/add-keyframes.html ('k') | Source/core/animation/AnimationStack.cpp » ('j') | Source/core/animation/AnimationStack.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/AnimationStack.h

diff --git a/Source/core/animation/AnimationStack.h b/Source/core/animation/AnimationStack.h

index 07009ff80576c80fdb5e235ff4758bb17bcf3813..98589cfe6eacb081a3da0433ee20696cb7516db0 100644

--- a/Source/core/animation/AnimationStack.h

+++ b/Source/core/animation/AnimationStack.h

@@ -53,7 +53,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 +61,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;

};