Changeset 101321 in webkit

Timestamp:

Nov 28, 2011 8:06:18 PM (12 years ago)

Author:

rolandsteiner@chromium.org

Message:

From @keyframes rules with the same name, the last rule should be used
​https://bugs.webkit.org/show_bug.cgi?id=73113

Source/WebCore:

Have later rules override previously stored rules.

Reviewed by Simon Fraser.

Test: animations/duplicated-keyframes-name.html

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::addKeyframeStyle):

LayoutTests:

Verify that the last @keyframe rule is used.

Reviewed by Simon Fraser.

• animations/duplicated-keyframes-name-expected.txt: Added.
• animations/duplicated-keyframes-name.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff, 1 prop)
• LayoutTests/animations/duplicated-keyframes-name-expected.txt (added)
• LayoutTests/animations/duplicated-keyframes-name.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff, 1 prop)
• Source/WebCore/css/CSSStyleSelector.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-29  Roland Steiner  <rolandsteiner@chromium.org>
+
+        From @keyframes rules with the same name, the last rule should be used
+        https://bugs.webkit.org/show_bug.cgi?id=73113
+
+        Verify that the last @keyframe rule is used.
+
+        Reviewed by Simon Fraser.
+
+        * animations/duplicated-keyframes-name-expected.txt: Added.
+        * animations/duplicated-keyframes-name.html: Added.
+
 2011-11-28  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-11-29  Roland Steiner  <rolandsteiner@chromium.org>
+
+        From @keyframes rules with the same name, the last rule should be used
+        https://bugs.webkit.org/show_bug.cgi?id=73113
+
+        Have later rules override previously stored rules.
+
+        Reviewed by Simon Fraser.
+
+        Test: animations/duplicated-keyframes-name.html
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::addKeyframeStyle):
+
 2011-11-28  Jacky Jiang  <zhajiang@rim.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -435 +435 @@
 {
     AtomicString s(rule->name());
-    m_keyframesRuleMap.add(s.impl(), rule);
+    m_keyframesRuleMap.set(s.impl(), rule);
 }