Avoid reparsing keyframe selectors

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
@@ skipping 35 matching lines @@
     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;
 }
 
+String StyleKeyframe::keyText() const
+{
+    size_t keyCount = m_keys.size();
+    if (m_keyText.isEmpty() && keyCount > 0) {
+        StringBuilder keyString;
+        for (size_t i = 0; i < keyCount; ++i) {
+            float key = m_keys[i];
+            if (i)
+                keyString.append(',');
+            keyString.append(String::number(key*100));

[apavlov, 2013/06/18 09:59:50]

whitespace around '*'

+            keyString.append('%');
+        }
+        m_keyText = keyString.toString();
+    }
+    return m_keyText;
+}
+
+void StyleKeyframe::setKeyText(const String& s)
+{
+    m_keys = parseKeyString(m_keyText);
+    if (m_keys.size())
+        m_keyText = s;
+    else
+        m_keyText = String();
+}
+
+void StyleKeyframe::setKeys(const Vector<float>& keys)
+{
+    m_keyText = String();
+    m_keys = keys;
+}
+
 /* static */
-void StyleKeyframe::parseKeyString(const String& s, Vector<float>& keys)
+Vector<float> StyleKeyframe::parseKeyString(const String& s)

[apavlov, 2013/06/18 09:59:50]

Vector's copy ctor performs TypeOperations::uninitializedCopy(), so I would tend
to use an out parameter here, as it used to.

 {
-    keys.clear();
+    Vector<float> keys;
     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)
+            if (k >= 0 && k <= 100) {
                 key = k / 100;
+            } else {
+                keys.clear();
+                return keys;
+            }
         }
-        if (key < 0) {
-            keys.clear();
-            return;
-        }
+
         keys.append(key);
     }
+
+    return keys;
 }
 
 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");
 }
 
 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