Re-use CSSParser logic to parse keyframe keys

Source/core/css/CSSKeyframeRule.h

 /*
  * 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 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef CSSKeyframeRule_h
 #define CSSKeyframeRule_h
 
 #include "core/css/CSSRule.h"
 
 namespace WebCore {
 
+class CSSKeyframesRule;
+class CSSParserValueList;
 class CSSStyleDeclaration;
 class MutableStylePropertySet;
 class StylePropertySet;
 class StyleRuleCSSStyleDeclaration;
-class CSSKeyframesRule;
 
 class StyleKeyframe FINAL : public RefCounted<StyleKeyframe> {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassRefPtr<StyleKeyframe> create()
     {
         return adoptRef(new StyleKeyframe());
     }
     ~StyleKeyframe();
 
-    String keyText() const { return m_key; }
-    // FIXME: Should we trim whitespace?
-    // FIXME: Should we leave keyText unchanged when attempting to set to an
-    // invalid string?
-    void setKeyText(const String& s) { m_key = s; }
+    // Exposed to JavaScript.
+    String keyText() const;
+    void setKeyText(const String&);
 
-    void getKeys(Vector<double>& keys) const { parseKeyString(m_key, keys); }
+    // Used by StyleResolver.
+    const Vector<double>& keys() const;
+    // Used by CSSParser when constructing a new StyleKeyframe.
+    void setKeys(PassOwnPtr<Vector<double> >);
 
     const StylePropertySet* properties() const { return m_properties.get(); }
     MutableStylePropertySet* mutableProperties();
     void setProperties(PassRefPtr<StylePropertySet>);
 
     String cssText() const;
 
+    static PassOwnPtr<Vector<double> > createKeyList(CSSParserValueList*);
+
 private:
     StyleKeyframe();
 
-    static void parseKeyString(const String&, Vector<double>& keys);
-
     RefPtr<StylePropertySet> m_properties;
-    // FIXME: This should be a parsed vector of floats.
-    // comma separated list of keys
-    String m_key;
+    // These are both calculated lazily. Either one can be set, which invalidates the other.
+    mutable String m_keyText;
+    mutable OwnPtr<Vector<double> > m_keys;
 };
 
 class CSSKeyframeRule FINAL : public CSSRule {
 public:
     virtual ~CSSKeyframeRule();
 
     virtual CSSRule::Type type() const OVERRIDE { return KEYFRAME_RULE; }
     virtual String cssText() const OVERRIDE { return m_keyframe->cssText(); }
     virtual void reattach(StyleRuleBase*) OVERRIDE;
 
     String keyText() const { return m_keyframe->keyText(); }
     void setKeyText(const String& s) { m_keyframe->setKeyText(s); }
 
     CSSStyleDeclaration* style() const;
 
 private:
     CSSKeyframeRule(StyleKeyframe*, CSSKeyframesRule* parent);
 
     RefPtr<StyleKeyframe> m_keyframe;
     mutable RefPtr<StyleRuleCSSStyleDeclaration> m_propertiesCSSOMWrapper;
 
     friend class CSSKeyframesRule;
 };
 
 } // namespace WebCore
 
 #endif // CSSKeyframeRule_h