Index: Source/core/animation/css/CSSAnimations.h |
diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h |
index 0fcae5dbf38a6e7ce88753bb1ae619f8cd011c4d..782f731b3f3afc1d213fbd6e3cc8b04ea5fbcb78 100644 |
--- a/Source/core/animation/css/CSSAnimations.h |
+++ b/Source/core/animation/css/CSSAnimations.h |
@@ -60,9 +60,9 @@ public: |
static const StylePropertyShorthand& propertiesForTransitionAll(); |
static bool isAllowedAnimation(CSSPropertyID); |
- static PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*); |
+ static CSSAnimationUpdate* calculateUpdate(const Element* animatingElement, Element&, const ComputedStyle&, ComputedStyle* parentStyle, StyleResolver*); |
- void setPendingUpdate(PassOwnPtrWillBeRawPtr<CSSAnimationUpdate> update) { m_pendingUpdate = update; } |
+ void setPendingUpdate(CSSAnimationUpdate* update) { m_pendingUpdate = update; } |
void maybeApplyPendingUpdate(Element*); |
bool isEmpty() const { return m_animations.isEmpty() && m_transitions.isEmpty() && !m_pendingUpdate; } |
void cancel(); |
@@ -70,15 +70,16 @@ public: |
DECLARE_TRACE(); |
private: |
- class RunningAnimation final : public RefCountedWillBeGarbageCollectedFinalized<RunningAnimation> { |
+ class RunningAnimation final : public GarbageCollectedFinalized<RunningAnimation> { |
public: |
- RunningAnimation(PassRefPtrWillBeRawPtr<Animation> animation, CSSAnimationUpdate::NewAnimation newAnimation) |
+ RunningAnimation(Animation* animation, CSSAnimationUpdate::NewAnimation newAnimation) |
: animation(animation) |
, specifiedTiming(newAnimation.timing) |
, styleRule(newAnimation.styleRule) |
, styleRuleVersion(newAnimation.styleRuleVersion) |
{ |
} |
+ ~RunningAnimation() { } |
sof
2015/05/30 11:34:05
Define it out-of-line?
peria
2015/06/01 04:43:02
Done.
|
void update(CSSAnimationUpdate::UpdatedAnimation update) |
{ |
@@ -93,7 +94,7 @@ private: |
visitor->trace(styleRule); |
} |
- RefPtrWillBeMember<Animation> animation; |
+ Member<Animation> animation; |
Timing specifiedTiming; |
RefPtrWillBeMember<StyleRuleKeyframes> styleRule; |
unsigned styleRuleVersion; |
@@ -109,18 +110,18 @@ private: |
visitor->trace(to); |
} |
- RefPtrWillBeMember<Animation> animation; |
- RawPtrWillBeMember<const AnimatableValue> from; |
- RawPtrWillBeMember<const AnimatableValue> to; |
+ Member<Animation> animation; |
+ Member<const AnimatableValue> from; |
+ Member<const AnimatableValue> to; |
}; |
- using AnimationMap = WillBeHeapHashMap<AtomicString, RefPtrWillBeMember<RunningAnimation>>; |
+ using AnimationMap = HeapHashMap<AtomicString, Member<RunningAnimation>>; |
AnimationMap m_animations; |
- using TransitionMap = WillBeHeapHashMap<CSSPropertyID, RunningTransition>; |
+ using TransitionMap = HeapHashMap<CSSPropertyID, RunningTransition>; |
TransitionMap m_transitions; |
- OwnPtrWillBeMember<CSSAnimationUpdate> m_pendingUpdate; |
+ Member<CSSAnimationUpdate> m_pendingUpdate; |
ActiveInterpolationMap m_previousActiveInterpolationsForAnimations; |