diff options
| author | Steve Block <steveblock@google.com> | 2009-12-15 10:12:09 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-12-17 17:41:10 +0000 |
| commit | 643ca7872b450ea4efacab6188849e5aac2ba161 (patch) | |
| tree | 6982576c228bcd1a7efe98afed544d840751094c /WebCore/page/animation | |
| parent | d026980fde6eb3b01c1fe49441174e89cd1be298 (diff) | |
| download | external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.zip external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.gz external_webkit-643ca7872b450ea4efacab6188849e5aac2ba161.tar.bz2 | |
Merge webkit.org at r51976 : Initial merge by git.
Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
Diffstat (limited to 'WebCore/page/animation')
| -rw-r--r-- | WebCore/page/animation/AnimationBase.cpp | 2 | ||||
| -rw-r--r-- | WebCore/page/animation/KeyframeAnimation.cpp | 1 | ||||
| -rw-r--r-- | WebCore/page/animation/KeyframeAnimation.h | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/WebCore/page/animation/AnimationBase.cpp b/WebCore/page/animation/AnimationBase.cpp index 59797da..f1ee750 100644 --- a/WebCore/page/animation/AnimationBase.cpp +++ b/WebCore/page/animation/AnimationBase.cpp @@ -190,7 +190,7 @@ class PropertyWrapperBase; static void addShorthandProperties(); static PropertyWrapperBase* wrapperForProperty(int propertyID); -class PropertyWrapperBase { +class PropertyWrapperBase : public Noncopyable { public: PropertyWrapperBase(int prop) : m_prop(prop) diff --git a/WebCore/page/animation/KeyframeAnimation.cpp b/WebCore/page/animation/KeyframeAnimation.cpp index 7e37e5f..500bf6f 100644 --- a/WebCore/page/animation/KeyframeAnimation.cpp +++ b/WebCore/page/animation/KeyframeAnimation.cpp @@ -36,6 +36,7 @@ #include "EventNames.h" #include "RenderLayer.h" #include "RenderLayerBacking.h" +#include "RenderStyle.h" #include <wtf/UnusedParam.h> namespace WebCore { diff --git a/WebCore/page/animation/KeyframeAnimation.h b/WebCore/page/animation/KeyframeAnimation.h index 4905fc3..e3b8f53 100644 --- a/WebCore/page/animation/KeyframeAnimation.h +++ b/WebCore/page/animation/KeyframeAnimation.h @@ -32,10 +32,11 @@ #include "AnimationBase.h" #include "Document.h" #include "KeyframeList.h" -#include "RenderStyle.h" namespace WebCore { +class RenderStyle; + // A KeyframeAnimation tracks the state of an explicit animation // for a single RenderObject. class KeyframeAnimation : public AnimationBase { |