Changeset 109610 in webkit

Timestamp:

Mar 2, 2012 1:40:54 PM (12 years ago)

Author:

igor.o@sisa.samsung.com

Message:

animation-timing-function falls back to ease when overriding animation-name
​https://bugs.webkit.org/show_bug.cgi?id=71623

Source/WebCore:

In this patch the animation name needs to be the first value declared, if
a different value is found, we do not check for the animation name again.

Reviewed by Dean Jackson.

Test: animations/animation-shorthand-overriding.html

• css/CSSParser.cpp:

(WebCore::CSSParser::parseAnimationShorthand):

LayoutTests:

Add a test to verify if the override the animation-name property works when the parent
animation did not set the animation name.

Reviewed by Dean Jackson.

• animations/animation-shorthand-overriding-expected.txt: Added.
• animations/animation-shorthand-overriding.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/animation-shorthand-overriding-expected.txt (added)
• LayoutTests/animations/animation-shorthand-overriding.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-02  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        animation-timing-function falls back to ease when overriding animation-name
+        https://bugs.webkit.org/show_bug.cgi?id=71623
+
+        Add a test to verify if the override the animation-name property works when the parent
+        animation did not set the animation name.
+
+        Reviewed by Dean Jackson.
+
+        * animations/animation-shorthand-overriding-expected.txt: Added.
+        * animations/animation-shorthand-overriding.html: Added.
+
 2012-03-02  Mike Reed  <reed@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-02  Igor Oliveira  <igor.o@sisa.samsung.com>
+
+        animation-timing-function falls back to ease when overriding animation-name
+        https://bugs.webkit.org/show_bug.cgi?id=71623
+
+        In this patch the animation name needs to be the first value declared, if
+        a different value is found, we do not check for the animation name again.  
+
+        Reviewed by Dean Jackson.
+
+        Test: animations/animation-shorthand-overriding.html
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseAnimationShorthand):
+
 2012-03-02  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -2575 +2575 @@
 
     int i;
+    int initialParsedPropertyIndex = 0;
     while (m_valueList->current()) {
         CSSParserValue* val = m_valueList->current();
         if (val->unit == CSSParserValue::Operator && val->iValue == ',') {
             // We hit the end.  Fill in all remaining values with the initial value.
+            initialParsedPropertyIndex = 0;
             m_valueList->next();
             for (i = 0; i < numProperties; ++i) {
@@ -2590 +2592 @@
 
         bool found = false;
-        for (i = 0; !found && i < numProperties; ++i) {
+        for (i = initialParsedPropertyIndex; !found && i < numProperties; ++i) {
             if (!parsedProperty[i]) {
                 RefPtr<CSSValue> val;
                 if (parseAnimationProperty(properties[i], val)) {
                     parsedProperty[i] = found = true;
+                    initialParsedPropertyIndex = 1;
                     addAnimationValue(values[i], val.release());
                 }