diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
| commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
| tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebKit/blackberry/Api/WebAnimation.cpp | |
| parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) | |
| download | qtwebkit-8995b83bcbfbb68245f779b64e5517627c6cc6ea.tar.gz | |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebKit/blackberry/Api/WebAnimation.cpp')
| -rw-r--r-- | Source/WebKit/blackberry/Api/WebAnimation.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit/blackberry/Api/WebAnimation.cpp b/Source/WebKit/blackberry/Api/WebAnimation.cpp index e916ca5b8..4ae50de48 100644 --- a/Source/WebKit/blackberry/Api/WebAnimation.cpp +++ b/Source/WebKit/blackberry/Api/WebAnimation.cpp @@ -25,19 +25,19 @@ #include "LayerCompositingThread.h" #include "LayerWebKitThread.h" #include "WebAnimation_p.h" -#include "WebString.h" #include <BlackBerryPlatformMessageClient.h> +#include <BlackBerryPlatformString.h> namespace BlackBerry { namespace WebKit { using namespace WebCore; -WebAnimation WebAnimation::fadeAnimation(const WebString& name, float from, float to, double duration) +WebAnimation WebAnimation::fadeAnimation(const BlackBerry::Platform::String& name, float from, float to, double duration) { WebAnimation tmp; - tmp.d->name = String(name.impl()); + tmp.d->name = name; tmp.d->animation = Animation::create(); tmp.d->animation->setDuration(duration); tmp.d->keyframes = KeyframeValueList(AnimatedPropertyOpacity); @@ -47,9 +47,9 @@ WebAnimation WebAnimation::fadeAnimation(const WebString& name, float from, floa return tmp; } -WebString WebAnimation::name() const +BlackBerry::Platform::String WebAnimation::name() const { - return d->name.impl(); + return d->name; } WebAnimation::WebAnimation() |