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

Unified Diff: Source/core/animation/css/CSSAnimationUpdate.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

« Source/core/animation/InterpolationPipelineStage.h ('K') | « Source/core/animation/StyleInterpolation.h ('k') | Source/core/animation/css/CSSAnimations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/animation/css/CSSAnimationUpdate.h

diff --git a/Source/core/animation/css/CSSAnimationUpdate.h b/Source/core/animation/css/CSSAnimationUpdate.h

index af58fce4211dd1a01214f398e778f6dc2f3873f6..c9177166e99ba66fbfd254acb177648ff806a535 100644

--- a/Source/core/animation/css/CSSAnimationUpdate.h

+++ b/Source/core/animation/css/CSSAnimationUpdate.h

@@ -6,6 +6,7 @@

#define CSSAnimationUpdate_h

#include "core/animation/Interpolation.h"

+#include "core/animation/InterpolationPipeline.h"

#include "core/css/CSSKeyframesRule.h"

#include "wtf/HashMap.h"

#include "wtf/Vector.h"

@@ -146,11 +147,11 @@ public:

const NewTransitionMap& newTransitions() const { return m_newTransitions; }

const HashSet<CSSPropertyID>& cancelledTransitions() const { return m_cancelledTransitions; }

- void adoptActiveInterpolationsForAnimations(WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& newMap) { newMap.swap(m_activeInterpolationsForAnimations); }

- void adoptActiveInterpolationsForTransitions(WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& newMap) { newMap.swap(m_activeInterpolationsForTransitions); }

- const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& activeInterpolationsForAnimations() const { return m_activeInterpolationsForAnimations; }

- const WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& activeInterpolationsForTransitions() const { return m_activeInterpolationsForTransitions; }

- WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>>& activeInterpolationsForAnimations() { return m_activeInterpolationsForAnimations; }

+ void adoptActiveInterpolationsForAnimations(InterpolationPipelineMap& newMap) { newMap.swap(m_activeInterpolationsForAnimations); }

+ void adoptActiveInterpolationsForTransitions(InterpolationPipelineMap& newMap) { newMap.swap(m_activeInterpolationsForTransitions); }

+ const InterpolationPipelineMap& activeInterpolationsForAnimations() const { return m_activeInterpolationsForAnimations; }

+ const InterpolationPipelineMap& activeInterpolationsForTransitions() const { return m_activeInterpolationsForTransitions; }

+ InterpolationPipelineMap& activeInterpolationsForAnimations() { return m_activeInterpolationsForAnimations; }

bool isEmpty() const

{

@@ -181,8 +182,8 @@ private:

NewTransitionMap m_newTransitions;

HashSet<CSSPropertyID> m_cancelledTransitions;

- WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> m_activeInterpolationsForAnimations;

- WillBeHeapHashMap<CSSPropertyID, RefPtrWillBeMember<Interpolation>> m_activeInterpolationsForTransitions;

+ InterpolationPipelineMap m_activeInterpolationsForAnimations;

+ InterpolationPipelineMap m_activeInterpolationsForTransitions;

};

} // namespace blink

« Source/core/animation/InterpolationPipelineStage.h ('K') | « Source/core/animation/StyleInterpolation.h ('k') | Source/core/animation/css/CSSAnimations.h » ('j') | no next file with comments »