| Index: Source/core/html/FormController.cpp
|
| diff --git a/Source/core/html/FormController.cpp b/Source/core/html/FormController.cpp
|
| index dc05f48132b91b7b384db904cef47f3cbf071a94..5b2ff3cace0f6bb83fa6893aa99f599c0ee3e79f 100644
|
| --- a/Source/core/html/FormController.cpp
|
| +++ b/Source/core/html/FormController.cpp
|
| @@ -82,13 +82,13 @@ FormControlState FormControlState::deserialize(const Vector<String>& stateVector
|
|
|
| class FormElementKey {
|
| public:
|
| - FormElementKey(AtomicStringImpl* = 0, AtomicStringImpl* = 0);
|
| + FormElementKey(StringImpl* = 0, StringImpl* = 0);
|
| ~FormElementKey();
|
| FormElementKey(const FormElementKey&);
|
| FormElementKey& operator=(const FormElementKey&);
|
|
|
| - AtomicStringImpl* name() const { return m_name; }
|
| - AtomicStringImpl* type() const { return m_type; }
|
| + StringImpl* name() const { return m_name; }
|
| + StringImpl* type() const { return m_type; }
|
|
|
| // Hash table deleted values, which are only constructed and never copied or destroyed.
|
| FormElementKey(WTF::HashTableDeletedValueType) : m_name(hashTableDeletedValue()) { }
|
| @@ -98,13 +98,13 @@ private:
|
| void ref() const;
|
| void deref() const;
|
|
|
| - static AtomicStringImpl* hashTableDeletedValue() { return reinterpret_cast<AtomicStringImpl*>(-1); }
|
| + static StringImpl* hashTableDeletedValue() { return reinterpret_cast<StringImpl*>(-1); }
|
|
|
| - AtomicStringImpl* m_name;
|
| - AtomicStringImpl* m_type;
|
| + StringImpl* m_name;
|
| + StringImpl* m_type;
|
| };
|
|
|
| -FormElementKey::FormElementKey(AtomicStringImpl* name, AtomicStringImpl* type)
|
| +FormElementKey::FormElementKey(StringImpl* name, StringImpl* type)
|
| : m_name(name)
|
| , m_type(type)
|
| {
|
| @@ -415,7 +415,7 @@ Vector<String> FormController::formElementsState() const
|
| stateVector.reserveInitialCapacity(m_formElementsWithState.size() * 4);
|
| stateVector.append(formStateSignature());
|
| for (SavedFormStateMap::const_iterator it = stateMap->begin(); it != stateMap->end(); ++it) {
|
| - stateVector.append(it->key.get());
|
| + stateVector.append(it->key);
|
| it->value->serializeTo(stateVector);
|
| }
|
| bool hasOnlySignature = stateVector.size() == 1;
|
|
|