Index: Source/core/svg/animation/SMILTimeContainer.h |
diff --git a/Source/core/svg/animation/SMILTimeContainer.h b/Source/core/svg/animation/SMILTimeContainer.h |
index 98e9e11a4c6660a303feb8e218498549769a7c25..bff4ae935b6faaa287b39e1d2914ee0559c475e8 100644 |
--- a/Source/core/svg/animation/SMILTimeContainer.h |
+++ b/Source/core/svg/animation/SMILTimeContainer.h |
@@ -38,8 +38,6 @@ |
namespace WebCore { |
-class AnimationClock; |
-class Document; |
class SVGElement; |
class SVGSMILElement; |
class SVGSVGElement; |
@@ -63,9 +61,6 @@ public: |
void resume(); |
void setElapsed(SMILTime); |
- void serviceAnimations(double monotonicAnimationStartTime); |
- bool hasAnimations() const; |
- |
void setDocumentOrderIndexesDirty() { m_documentOrderIndexesDirty = true; } |
private: |
@@ -75,15 +70,12 @@ private: |
void scheduleAnimationFrame(SMILTime fireTime); |
void scheduleAnimationFrame(); |
void cancelAnimationFrame(); |
- void wakeupTimerFired(Timer<SMILTimeContainer>*); |
+ void timerFired(Timer<SMILTimeContainer>*); |
void updateAnimations(SMILTime elapsed, bool seekToTime = false); |
- void serviceOnNextFrame(); |
void updateDocumentOrderIndexes(); |
double lastResumeTime() const { return m_resumeTime ? m_resumeTime : m_beginTime; } |
- Document& document() const; |
- |
double m_beginTime; |
double m_pauseTime; |
double m_resumeTime; |
@@ -91,10 +83,8 @@ private: |
double m_presetStartTime; |
bool m_documentOrderIndexesDirty; |
- bool m_framePending; |
- OwnPtr<AnimationClock> m_animationClock; |
- Timer<SMILTimeContainer> m_wakeupTimer; |
+ Timer<SMILTimeContainer> m_timer; |
typedef pair<SVGElement*, QualifiedName> ElementAttributePair; |
typedef Vector<SVGSMILElement*> AnimationsVector; |