summaryrefslogtreecommitdiffstats
path: root/WebCore/platform/graphics/android/AndroidAnimation.h
diff options
context:
space:
mode:
authorNicolas Roard <nicolas@android.com>2010-02-11 18:40:34 +0000
committerNicolas Roard <nicolas@android.com>2010-02-12 11:29:24 +0000
commitfe41360961a5f02a9f54dbe4922d301ef4bc4a20 (patch)
tree3fb6dcaafc452ac68c36ac518eb4f3c957270a20 /WebCore/platform/graphics/android/AndroidAnimation.h
parentc557fc762122cd1bbc9a15778b86728c884a2dfb (diff)
downloadexternal_webkit-fe41360961a5f02a9f54dbe4922d301ef4bc4a20.zip
external_webkit-fe41360961a5f02a9f54dbe4922d301ef4bc4a20.tar.gz
external_webkit-fe41360961a5f02a9f54dbe4922d301ef4bc4a20.tar.bz2
Put back the animations in the UI thread
Diffstat (limited to 'WebCore/platform/graphics/android/AndroidAnimation.h')
-rw-r--r--WebCore/platform/graphics/android/AndroidAnimation.h57
1 files changed, 0 insertions, 57 deletions
diff --git a/WebCore/platform/graphics/android/AndroidAnimation.h b/WebCore/platform/graphics/android/AndroidAnimation.h
index 75e2f35..1eb13d4 100644
--- a/WebCore/platform/graphics/android/AndroidAnimation.h
+++ b/WebCore/platform/graphics/android/AndroidAnimation.h
@@ -30,63 +30,8 @@
namespace WebCore {
-class AndroidAnimation;
class TimingFunction;
-class AndroidAnimationValue : public RefCounted<AndroidAnimationValue> {
- public:
- AndroidAnimationValue(LayerAndroid* layer) : m_layer(layer) { }
- virtual ~AndroidAnimationValue() { }
- virtual void apply() = 0;
- protected:
- RefPtr<LayerAndroid> m_layer;
-};
-
-class AndroidOpacityAnimationValue : public AndroidAnimationValue {
- public:
- static PassRefPtr<AndroidOpacityAnimationValue> create(
- LayerAndroid* layer, float value) {
- return adoptRef(new AndroidOpacityAnimationValue(layer, value));
- }
- AndroidOpacityAnimationValue(LayerAndroid* layer, float value) :
- AndroidAnimationValue(layer), m_value(value) { }
- virtual void apply() { m_layer->setOpacity(m_value); }
- private:
- float m_value;
-};
-
-class AndroidTransformAnimationValue : public AndroidAnimationValue {
- public:
- static PassRefPtr<AndroidTransformAnimationValue> create(
- LayerAndroid* layer,
- FloatPoint translation,
- FloatPoint3D scale,
- float rotation) {
- return adoptRef(new AndroidTransformAnimationValue(layer, translation, scale, rotation));
- }
-
- AndroidTransformAnimationValue(LayerAndroid* layer,
- FloatPoint translation,
- FloatPoint3D scale,
- float rotation) :
- AndroidAnimationValue(layer),
- m_doTranslation(false), m_doScaling(false), m_doRotation(false),
- m_translation(translation), m_scale(scale), m_rotation(rotation) { }
- void setDoTranslation(bool doTranslation) { m_doTranslation = doTranslation; }
- void setDoScaling(bool doScaling) { m_doScaling = doScaling; }
- void setDoRotation(bool doRotation) { m_doRotation = doRotation; }
-
- virtual void apply();
-
- private:
- bool m_doTranslation;
- bool m_doScaling;
- bool m_doRotation;
- FloatPoint m_translation;
- FloatPoint3D m_scale;
- float m_rotation;
-};
-
class AndroidAnimation : public RefCounted<AndroidAnimation> {
public:
AndroidAnimation(const Animation* animation,
@@ -102,10 +47,8 @@ class AndroidAnimation : public RefCounted<AndroidAnimation> {
static long instancesCount();
void setName(const String& name) { m_name = name; }
String name() { return m_name; }
- virtual PassRefPtr<AndroidAnimationValue> result();
protected:
- RefPtr<AndroidAnimationValue> m_result;
double m_beginTime;
double m_elapsedTime;
double m_duration;