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

Unified Diff: Source/core/animation/css/CSSAnimationUpdate.h

Issue 1120003002: [Oilpan] Migrate most classes under core/animations to Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 5 years, 4 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 | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/animation/css/CSSAnimations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 1553414beffdbc19fa8d09aeb0fc66f9e2bfa1a9..deb92d46df97661c114898e35ab4c4cb185247e9 100644
--- a/Source/core/animation/css/CSSAnimationUpdate.h
+++ b/Source/core/animation/css/CSSAnimationUpdate.h
@@ -36,7 +36,7 @@ public:
{
}
- NewAnimation(AtomicString name, PassRefPtrWillBeRawPtr<InertEffect> effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+ NewAnimation(AtomicString name, InertEffect* effect, Timing timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
: name(name)
, effect(effect)
, timing(timing)
@@ -52,7 +52,7 @@ public:
}
AtomicString name;
- RefPtrWillBeMember<InertEffect> effect;
+ Member<InertEffect> effect;
Timing timing;
RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
unsigned styleRuleVersion;
@@ -66,7 +66,7 @@ public:
{
}
- UpdatedAnimation(AtomicString name, Animation* animation, PassRefPtrWillBeRawPtr<InertEffect> effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+ UpdatedAnimation(AtomicString name, Animation* animation, InertEffect* effect, Timing specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
: name(name)
, animation(animation)
, effect(effect)
@@ -84,8 +84,8 @@ public:
}
AtomicString name;
- RawPtrWillBeMember<Animation> animation;
- RefPtrWillBeMember<InertEffect> effect;
+ Member<Animation> animation;
+ Member<InertEffect> effect;
Timing specifiedTiming;
RefPtrWillBeMember<StyleRuleKeyframes> styleRule;
unsigned styleRuleVersion;
@@ -98,9 +98,9 @@ public:
DISALLOW_ALLOCATION();
public:
- RefPtrWillBeMember<AnimatableValue> opacity;
- RefPtrWillBeMember<AnimatableValue> transform;
- RefPtrWillBeMember<AnimatableValue> webkitFilter;
+ Member<AnimatableValue> opacity;
+ Member<AnimatableValue> transform;
+ Member<AnimatableValue> webkitFilter;
DEFINE_INLINE_TRACE()
{
@@ -128,8 +128,8 @@ public:
visitor->trace(snapshot);
}
- RawPtrWillBeMember<Animation> animation;
- RawPtrWillBeMember<KeyframeEffectModelBase> model;
+ Member<Animation> animation;
+ Member<KeyframeEffectModelBase> model;
CompositableStyleSnapshot snapshot;
};
@@ -175,7 +175,7 @@ public:
m_finishedTransitions.clear();
}
- void startAnimation(const AtomicString& animationName, PassRefPtrWillBeRawPtr<InertEffect> effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+ void startAnimation(const AtomicString& animationName, InertEffect* effect, const Timing& timing, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
{
effect->setName(animationName);
m_newAnimations.append(NewAnimation(animationName, effect, timing, styleRule));
@@ -191,8 +191,7 @@ public:
{
m_animationsWithPauseToggled.append(name);
}
- void updateAnimation(const AtomicString& name, Animation* animation, PassRefPtrWillBeRawPtr<InertEffect> effect, const Timing& specifiedTiming,
- PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
+ void updateAnimation(const AtomicString& name, Animation* animation, InertEffect* effect, const Timing& specifiedTiming, PassRefPtrWillBeRawPtr<StyleRuleKeyframes> styleRule)
{
m_animationsWithUpdates.append(UpdatedAnimation(name, animation, effect, specifiedTiming, styleRule));
m_suppressedAnimations.add(animation);
@@ -213,7 +212,7 @@ public:
m_animationsWithStyleUpdates.append(UpdatedAnimationStyle(animation, model, snapshot));
}
- void startTransition(CSSPropertyID id, const AnimatableValue* from, const AnimatableValue* to, PassRefPtrWillBeRawPtr<InertEffect> effect)
+ void startTransition(CSSPropertyID id, const AnimatableValue* from, const AnimatableValue* to, InertEffect* effect)
{
effect->setName(getPropertyName(id));
NewTransition newTransition;
@@ -227,12 +226,12 @@ public:
void cancelTransition(CSSPropertyID id) { m_cancelledTransitions.add(id); }
void finishTransition(CSSPropertyID id) { m_finishedTransitions.add(id); }
- const WillBeHeapVector<NewAnimation>& newAnimations() const { return m_newAnimations; }
+ const HeapVector<NewAnimation>& newAnimations() const { return m_newAnimations; }
const Vector<AtomicString>& cancelledAnimationNames() const { return m_cancelledAnimationNames; }
- const WillBeHeapHashSet<RawPtrWillBeMember<const Animation>>& suppressedAnimations() const { return m_suppressedAnimations; }
+ const HeapHashSet<Member<const Animation>>& suppressedAnimations() const { return m_suppressedAnimations; }
const Vector<AtomicString>& animationsWithPauseToggled() const { return m_animationsWithPauseToggled; }
- const WillBeHeapVector<UpdatedAnimation>& animationsWithUpdates() const { return m_animationsWithUpdates; }
- const WillBeHeapVector<UpdatedAnimationStyle>& animationsWithStyleUpdates() const { return m_animationsWithStyleUpdates; }
+ const HeapVector<UpdatedAnimation>& animationsWithUpdates() const { return m_animationsWithUpdates; }
+ const HeapVector<UpdatedAnimationStyle>& animationsWithStyleUpdates() const { return m_animationsWithStyleUpdates; }
struct NewTransition {
ALLOW_ONLY_INLINE_ALLOCATION();
@@ -245,11 +244,11 @@ public:
}
CSSPropertyID id;
- RawPtrWillBeMember<const AnimatableValue> from;
- RawPtrWillBeMember<const AnimatableValue> to;
- RefPtrWillBeMember<InertEffect> effect;
+ Member<const AnimatableValue> from;
+ Member<const AnimatableValue> to;
+ Member<InertEffect> effect;
};
- using NewTransitionMap = WillBeHeapHashMap<CSSPropertyID, NewTransition>;
+ using NewTransitionMap = HeapHashMap<CSSPropertyID, NewTransition>;
const NewTransitionMap& newTransitions() const { return m_newTransitions; }
const HashSet<CSSPropertyID>& cancelledTransitions() const { return m_cancelledTransitions; }
const HashSet<CSSPropertyID>& finishedTransitions() const { return m_finishedTransitions; }
@@ -277,7 +276,6 @@ public:
DEFINE_INLINE_TRACE()
{
-#if ENABLE(OILPAN)
visitor->trace(m_newTransitions);
visitor->trace(m_activeInterpolationsForAnimations);
visitor->trace(m_activeInterpolationsForTransitions);
@@ -285,7 +283,6 @@ public:
visitor->trace(m_suppressedAnimations);
visitor->trace(m_animationsWithUpdates);
visitor->trace(m_animationsWithStyleUpdates);
-#endif
}
private:
@@ -293,12 +290,12 @@ private:
// will be started. Note that there may be multiple animations present
// with the same name, due to the way in which we split up animations with
// incomplete keyframes.
- WillBeHeapVector<NewAnimation> m_newAnimations;
+ HeapVector<NewAnimation> m_newAnimations;
Vector<AtomicString> m_cancelledAnimationNames;
- WillBeHeapHashSet<RawPtrWillBeMember<const Animation>> m_suppressedAnimations;
+ HeapHashSet<Member<const Animation>> m_suppressedAnimations;
Vector<AtomicString> m_animationsWithPauseToggled;
- WillBeHeapVector<UpdatedAnimation> m_animationsWithUpdates;
- WillBeHeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
+ HeapVector<UpdatedAnimation> m_animationsWithUpdates;
+ HeapVector<UpdatedAnimationStyle> m_animationsWithStyleUpdates;
NewTransitionMap m_newTransitions;
HashSet<CSSPropertyID> m_cancelledTransitions;
« no previous file with comments | « Source/core/animation/css/CSSAnimatableValueFactory.cpp ('k') | Source/core/animation/css/CSSAnimations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698