Re-use CSSParser logic to parse keyframe keys

Source/core/css/CSSParser-in.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 82 matching lines @@
 
 #if YYDEBUG > 0
 extern int cssyydebug;
 #endif
 
 extern int cssyyparse(WebCore::CSSParser*);
 
 using namespace std;
 using namespace WTF;
 
+namespace {
+
+PassOwnPtr<Vector<float> > createKeyframeKeyList(WebCore::CSSParserValueList* keys)

[apavlov, 2013/07/15 11:54:37]

Looks like this should actually belong to StyleKeyframe...

[Steve Block, 2013/08/14 00:44:05]

Done

+{
+    OwnPtr<Vector<float> > keyVector = adoptPtr(new Vector<float>(keys->size()));
+    for (unsigned i = 0; i < keys->size(); ++i) {
+        ASSERT(keys->valueAt(i)->unit == WebCore::CSSPrimitiveValue::CSS_NUMBER);
+        float key = static_cast<float>(keys->valueAt(i)->fValue);
+        if (key < 0 || key > 100) {
+            // As per http://www.w3.org/TR/css3-animations/#keyframes,
+            // "If a keyframe selector specifies negative percentage values
+            // or values higher than 100%, then the keyframe will be ignored."
+            keyVector->clear();
+            break;
+        }
+        keyVector->at(i) = key;
+    }
+    return keyVector.release();
+}
+
+} // namespace
+
 namespace WebCore {
 
 static const unsigned INVALID_NUM_PARSED_PROPERTIES = UINT_MAX;
 static const double MAX_SCALE = 1000000;
 
 template <unsigned N>
 static bool equal(const CSSParserString& a, const char (&b)[N])
 {
     unsigned length = N - 1; // Ignore the trailing null character
     if (a.length() != length)
@@ skipping 272 matching lines @@
 }
 
 PassRefPtr<StyleKeyframe> CSSParser::parseKeyframeRule(StyleSheetContents* sheet, const String& string)
 {
     setStyleSheet(sheet);
     setupParser("@-internal-keyframe-rule ", string, "");
     cssyyparse(this);
     return m_keyframe.release();
 }
 
+PassOwnPtr<Vector<float> > CSSParser::parseKeyframeKeyList(const String& string)
+{
+    setupParser("@-internal-keyframe-key-list ", string, "");
+    cssyyparse(this);
+    ASSERT(m_valueList);
+    return createKeyframeKeyList(m_valueList.get());
+}
+
 bool CSSParser::parseSupportsCondition(const String& string)
 {
     m_supportsCondition = false;
     setupParser("@-internal-supports-condition ", string, "");
     cssyyparse(this);
     return m_supportsCondition;
 }
 
 static inline bool isColorPropertyID(CSSPropertyID propertyId)
 {
@@ skipping 932 matching lines @@
 
 PassRefPtr<MediaQuerySet> CSSParser::parseMediaQueryList(const String& string)
 {
     ASSERT(!m_mediaList);
 
     // can't use { because tokenizer state switches from mediaquery to initial state when it sees { token.
     // instead insert one " " (which is caught by maybe_space in CSSGrammar.y)
     setupParser("@-internal-medialist ", string, "");
     cssyyparse(this);
 
-    ASSERT(m_mediaList.get());
+    ASSERT(m_mediaList);
     return m_mediaList.release();
 }
 
 static inline void filterProperties(bool important, const CSSParser::ParsedPropertyVector& input, Vector<CSSProperty, 256>& output, size_t& unusedEntries, BitArray<numCSSProperties>& seenProperties, HashSet<AtomicString>& seenVariables)
 {
     // Add properties in reverse order so that highest priority definitions are reached first. Duplicate definitions can then be ignored when found.
     for (int i = input.size() - 1; i >= 0; --i) {
         const CSSProperty& property = input[i];
         if (property.isImportant() != important)
             continue;
@@ skipping 8820 matching lines @@
                 m_parsingMode = MediaQueryMode;
                 m_token = INTERNAL_MEDIALIST_SYM;
             }
             return;
 
         case 24:
             if (!hasEscape && isEqualToCSSIdentifier(name + 2, "internal-keyframe-rule"))
                 m_token = INTERNAL_KEYFRAME_RULE_SYM;
             return;
 
+        case 28:
+            if (isEqualToCSSIdentifier(name + 2, "internal-keyframe-key-list"))
+                m_token = INTERNAL_KEYFRAME_KEY_LIST_SYM;
+            return;
+
         case 29:
             if (isEqualToCSSIdentifier(name + 2, "internal-supports-condition")) {
                 m_parsingMode = SupportsMode;
                 m_token = INTERNAL_SUPPORTS_CONDITION_SYM;
             }
             return;
         }
     }
 }
 
@@ skipping 1071 matching lines @@
         if (property.id() == CSSPropertyFontVariant && property.value()->isValueList()) {
             m_parsedProperties.remove(i);
             continue;
         }
         ++i;
     }
 }
 
 StyleKeyframe* CSSParser::createKeyframe(CSSParserValueList* keys)
 {
-    // Create a key string from the passed keys
-    StringBuilder keyString;
-    for (unsigned i = 0; i < keys->size(); ++i) {
-        ASSERT(keys->valueAt(i)->unit == CSSPrimitiveValue::CSS_NUMBER);
-        float key = static_cast<float>(keys->valueAt(i)->fValue);
-        if (key < 0 || key > 100) {
-            // As per http://www.w3.org/TR/css3-animations/#keyframes,
-            // "If a keyframe selector specifies negative percentage values
-            // or values higher than 100%, then the keyframe will be ignored."
-            clearProperties();
-            return 0;
-        }
-        if (i != 0)
-            keyString.append(',');
-        keyString.append(String::number(key));
-        keyString.append('%');
-    }
+    OwnPtr<Vector<float> > keyVector = createKeyframeKeyList(keys);
+    if (keyVector->isEmpty())
+        return 0;
 
     RefPtr<StyleKeyframe> keyframe = StyleKeyframe::create();
-    keyframe->setKeyText(keyString.toString());
+    keyframe->setKeys(keyVector.release());
     keyframe->setProperties(createStylePropertySet());
 
     clearProperties();
 
     StyleKeyframe* keyframePtr = keyframe.get();
     m_parsedKeyframes.append(keyframe.release());
     return keyframePtr;
 }
 
 void CSSParser::invalidBlockHit()
@@ skipping 412 matching lines @@
 {
     // The tokenizer checks for the construct of an+b.
     // However, since the {ident} rule precedes the {nth} rule, some of those
     // tokens are identified as string literal. Furthermore we need to accept
     // "odd" and "even" which does not match to an+b.
     return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
         || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
 }
 
 }