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

Unified Diff: Source/core/animation/AnimationNode.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: Build fix 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/AnimationNode.h
diff --git a/Source/core/animation/AnimationNode.h b/Source/core/animation/AnimationNode.h
index 985f69d420bb7b949b5c3172eef65c9c3cfecf27..38df8280b19b1c7faee08fad8834e4620d86c3c8 100644
--- a/Source/core/animation/AnimationNode.h
+++ b/Source/core/animation/AnimationNode.h
@@ -61,7 +61,7 @@ static inline double nullValue()
return std::numeric_limits<double>::quiet_NaN();
}
-class CORE_EXPORT AnimationNode : public RefCountedWillBeGarbageCollectedFinalized<AnimationNode>, public ScriptWrappable {
+class CORE_EXPORT AnimationNode : public GarbageCollectedFinalized<AnimationNode>, public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO();
friend class AnimationPlayer; // Calls attach/detach, updateInheritedTime.
public:
@@ -73,7 +73,7 @@ public:
PhaseNone,
};
- class EventDelegate : public NoBaseWillBeGarbageCollectedFinalized<EventDelegate> {
+ class EventDelegate : public GarbageCollectedFinalized<EventDelegate> {
public:
virtual ~EventDelegate() { }
virtual bool requiresIterationEvents(const AnimationNode&) = 0;
@@ -102,7 +102,7 @@ public:
const AnimationPlayer* player() const { return m_player; }
AnimationPlayer* player() { return m_player; }
const Timing& specifiedTiming() const { return m_timing; }
- PassRefPtrWillBeRawPtr<AnimationNodeTiming> timing();
+ AnimationNodeTiming* timing();
void updateSpecifiedTiming(const Timing&);
void computedTiming(ComputedTimingProperties&);
@@ -114,7 +114,7 @@ public:
DECLARE_VIRTUAL_TRACE();
protected:
- explicit AnimationNode(const Timing&, PassOwnPtrWillBeRawPtr<EventDelegate> = nullptr);
+ explicit AnimationNode(const Timing&, EventDelegate* = nullptr);
// When AnimationNode receives a new inherited time via updateInheritedTime
// it will (if necessary) recalculate timings and (if necessary) call
@@ -143,11 +143,11 @@ protected:
virtual void specifiedTimingChanged() { }
// FIXME: m_parent and m_startTime are placeholders, they depend on timing groups.
- RawPtrWillBeMember<AnimationNode> m_parent;
+ Member<AnimationNode> m_parent;
const double m_startTime;
RawPtrWillBeMember<AnimationPlayer> m_player;
Timing m_timing;
- OwnPtrWillBeMember<EventDelegate> m_eventDelegate;
+ Member<EventDelegate> m_eventDelegate;
mutable struct CalculatedTiming {
Phase phase;

Powered by Google App Engine
This is Rietveld 408576698