summaryrefslogtreecommitdiffstats
path: root/WebCore/page/animation/AnimationControllerPrivate.h
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore/page/animation/AnimationControllerPrivate.h')
-rw-r--r--WebCore/page/animation/AnimationControllerPrivate.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/WebCore/page/animation/AnimationControllerPrivate.h b/WebCore/page/animation/AnimationControllerPrivate.h
index 893c717..6812e09 100644
--- a/WebCore/page/animation/AnimationControllerPrivate.h
+++ b/WebCore/page/animation/AnimationControllerPrivate.h
@@ -54,12 +54,11 @@ public:
AnimationControllerPrivate(Frame*);
~AnimationControllerPrivate();
+ void updateAnimationTimer(bool callSetChanged = false);
+
PassRefPtr<CompositeAnimation> accessCompositeAnimation(RenderObject*);
bool clear(RenderObject*);
- void animationTimerFired(Timer<AnimationControllerPrivate>*);
- void updateAnimationTimer(bool callSetChanged = false);
-
void updateStyleIfNeededDispatcherFired(Timer<AnimationControllerPrivate>*);
void startUpdateStyleIfNeededDispatcher();
void addEventToDispatch(PassRefPtr<Element> element, const AtomicString& eventType, const String& name, double elapsedTime);
@@ -92,11 +91,13 @@ public:
void addToStartTimeResponseWaitList(AnimationBase*, bool willGetResponse);
void removeFromStartTimeResponseWaitList(AnimationBase*);
- void startTimeResponse(double t);
private:
+ void animationTimerFired(Timer<AnimationControllerPrivate>*);
+
void styleAvailable();
void fireEventsAndUpdateStyle();
+ void startTimeResponse(double t);
typedef HashMap<RenderObject*, RefPtr<CompositeAnimation> > RenderObjectAnimationMap;
@@ -120,9 +121,9 @@ private:
AnimationBase* m_styleAvailableWaiters;
AnimationBase* m_lastStyleAvailableWaiter;
- AnimationBase* m_responseWaiters;
- AnimationBase* m_lastResponseWaiter;
- bool m_waitingForResponse;
+ AnimationBase* m_startTimeResponseWaiters;
+ AnimationBase* m_lastStartTimeResponseWaiter;
+ bool m_waitingForStartTimeResponse;
};
} // namespace WebCore