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

Unified Diff: Source/core/animation/css/CSSAnimations.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: Created 5 years, 8 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
Index: Source/core/animation/css/CSSAnimations.h
diff --git a/Source/core/animation/css/CSSAnimations.h b/Source/core/animation/css/CSSAnimations.h
index 04825d64188d9c54963d2c15cb342279bc3ba21c..9a719fe6e2e9979b4654b2cec83638aa37cfba45 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,7 +70,7 @@ public:
DECLARE_TRACE();
private:
- class RunningAnimation final : public RefCountedWillBeGarbageCollectedFinalized<RunningAnimation> {
+ class RunningAnimation final : public GarbageCollectedFinalized<RunningAnimation> {
public:
RunningAnimation(PassRefPtrWillBeRawPtr<AnimationPlayer> player, CSSAnimationUpdate::NewAnimation animation)
: player(player)
@@ -110,17 +110,17 @@ private:
}
RefPtrWillBeMember<AnimationPlayer> player;
- RawPtrWillBeMember<const AnimatableValue> from;
- RawPtrWillBeMember<const AnimatableValue> to;
+ 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;

Powered by Google App Engine
This is Rietveld 408576698