diff options
| author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
| commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
| tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebCore/page/animation/CompositeAnimation.h | |
| parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
| download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 | |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebCore/page/animation/CompositeAnimation.h')
| -rw-r--r-- | Source/WebCore/page/animation/CompositeAnimation.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/WebCore/page/animation/CompositeAnimation.h b/Source/WebCore/page/animation/CompositeAnimation.h index 249f4c3..1bfe585 100644 --- a/Source/WebCore/page/animation/CompositeAnimation.h +++ b/Source/WebCore/page/animation/CompositeAnimation.h @@ -41,6 +41,7 @@ class AnimationControllerPrivate; class AnimationController; class RenderObject; class RenderStyle; +class WebKitAnimationList; // A CompositeAnimation represents a collection of animations that are running // on a single RenderObject, such as a number of properties transitioning at once. @@ -80,6 +81,8 @@ public: bool pauseTransitionAtTime(int property, double t); unsigned numberOfActiveAnimations() const; + PassRefPtr<WebKitAnimationList> animations() const; + private: CompositeAnimation(AnimationControllerPrivate* animationController) : m_animationController(animationController) |