diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-10 15:31:59 -0800 |
|---|---|---|
| committer | Teng-Hui Zhu <ztenghui@google.com> | 2010-11-17 13:35:59 -0800 |
| commit | 28040489d744e0c5d475a88663056c9040ed5320 (patch) | |
| tree | c463676791e4a63e452a95f0a12b2a8519730693 /WebCore/page/animation/AnimationController.h | |
| parent | eff9be92c41913c92fb1d3b7983c071f3e718678 (diff) | |
| download | external_webkit-28040489d744e0c5d475a88663056c9040ed5320.zip external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.gz external_webkit-28040489d744e0c5d475a88663056c9040ed5320.tar.bz2 | |
Merge WebKit at r71558: Initial merge by git.
Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
Diffstat (limited to 'WebCore/page/animation/AnimationController.h')
| -rw-r--r-- | WebCore/page/animation/AnimationController.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/WebCore/page/animation/AnimationController.h b/WebCore/page/animation/AnimationController.h index 4528dae..5279467 100644 --- a/WebCore/page/animation/AnimationController.h +++ b/WebCore/page/animation/AnimationController.h @@ -62,8 +62,11 @@ public: bool isRunningAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow = true) const; bool isRunningAcceleratedAnimationOnRenderer(RenderObject*, CSSPropertyID, bool isRunningNow = true) const; - void suspendAnimations(Document*); - void resumeAnimations(Document*); + void suspendAnimations(); + void resumeAnimations(); + + void suspendAnimationsForDocument(Document*); + void resumeAnimationsForDocument(Document*); void beginAnimationUpdate(); void endAnimationUpdate(); |