Merge "Fix 2453890: animation via css -webkit-transform" into honeycomb-mr1

1 files changed, 13 insertions, 7 deletions

diff --git a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
index 4cd48a8..54346e5 100644
--- a/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsLayerAndroid.cpp
@@ -728,15 +728,21 @@ bool GraphicsLayerAndroid::createAnimationFromKeyframes(const KeyframeValueList&
     case AnimatedPropertyInvalid: break;
     case AnimatedPropertyWebkitTransform: break;
     case AnimatedPropertyBackgroundColor: break;
+
     case AnimatedPropertyOpacity: {
         MLOG("ANIMATEDPROPERTYOPACITY");
-        const FloatAnimationValue* startVal =
-            static_cast<const FloatAnimationValue*>(valueList.at(0));
-        const FloatAnimationValue* endVal =
-            static_cast<const FloatAnimationValue*>(valueList.at(1));
-        RefPtr<AndroidOpacityAnimation> anim = AndroidOpacityAnimation::create(startVal->value(),
-                                                                               endVal->value(),
-                                                                               animation,
+
+        KeyframeValueList* operationsList = new KeyframeValueList(AnimatedPropertyOpacity);
+        for (unsigned int i = 0; i < valueList.size(); i++) {
+	        FloatAnimationValue* originalValue = (FloatAnimationValue*)valueList.at(i);
+	        FloatAnimationValue* value = new FloatAnimationValue(originalValue->keyTime(),
+	                                                             originalValue->value(), 0);
+	        // TODO: pass the timing function originalValue->timingFunction());
+	        operationsList->insert(value);
+        }
+
+        RefPtr<AndroidOpacityAnimation> anim = AndroidOpacityAnimation::create(animation,
+                                                                               operationsList,
                                                                                beginTime);
         if (keyframesName.isEmpty())
             anim->setName(propertyIdToString(valueList.property()));