diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/src/WebAnimation.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/src/WebAnimation.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebAnimation.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/WebAnimation.cpp b/Source/WebKit/chromium/src/WebAnimation.cpp index 7dddfc241..610201512 100644 --- a/Source/WebKit/chromium/src/WebAnimation.cpp +++ b/Source/WebKit/chromium/src/WebAnimation.cpp @@ -38,6 +38,11 @@ using WebCore::CCActiveAnimation; namespace WebKit { +WebAnimation::TargetProperty WebAnimation::targetProperty() const +{ + return static_cast<WebAnimation::TargetProperty>(m_private->targetProperty()); +} + int WebAnimation::iterations() const { return m_private->iterations(); @@ -87,10 +92,12 @@ WebAnimation::operator PassOwnPtr<WebCore::CCActiveAnimation>() const void WebAnimation::initialize(const WebAnimationCurve& curve, TargetProperty targetProperty) { - m_private.reset(CCActiveAnimation::create(curve, - AnimationIdVendor::getNextAnimationId(), - AnimationIdVendor::getNextGroupId(), - static_cast<WebCore::CCActiveAnimation::TargetProperty>(targetProperty)).leakPtr()); + initialize(curve, AnimationIdVendor::getNextAnimationId(), AnimationIdVendor::getNextGroupId(), targetProperty); +} + +void WebAnimation::initialize(const WebAnimationCurve& curve, int animationId, int groupId, TargetProperty targetProperty) +{ + m_private.reset(CCActiveAnimation::create(curve, animationId, groupId, static_cast<WebCore::CCActiveAnimation::TargetProperty>(targetProperty)).leakPtr()); } void WebAnimation::destroy() |