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

Unified Diff: Source/core/animation/AnimationTimeline.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: Intentional nullptr access Created 5 years, 7 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/AnimationTimeline.h
diff --git a/Source/core/animation/AnimationTimeline.h b/Source/core/animation/AnimationTimeline.h
index 5e24cd2530a266e05944084241f51e71fd389e0c..189ad2cf38941de36858d12c9555c8f9eeb377ee 100644
--- a/Source/core/animation/AnimationTimeline.h
+++ b/Source/core/animation/AnimationTimeline.h
@@ -49,10 +49,10 @@ class Document;
class AnimationEffect;
// AnimationTimeline is constructed and owned by Document, and tied to its lifecycle.
-class CORE_EXPORT AnimationTimeline : public RefCountedWillBeGarbageCollectedFinalized<AnimationTimeline>, public ScriptWrappable {
+class CORE_EXPORT AnimationTimeline : public GarbageCollectedFinalized<AnimationTimeline>, public ScriptWrappable {
DEFINE_WRAPPERTYPEINFO();
public:
- class PlatformTiming : public NoBaseWillBeGarbageCollectedFinalized<PlatformTiming> {
+ class PlatformTiming : public GarbageCollectedFinalized<PlatformTiming> {
public:
// Calls AnimationTimeline's wake() method after duration seconds.
@@ -63,7 +63,7 @@ public:
DEFINE_INLINE_VIRTUAL_TRACE() { }
};
- static PassRefPtrWillBeRawPtr<AnimationTimeline> create(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming> = nullptr);
+ static AnimationTimeline* create(Document*, PlatformTiming* = nullptr);
~AnimationTimeline();
void serviceAnimations(TimingUpdateReason);
@@ -107,10 +107,12 @@ public:
#endif
void wake();
+ PlatformTiming* timing() { return m_timing.get(); }
+
DECLARE_TRACE();
protected:
- AnimationTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>);
+ AnimationTimeline(Document*, PlatformTiming*);
private:
RawPtrWillBeMember<Document> m_document;
@@ -126,7 +128,7 @@ private:
friend class SMILTimeContainer;
static const double s_minimumDelay;
- OwnPtrWillBeMember<PlatformTiming> m_timing;
+ Member<PlatformTiming> m_timing;
double m_lastCurrentTimeInternal;
OwnPtr<WebCompositorAnimationTimeline> m_compositorTimeline;
@@ -149,7 +151,7 @@ private:
DECLARE_VIRTUAL_TRACE();
private:
- RawPtrWillBeMember<AnimationTimeline> m_timeline;
+ Member<AnimationTimeline> m_timeline;
Timer<AnimationTimelineTiming> m_timer;
};

Powered by Google App Engine
This is Rietveld 408576698