Re-use CSSParser logic to parse keyframe keys

Source/core/css/CSSKeyframeRule.cpp

 /*
  * Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/CSSKeyframeRule.h"
 
 #include "core/css/CSSKeyframesRule.h"
+#include "core/css/CSSParser.h"
 #include "core/css/PropertySetCSSStyleDeclaration.h"
 #include "core/css/StylePropertySet.h"
+#include "wtf/MemoryInstrumentationVector.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace WebCore {
 
 StyleKeyframe::StyleKeyframe()
 {
 }
 
 StyleKeyframe::~StyleKeyframe()
 {
 }
 
+String StyleKeyframe::keyText() const
+{
+    if (m_keyText.isNull()) {
+        StringBuilder keyText;
+        for (unsigned i = 0; i < m_keys->size(); ++i) {
+            if (i)
+                keyText.append(',');
+            keyText.append(String::number(m_keys->at(i)));
+            keyText.append('%');
+        }
+        m_keyText = keyText.toString();
+    }
+    return m_keyText;
+}
+
+void StyleKeyframe::setKeyText(const String& keyText)
+{
+    // FIXME: Should we trim whitespace?
+    // FIXME: Should we leave keyText unchanged when attempting to set to an
+    // invalid string?
+    m_keyText = keyText;
+    m_keys.clear();
+}
+
+const Vector<float>& StyleKeyframe::keys() const
+{
+    if (!m_keys) {

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

The braces are optional here

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

No longer relevant

+        m_keys = CSSParser(CSSStrictMode).parseKeyframeKeyList(m_keyText);
+    }
+    // If an invalid key string was set, m_keys may be empty.
+    ASSERT(m_keys);
+    return *m_keys;
+}
+
+void StyleKeyframe::setKeys(PassOwnPtr<Vector<float> > keys)
+{
+    ASSERT(keys && !keys->isEmpty());
+    m_keys = keys;
+    m_keyText = String();
+    ASSERT(m_keyText.isNull());
+}
+
 MutableStylePropertySet* StyleKeyframe::mutableProperties()
 {
     if (!m_properties->isMutable())
         m_properties = m_properties->mutableCopy();
     return static_cast<MutableStylePropertySet*>(m_properties.get());
 }
 
 void StyleKeyframe::setProperties(PassRefPtr<StylePropertySet> properties)
 {
     m_properties = properties;
 }
 
-/* static */
-void StyleKeyframe::parseKeyString(const String& s, Vector<float>& keys)
-{
-    keys.clear();
-    Vector<String> strings;
-    s.split(',', strings);
-
-    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 / 100;
-        }
-        if (key < 0) {
-            keys.clear();
-            return;
-        }
-        keys.append(key);
-    }
-}
-
 String StyleKeyframe::cssText() const
 {
     StringBuilder result;
     result.append(keyText());
     result.appendLiteral(" { ");
     String decls = m_properties->asText();
     result.append(decls);
     if (!decls.isEmpty())
         result.append(' ');
     result.append('}');
     return result.toString();
 }
 
 void StyleKeyframe::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
 {
     MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
     info.addMember(m_properties, "properties");
-    info.addMember(m_key, "key");
+    info.addMember(m_keyText, "keyText");
+    info.addMember(m_keys, "keys");
 }
 
 CSSKeyframeRule::CSSKeyframeRule(StyleKeyframe* keyframe, CSSKeyframesRule* parent)
     : CSSRule(0)
     , m_keyframe(keyframe)
 {
     setParentRule(parent);
 }
 
 CSSKeyframeRule::~CSSKeyframeRule()
@@ skipping 17 matching lines @@
     info.addMember(m_propertiesCSSOMWrapper, "propertiesCSSOMWrapper");
 }
 
 void CSSKeyframeRule::reattach(StyleRuleBase*)
 {
     // No need to reattach, the underlying data is shareable on mutation.
     ASSERT_NOT_REACHED();
 }
 
 } // namespace WebCore