Fix CSS animations

- we were overriding existing animations.
- implement correctly the removeAnimations functions
- refactor AndroidAnimation (share common code)
- fix how we use the timing functions for the animations
- implements timing functions per keyframes

bug:2453890
Change-Id: I367d708338c270171eeaacc7e2fb3729eb78c444

1 files changed, 30 insertions, 8 deletions

diff --git a/WebCore/platform/graphics/android/LayerAndroid.cpp b/WebCore/platform/graphics/android/LayerAndroid.cpp
index 7d68f03..76fb2f2 100644
--- a/WebCore/platform/graphics/android/LayerAndroid.cpp
+++ b/WebCore/platform/graphics/android/LayerAndroid.cpp
@@ -132,8 +132,10 @@ LayerAndroid::LayerAndroid(const LayerAndroid& layer) : SkLayer(layer),
         addChild(layer.getChild(i)->copy())->unref();
 
     KeyframesMap::const_iterator end = layer.m_animations.end();
-    for (KeyframesMap::const_iterator it = layer.m_animations.begin(); it != end; ++it)
-        m_animations.add((it->second)->name(), (it->second)->copy());
+    for (KeyframesMap::const_iterator it = layer.m_animations.begin(); it != end; ++it) {
+        pair<String, int> key((it->second)->name(), (it->second)->type());
+        m_animations.add(key, (it->second)->copy());
+    }
 
 #ifdef DEBUG_COUNT
     ClassTracker::instance()->increment("LayerAndroid");
@@ -243,15 +245,35 @@ bool LayerAndroid::evaluateAnimations(double time) const
 void LayerAndroid::addAnimation(PassRefPtr<AndroidAnimation> prpAnim)
 {
     RefPtr<AndroidAnimation> anim = prpAnim;
-    RefPtr<AndroidAnimation> currentAnim = m_animations.get(anim->name());
-    if (currentAnim && currentAnim->type() == anim->type())
-        removeAnimation(anim->name());
-    m_animations.add(anim->name(), anim);
+    pair<String, int> key(anim->name(), anim->type());
+    removeAnimationsForProperty(anim->type());
+    m_animations.add(key, anim);
+}
+
+void LayerAndroid::removeAnimationsForProperty(AnimatedPropertyID property)
+{
+    KeyframesMap::const_iterator end = m_animations.end();
+    Vector<pair<String, int> > toDelete;
+    for (KeyframesMap::const_iterator it = m_animations.begin(); it != end; ++it) {
+        if ((it->second)->type() == property)
+            toDelete.append(it->first);
+    }
+
+    for (unsigned int i = 0; i < toDelete.size(); i++)
+        m_animations.remove(toDelete[i]);
 }
 
-void LayerAndroid::removeAnimation(const String& name)
+void LayerAndroid::removeAnimationsForKeyframes(const String& name)
 {
-    m_animations.remove(name);
+    KeyframesMap::const_iterator end = m_animations.end();
+    Vector<pair<String, int> > toDelete;
+    for (KeyframesMap::const_iterator it = m_animations.begin(); it != end; ++it) {
+        if ((it->second)->name() == name)
+            toDelete.append(it->first);
+    }
+
+    for (unsigned int i = 0; i < toDelete.size(); i++)
+            m_animations.remove(toDelete[i]);
 }
 
 // We only use the bounding rect of the layer as mask...