Changeset 36347 in webkit

Timestamp:

Sep 11, 2008 5:36:31 PM (16 years ago)

Author:

dino@apple.com

Message:

2008-09-08 Chris Marrin <​cmarrin@apple.com>

Reviewed by Dave Hyatt

Need to support comma separated list of key times in keyframes selectors
​https://bugs.webkit.org/show_bug.cgi?id=20680

Test: animations/keyframes-comma-separated.html

• css/CSSGrammar.y:
• css/CSSParser.cpp: (WebCore::CSSParser::createKeyframeRule):
• css/CSSParser.h:
• css/CSSStyleSelector.cpp: (WebCore::CSSStyleSelector::addKeyframeStyle):
• css/WebKitCSSKeyframeRule.cpp: (WebCore::WebKitCSSKeyframeRule::WebKitCSSKeyframeRule): (WebCore::WebKitCSSKeyframeRule::cssText): (WebCore::WebKitCSSKeyframeRule::parseKeyString):
• css/WebKitCSSKeyframeRule.h: (WebCore::WebKitCSSKeyframeRule::keyText): (WebCore::WebKitCSSKeyframeRule::setKeyText): (WebCore::WebKitCSSKeyframeRule::getKeys):
• css/WebKitCSSKeyframesRule.cpp: (WebCore::WebKitCSSKeyframesRule::append): (WebCore::WebKitCSSKeyframesRule::insertRule): (WebCore::WebKitCSSKeyframesRule::deleteRule): (WebCore::WebKitCSSKeyframesRule::findRule): (WebCore::WebKitCSSKeyframesRule::findRuleIndex):
• css/WebKitCSSKeyframesRule.h:
• page/animation/AnimationBase.cpp: (WebCore::AnimationBase::blendProperties):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/animations/keyframes-comma-separated-expected.txt (added)
• LayoutTests/animations/keyframes-comma-separated.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/css/CSSGrammar.y (modified) (2 diffs)
• WebCore/css/CSSParser.cpp (modified) (1 diff)
• WebCore/css/CSSParser.h (modified) (1 diff)
• WebCore/css/CSSStyleSelector.cpp (modified) (4 diffs)
• WebCore/css/WebKitCSSKeyframeRule.cpp (modified) (3 diffs)
• WebCore/css/WebKitCSSKeyframeRule.h (modified) (3 diffs)
• WebCore/css/WebKitCSSKeyframesRule.cpp (modified) (3 diffs)
• WebCore/css/WebKitCSSKeyframesRule.h (modified) (1 diff)
• WebCore/page/animation/AnimationBase.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-09-08  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Dave Hyatt
+
+        Need to support comma separated list of key times in keyframes selectors
+        https://bugs.webkit.org/show_bug.cgi?id=20680
+
+        * animations/keyframes-comma-separated-expected.txt: Added.
+        * animations/keyframes-comma-separated.html: Added.
+
 2008-09-11  Kevin McCullough  <kmccullough@apple.com>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-09-08  Chris Marrin  <cmarrin@apple.com>
+
+        Reviewed by Dave Hyatt
+
+        Need to support comma separated list of key times in keyframes selectors
+        https://bugs.webkit.org/show_bug.cgi?id=20680
+
+        Test: animations/keyframes-comma-separated.html
+
+        * css/CSSGrammar.y:
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::createKeyframeRule):
+        * css/CSSParser.h:
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::addKeyframeStyle):
+        * css/WebKitCSSKeyframeRule.cpp:
+        (WebCore::WebKitCSSKeyframeRule::WebKitCSSKeyframeRule):
+        (WebCore::WebKitCSSKeyframeRule::cssText):
+        (WebCore::WebKitCSSKeyframeRule::parseKeyString):
+        * css/WebKitCSSKeyframeRule.h:
+        (WebCore::WebKitCSSKeyframeRule::keyText):
+        (WebCore::WebKitCSSKeyframeRule::setKeyText):
+        (WebCore::WebKitCSSKeyframeRule::getKeys):
+        * css/WebKitCSSKeyframesRule.cpp:
+        (WebCore::WebKitCSSKeyframesRule::append):
+        (WebCore::WebKitCSSKeyframesRule::insertRule):
+        (WebCore::WebKitCSSKeyframesRule::deleteRule):
+        (WebCore::WebKitCSSKeyframesRule::findRule):
+        (WebCore::WebKitCSSKeyframesRule::findRuleIndex):
+        * css/WebKitCSSKeyframesRule.h:
+        * page/animation/AnimationBase.cpp:
+        (WebCore::AnimationBase::blendProperties):
+
 2008-09-11  Kevin McCullough  <kmccullough@apple.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -217 +217 @@
 %type <keyframeRule> keyframe_rule
 %type <keyframesRule> keyframes_rule
-%type <val> key
+%type <valueList> key_list
+%type <value> key
 
 %type <integer> property
@@ -698 +699 @@
         $$ = $1;
         if ($2)
-            $$->insert($2);
+            $$->append($2);
     }
     ;
 
 keyframe_rule:
-    key maybe_space '{' maybe_space declaration_list '}' {
+    key_list maybe_space '{' maybe_space declaration_list '}' {
         $$ = static_cast<CSSParser*>(parser)->createKeyframeRule($1);
     }
     ;
 
+key_list:
+    key {
+        CSSParser* p = static_cast<CSSParser*>(parser);
+        $$ = p->createFloatingValueList();
+        $$->addValue(p->sinkFloatingValue($1));
+    }
+    | key_list maybe_space ',' maybe_space key {
+        CSSParser* p = static_cast<CSSParser*>(parser);
+        $$ = $1;
+        if ($$)
+            $$->addValue(p->sinkFloatingValue($5));
+    }
+    ;
+
 key:
-    PERCENTAGE { $$ = (float) $1; }
+    PERCENTAGE { $$.id = 0; $$.isInt = false; $$.fValue = $1; $$.unit = CSSPrimitiveValue::CSS_NUMBER; }
     | IDENT {
-        $$ = -1;
+        $$.id = 0; $$.isInt = false; $$.unit = CSSPrimitiveValue::CSS_NUMBER;
         CSSParserString& str = $1;
         if (equalIgnoringCase(static_cast<const String&>(str), "from"))
-            $$ = 0;
+            $$.fValue = 0;
         else if (equalIgnoringCase(static_cast<const String&>(str), "to"))
-            $$ = 100;
+            $$.fValue = 100;
         else
             YYERROR;

trunk/WebCore/css/CSSParser.cpp

@@ -4686 +4686 @@
 }
 
-WebKitCSSKeyframeRule* CSSParser::createKeyframeRule(float key)
-{
+WebKitCSSKeyframeRule* CSSParser::createKeyframeRule(CSSParserValueList* keys)
+{
+    // Create a key string from the passed keys
+    String keyString;
+    for (unsigned i = 0; i < keys->size(); ++i) {
+        float key = (float) keys->valueAt(i)->fValue;
+        if (i != 0)
+            keyString += ",";
+        keyString += String::number(key);
+        keyString += "%";
+    }
+    
     RefPtr<WebKitCSSKeyframeRule> keyframe = WebKitCSSKeyframeRule::create(m_styleSheet);
-
-    keyframe->setKey(key);
+    keyframe->setKeyText(keyString);
     keyframe->setDeclaration(CSSMutableStyleDeclaration::create(0, m_parsedProperties, m_numParsedProperties));
+    
     clearProperties();
 

trunk/WebCore/css/CSSParser.h

@@ -166 +166 @@
         CSSRule* createCharsetRule(const CSSParserString&);
         CSSRule* createImportRule(const CSSParserString&, MediaList*);
-        WebKitCSSKeyframeRule* createKeyframeRule(float key);
+        WebKitCSSKeyframeRule* createKeyframeRule(CSSParserValueList*);
         WebKitCSSKeyframesRule* createKeyframesRule();
         CSSRule* createMediaRule(MediaList*, CSSRuleList*);

trunk/WebCore/css/CSSStyleSelector.cpp

@@ -440 +440 @@
 void CSSStyleSelector::addKeyframeStyle(Document* doc, const WebKitCSSKeyframesRule* rule)
 {
+    // Create the keyframe list
     AtomicString s(rule->name());
     RefPtr<KeyframeList> list;
@@ -450 +451 @@
     list->clear();
 
-    // Make sure there is a 0% and a 100% keyframe
-    if (rule->item(0)->key() || rule->item(rule->length() - 1)->key() != 1)
-        return;
-        
+    // Add all the keyframes
     for (unsigned i = 0; i < rule->length(); ++i) {
         const WebKitCSSKeyframeRule* kf = rule->item(i);
@@ -460 +458 @@
         CSSMutableStyleDeclaration* decl = kf->style();
         DeprecatedValueListConstIterator<CSSProperty> end;
+
+        // Record all the properties in this keyframe
         for (DeprecatedValueListConstIterator<CSSProperty> it = decl->valuesIterator(); it != end; ++it) {
             const CSSProperty& current = *it;
@@ -465 +465 @@
             list->addProperty(current.id());
         }
-        list->insert(kf->key(), *m_style);
+
+        // Add this keyframe to all the indicated key times
+        Vector<float> keys;
+        kf->getKeys(keys);
+
+        for (size_t keyIndex = 0; keyIndex < keys.size(); ++keyIndex) {
+            float key = keys[keyIndex];
+            list->insert(key, *m_style);
+        }
+
         m_style->deref(doc->renderArena());
         m_style = 0;
+    }
+
+    // Make sure there is a 0% and a 100% keyframe
+    float first = list->beginKeyframes()->key;
+    float last = (list->endKeyframes()-1)->key;
+    if (first != 0 || last != 1) {
+        list->clear();
+        return;
     }
 }

trunk/WebCore/css/WebKitCSSKeyframeRule.cpp

@@ -33 +33 @@
 WebKitCSSKeyframeRule::WebKitCSSKeyframeRule(CSSStyleSheet* parent)
     : CSSRule(parent)
-    , m_key(0)
 {
 }
@@ -43 +42 @@
 }
 
-String WebKitCSSKeyframeRule::keyText() const
-{
-    return String::number(m_key) + "%";
-}
-
-void WebKitCSSKeyframeRule::setKeyText(const String& s)
-{
-    m_key = keyStringToFloat(s);
-}
-
 String WebKitCSSKeyframeRule::cssText() const
 {
-    String result = String::number(m_key);
+    String result = m_key;
 
-    result += "% { ";
+    result += " { ";
     result += m_style->cssText();
     result += "}";
@@ -77 +66 @@
 
 /* static */
-float WebKitCSSKeyframeRule::keyStringToFloat(const String& s)
+void WebKitCSSKeyframeRule::parseKeyString(const String& s, Vector<float>& keys)
 {
-    float key = 0;
+    keys.clear();
+    Vector<String> strings;
+    s.split(',', strings);
     
-    // for now the syntax MUST be 'xxx%' or 'from' or 'to', where xxx is a legal floating point number
-    if (s == "from")
-        key = 0;
-    else if (s == "to")
-        key = 100;
-    else {
-        if (s.endsWith("%")) {
-            float k = s.substring(0, s.length() - 1).toFloat();
+    for (size_t i = 0; i < strings.size(); ++i) {
+        float key = -1;
+        String cur = strings[i].stripWhiteSpace();
+    
+        // 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("%")) {
+            float k = cur.substring(0, cur.length() - 1).toFloat();
             if (k >= 0 && k <= 100)
-                key = k;
+                key = k/100;
         }
+        
+        if (key < 0) {
+            keys.clear();
+            return;
+        }
+        else
+            keys.append(key);
     }
-    
-    return key;
 }
 

trunk/WebCore/css/WebKitCSSKeyframeRule.h

@@ -55 +55 @@
     virtual unsigned short type() const { return WEBKIT_KEYFRAME_RULE; }
 
-    String keyText() const;
-    void setKeyText(const String& s);
+    String keyText() const              { return m_key; }
+    void setKeyText(const String& s)    { m_key = s; }
+    
+    void getKeys(Vector<float>& keys) const   { parseKeyString(m_key, keys); }
 
     CSSMutableStyleDeclaration* style() const { return m_style.get(); }
@@ -65 +67 @@
     virtual bool parseString(const String&, bool = false);
     
-    float key() const { return m_key/100; }
-    float keyAsPercent() const { return m_key; }
-
-    void setKey(float k) { m_key = k; }
     void setDeclaration(PassRefPtr<CSSMutableStyleDeclaration>);
 
@@ -74 +72 @@
     const CSSMutableStyleDeclaration*   declaration() const { return m_style.get(); }
     
-    static float keyStringToFloat(const String& s);
- 
 private:
+    static void parseKeyString(const String& s, Vector<float>& keys);
+    
     WebKitCSSKeyframeRule(CSSStyleSheet* parent);
 
     RefPtr<CSSMutableStyleDeclaration> m_style;
-    float m_key;        // 0 to 100
+    String m_key;        // comma separated list of keys
 };
 

trunk/WebCore/css/WebKitCSSKeyframesRule.cpp

@@ -82 +82 @@
 }
 
-void WebKitCSSKeyframesRule::insert(WebKitCSSKeyframeRule* rule)
+void WebKitCSSKeyframesRule::append(WebKitCSSKeyframeRule* rule)
 {
-    float key = rule->keyAsPercent();
-
-    for (unsigned i = 0; i < length(); ++i) {
-        if (item(i)->keyAsPercent() == key) {
-            m_lstCSSRules.get()->deleteRule(i);
-            m_lstCSSRules.get()->insertRule(rule, i);
-            return;
-        }
-        if (item(i)->keyAsPercent() > key) {
-            // insert before
-            m_lstCSSRules.get()->insertRule(rule, i);
-            return;
-        }
-    }
-    
-    // append
     m_lstCSSRules.get()->append(rule);
     stylesheet()->styleSheetChanged();
@@ -109 +93 @@
     RefPtr<CSSRule> newRule = p.parseKeyframeRule(parentStyleSheet(), rule);
     if (newRule.get() && newRule.get()->isKeyframeRule())
-        insert(static_cast<WebKitCSSKeyframeRule*>(newRule.get()));
+        append(static_cast<WebKitCSSKeyframeRule*>(newRule.get()));
 }
 
 void WebKitCSSKeyframesRule::deleteRule(const String& s)
 {
-    float key = WebKitCSSKeyframeRule::keyStringToFloat(s);
-    int i = findRuleIndex(key);
+    int i = findRuleIndex(s);
     if (i >= 0) {
         m_lstCSSRules.get()->deleteRule(i);
@@ -124 +107 @@
 WebKitCSSKeyframeRule* WebKitCSSKeyframesRule::findRule(const String& s)
 {
-    float key = WebKitCSSKeyframeRule::keyStringToFloat(s);
-    int i = findRuleIndex(key);
+    int i = findRuleIndex(s);
     return (i >= 0) ? item(i) : 0;
 }
 
-int WebKitCSSKeyframesRule::findRuleIndex(float key) const
+int WebKitCSSKeyframesRule::findRuleIndex(const String& key) const
 {
     for (unsigned i = 0; i < length(); ++i) {
-        if (item(i)->keyAsPercent() == key)
+        if (item(i)->keyText() == key)
             return i;
     }

trunk/WebCore/css/WebKitCSSKeyframesRule.h

@@ -73 +73 @@
     WebKitCSSKeyframeRule*        item(unsigned index);
     const WebKitCSSKeyframeRule*  item(unsigned index) const;
-    void insert(WebKitCSSKeyframeRule* rule);
+    void append(WebKitCSSKeyframeRule* rule);
 
 private:
     WebKitCSSKeyframesRule(CSSStyleSheet* parent);
 
-    int findRuleIndex(float key) const;
+    int findRuleIndex(const String& key) const;
     
     RefPtr<CSSRuleList> m_lstCSSRules;

trunk/WebCore/page/animation/AnimationBase.cpp

@@ -419 +419 @@
     ASSERT(prop != cAnimateAll);
     // FIXME: Why can this happen?
+    
+    ensurePropertyMap();
     if (prop == cAnimateAll) {
         bool needsTimer = false;