Changeset 116899 in webkit

Timestamp:

May 13, 2012 10:00:50 AM (12 years ago)

Author:

igor.o@sisa.samsung.com

Message:

[Texmap] TextureMapperAnimations does not support keyframe with multiple animations
​https://bugs.webkit.org/show_bug.cgi?id=86303

Qt and GTK, in WebKit1, use TextureMapper to store AC animations using
TextureMapperAnimations::add(keyframeName, TextureMapperAnimation). And when a
CSS animation animates several CSS properties, TextureMapperAnimations::add is
called more than once with the same keyframeName value. However, currently,
TextureMapperAnimations can not store more than one animated property in the keyframe
because it is using HashMap<String, TextureMapperAnimation>, and WebKit HashMap
does not support add the same key twice.

Reviewed by Noam Rosenthal.

• platform/graphics/texmap/TextureMapperAnimation.cpp:

(WebCore::TextureMapperAnimations::hasActiveAnimationsOfType):
(WebCore::TextureMapperAnimations::hasRunningAnimations):
(WebCore::TextureMapperAnimations::add):
(WebCore):
(WebCore::TextureMapperAnimations::pause):
(WebCore::TextureMapperAnimations::apply):

• platform/graphics/texmap/TextureMapperAnimation.h:

(TextureMapperAnimations): Use HashMap<String, Vector<TextureMapperAnimation> >,
so we can support an keyframe with multiple animations.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/texmap/TextureMapperAnimation.cpp (modified) (3 diffs)
• platform/graphics/texmap/TextureMapperAnimation.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-13  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        [Texmap] TextureMapperAnimations does not support keyframe with multiple animations
+        https://bugs.webkit.org/show_bug.cgi?id=86303
+
+        Qt and GTK, in WebKit1, use TextureMapper to store AC animations using
+        TextureMapperAnimations::add(keyframeName, TextureMapperAnimation). And when a 
+        CSS animation animates several CSS properties, TextureMapperAnimations::add is
+        called more than once with the same keyframeName value. However, currently,
+        TextureMapperAnimations can not store more than one animated property in the keyframe
+        because it is using HashMap<String, TextureMapperAnimation>, and WebKit HashMap 
+        does not support add the same key twice.
+
+        Reviewed by Noam Rosenthal.
+
+        * platform/graphics/texmap/TextureMapperAnimation.cpp:
+        (WebCore::TextureMapperAnimations::hasActiveAnimationsOfType):
+        (WebCore::TextureMapperAnimations::hasRunningAnimations):
+        (WebCore::TextureMapperAnimations::add):
+        (WebCore):
+        (WebCore::TextureMapperAnimations::pause):
+        (WebCore::TextureMapperAnimations::apply):
+        * platform/graphics/texmap/TextureMapperAnimation.h:
+        (TextureMapperAnimations): Use HashMap<String, Vector<TextureMapperAnimation> >,
+        so we can support an keyframe with multiple animations.
+
 2012-05-12  Abhishek Arya  <inferno@chromium.org>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.cpp

@@ -181 +181 @@
 bool TextureMapperAnimations::hasActiveAnimationsOfType(AnimatedPropertyID type) const
 {
-    HashMap<String, TextureMapperAnimation>::const_iterator end = m_animations.end();
-    for (HashMap<String, TextureMapperAnimation>::const_iterator it = m_animations.begin(); it != end; ++it) {
-        const TextureMapperAnimation& animation = it->second;
-        if (animation.isActive() && animation.property() == type)
-            return true;
+    HashMap<String, Vector<TextureMapperAnimation> >::const_iterator end = m_animations.end();
+    for (HashMap<String, Vector<TextureMapperAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) {
+        const Vector<TextureMapperAnimation>& animations = it->second;
+        for (size_t i = 0; i < animations.size(); ++i) {
+            if (animations[i].isActive() && animations[i].property() == type)
+                return true;
+        }
     }
     return false;
@@ -192 +194 @@
 bool TextureMapperAnimations::hasRunningAnimations() const
 {
-    HashMap<String, TextureMapperAnimation>::const_iterator end = m_animations.end();
-    for (HashMap<String, TextureMapperAnimation>::const_iterator it = m_animations.begin(); it != end; ++it) {
-        const TextureMapperAnimation& animation = it->second;
-        if (animation.state() == TextureMapperAnimation::PlayingState)
-            return true;
+    HashMap<String, Vector<TextureMapperAnimation> >::const_iterator end = m_animations.end();
+    for (HashMap<String, Vector<TextureMapperAnimation> >::const_iterator it = m_animations.begin(); it != end; ++it) {
+        const Vector<TextureMapperAnimation>& animations = it->second;
+        for (size_t i = 0; i < animations.size(); ++i) {
+            if (animations[i].state() == TextureMapperAnimation::PlayingState)
+                return true;
+        }
     }
 
@@ -248 +252 @@
 }
 
+void TextureMapperAnimations::add(const String& name, const TextureMapperAnimation& animation)
+{
+    HashMap<String, Vector<TextureMapperAnimation> >::iterator it = m_animations.find(name);
+    if (it != m_animations.end()) {
+        it->second.append(animation);
+        return;
+    }
+
+    Vector<TextureMapperAnimation> animations;
+    animations.append(animation);
+    m_animations.add(name, animations);
+}
+
 void TextureMapperAnimations::pause(const String& name, double offset)
 {
-    HashMap<String, TextureMapperAnimation>::iterator it = m_animations.find(name);
+    HashMap<String, Vector<TextureMapperAnimation> >::iterator it = m_animations.find(name);
     if (it == m_animations.end())
         return;
-    it->second.pause(offset);
+
+    for (size_t i = 0; i < it->second.size(); i++) 
+        it->second[i].pause(offset);
 }
 
 void TextureMapperAnimations::apply(TextureMapperAnimationClient* client)
 {
-    HashMap<String, TextureMapperAnimation>::iterator end = m_animations.end();
-    for (HashMap<String, TextureMapperAnimation>::iterator it = m_animations.begin(); it != end; ++it)
-        it->second.apply(client);
+    HashMap<String, Vector<TextureMapperAnimation> >::iterator end = m_animations.end();
+    for (HashMap<String, Vector<TextureMapperAnimation> >::iterator it = m_animations.begin(); it != end; ++it) {
+        for (size_t i = 0; i < it->second.size(); ++i)
+            it->second[i].apply(client);
+    }
 }
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperAnimation.h

@@ -67 +67 @@
     TextureMapperAnimations() { }
 
-    void add(const String& name, const TextureMapperAnimation& animation) { m_animations.add(name, animation); }
+    void add(const String&, const TextureMapperAnimation&);
     void remove(const String& name) { m_animations.remove(name); }
     void pause(const String&, double);
@@ -77 +77 @@
 
 private:
-    HashMap<String, TextureMapperAnimation> m_animations;
+    HashMap<String, Vector<TextureMapperAnimation> > m_animations;
 };