| Index: Source/core/animation/css/CSSAnimations.h
|
| diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h
|
| index 93a8abfb1ad33de1876d2d9212ec3ce88fe568b5..6b4b6216d4f59c84771ccd3cbbab647e226cecf9 100644
|
| --- a/Source/core/animation/css/CSSAnimations.h
|
| +++ b/Source/core/animation/css/CSSAnimations.h
|
| @@ -37,6 +37,7 @@
|
| #include "core/animation/css/CSSAnimationUpdate.h"
|
| #include "core/css/CSSKeyframesRule.h"
|
| #include "core/css/StylePropertySet.h"
|
| +#include "core/css/resolver/StyleResolverState.h"
|
| #include "core/dom/Document.h"
|
| #include "core/dom/Element.h"
|
| #include "wtf/HashMap.h"
|
| @@ -60,11 +61,19 @@ public:
|
|
|
| static const StylePropertyShorthand& propertiesForTransitionAll();
|
| static bool isAnimatableProperty(CSSPropertyID);
|
| - static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*);
|
| -
|
| - void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m_pendingUpdate = update; }
|
| + static void calculateUpdate(const Element* animatingElement, Element&, StyleResolverState&, StyleResolver*);
|
| +
|
| + void setPendingUpdate(const CSSAnimationUpdate& update)
|
| + {
|
| + clearPendingUpdate();
|
| + m_pendingUpdate.setPendingUpdate(update);
|
| + }
|
| + void clearPendingUpdate()
|
| + {
|
| + m_pendingUpdate.clear();
|
| + }
|
| void maybeApplyPendingUpdate(Element*);
|
| - bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpty() && !m_pendingUpdate; }
|
| + bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpty() && m_pendingUpdate.isEmpty(); }
|
| void cancel();
|
|
|
| DECLARE_TRACE();
|
| @@ -120,16 +129,16 @@ private:
|
| using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>;
|
| TransitionMap m_transitions;
|
|
|
| - OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate;
|
| + PendingAnimationUpdate m_pendingUpdate;
|
|
|
| ActiveInterpolationMap m_previousActiveInterpolationsForAnimations;
|
|
|
| - static void calculateAnimationUpdate(CSSAnimationUpdate*, const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*);
|
| - static void calculateTransitionUpdate(CSSAnimationUpdate*, const Element* animatingElement, const ComputedStyle&);
|
| - static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSTransitionData&, size_t transitionIndex, const ComputedStyle& oldStyle, const ComputedStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate*, const Element*);
|
| + static void calculateAnimationUpdate(CSSAnimationUpdate&, const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*);
|
| + static void calculateTransitionUpdate(CSSAnimationUpdate&, const Element* animatingElement, const ComputedStyle&);
|
| + static void calculateTransitionUpdateForProperty(CSSPropertyID, const CSSTransitionData&, size_t transitionIndex, const ComputedStyle& oldStyle, const ComputedStyle&, const TransitionMap* activeTransitions, CSSAnimationUpdate&, const Element*);
|
|
|
| - static void calculateAnimationActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);
|
| - static void calculateTransitionActiveInterpolations(CSSAnimationUpdate*, const Element* animatingElement, double timelineCurrentTime);
|
| + static void calculateAnimationActiveInterpolations(CSSAnimationUpdate&, const Element* animatingElement, double timelineCurrentTime);
|
| + static void calculateTransitionActiveInterpolations(CSSAnimationUpdate&, const Element* animatingElement, double timelineCurrentTime);
|
|
|
| class AnimationEventDelegate final : public AnimationEffect::EventDelegate {
|
| public:
|
|
|