Changeset 179197 in webkit for trunk/Source/WebCore/css/CSSKeyframeRule.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/CSSKeyframeRule.cpp (modified) (1 diff)

trunk/Source/WebCore/css/CSSKeyframeRule.cpp

@@ -50 +50 @@
 }
 
-/* static */
-void StyleKeyframe::parseKeyString(const String& s, Vector<double>& keys)
+String StyleKeyframe::keyText() const
 {
-    keys.clear();
-    Vector<String> strings;
-    s.split(',', strings);
+    StringBuilder keyText;
 
-    for (size_t i = 0; i < strings.size(); ++i) {
-        double key = -1;
-        String cur = strings[i].stripWhiteSpace();
+    for (size_t i = 0; i < m_keys.size(); ++i) {
+        if (i)
+            keyText.append(',');
+        keyText.appendNumber(m_keys.at(i) * 100);
+        keyText.append('%');
+    }
 
-        // For now the syntax MUST be 'xxx%' or 'from' or 'to', where xxx is a legal floating point number
-        if (cur == "from")
-            key = 0;
-        else if (cur == "to")
-            key = 1;
-        else if (cur.endsWith('%')) {
-            double k = cur.substring(0, cur.length() - 1).toDouble();
-            if (k >= 0 && k <= 100)
-                key = k / 100;
-        }
-        if (key < 0) {
-            keys.clear();
-            return;
-        }
-        keys.append(key);
-    }
+    return keyText.toString();
 }