Changeset 179197 in webkit for trunk/Source/WebCore/css/CSSKeyframesRule.cpp

Timestamp:

Jan 27, 2015, 11:39:22 AM (10 years ago)

Author:

[email protected]

Message:

CSSKeyframesRule::findRule() and deleteRule() should delete the last matching rule, not the first
​https://bugs.webkit.org/show_bug.cgi?id=139732

Patch by Sylvain Galineau <​[email protected]> on 2015-01-26
Reviewed by Dean Jackson and Darin Adler.

Source/WebCore:

No new tests because existing tests have been updated to verify this behavior.

• css/CSSKeyframeRule.h:

(WebCore::StyleKeyframe::getKeys): Deleted.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::keyframeStylesForAnimation): use StyleKeyframe::keys().

• css/CSSKeyframeRule.cpp:

(WebCore::StyleKeyframe::parseKeyString): Deleted. Moved to CSSParser.
(WebCore::StyleKeyframe::keyText): Build keyframe selector from Vector<double> representation.

• css/CSSKeyframeRule.h:

(WebCore::StyleKeyframe::setKeyText): parse keyframe selector into Vector<double>.
(WebCore::StyleKeyframe::keys): Added. Returns vector representation of selector keys.
(WebCore::StyleKeyframe::getKeys): Deleted. Now keys().

• css/CSSKeyframesRule.cpp:

(WebCore::StyleRuleKeyframes::findKeyframeIndex): Return last matching rule.

• css/CSSParser.cpp:

(WebCore::CSSParser::parseKeyframeSelector): Added. Moved from StyleKeyframe.

• css/CSSParser.h:

(WebCore::CSSParser::parseKeyframeSelector): Added. Moved from StyleKeyframe.

LayoutTests:

Update existing keyframes OM tests to check for findRule/deleteRule matching order i.e. find/delete last specified rule.

• animations/keyframes-rule-expected.txt:
• animations/keyframes-rule.html:
• animations/unprefixed-keyframes-rule-expected.txt:
• animations/unprefixed-keyframes-rule.html:

File:

• trunk/Source/WebCore/css/CSSKeyframesRule.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSKeyframesRule.cpp

@@ -73 +73 @@
 int StyleRuleKeyframes::findKeyframeIndex(const String& key) const
 {
-    String percentageString;
-    if (equalIgnoringCase(key, "from"))
-        percentageString = ASCIILiteral("0%");
-    else if (equalIgnoringCase(key, "to"))
-        percentageString = ASCIILiteral("100%");
-    else
-        percentageString = key;
-    
-    for (unsigned i = 0; i < m_keyframes.size(); ++i) {
-        if (m_keyframes[i]->keyText() == percentageString)
+    Vector<double>&& keys = CSSParser::parseKeyframeSelector(key);
+
+    for (size_t i = m_keyframes.size(); i--; ) {
+        if (m_keyframes[i]->keys() == keys)
             return i;
     }
+
     return -1;
 }