Make SpaceSplitStringData private and rename to Data

Source/core/dom/SpaceSplitString.cpp

 /*
  * Copyright (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 35 matching lines @@
 static inline bool hasNonASCIIOrUpper(const String& string)
 {
     unsigned length = string.length();
 
     if (string.is8Bit())
         return hasNonASCIIOrUpper(string.characters8(), length);
     return hasNonASCIIOrUpper(string.characters16(), length);
 }
 
 template <typename CharacterType>
-inline void SpaceSplitStringData::createVector(const CharacterType* characters, unsigned length)
+inline void SpaceSplitString::Data::createVector(const CharacterType* characters, unsigned length)
 {
     unsigned start = 0;
     while (true) {
         while (start < length && isHTMLSpace<CharacterType>(characters[start]))
             ++start;
         if (start >= length)
             break;
         unsigned end = start + 1;
         while (end < length && isNotHTMLSpace<CharacterType>(characters[end]))
             ++end;
 
         m_vector.append(AtomicString(characters + start, end - start));
 
         start = end + 1;
     }
 }
 
-void SpaceSplitStringData::createVector(const String& string)
+void SpaceSplitString::Data::createVector(const String& string)
 {
     unsigned length = string.length();
 
     if (string.is8Bit()) {
         createVector(string.characters8(), length);
         return;
     }
 
     createVector(string.characters16(), length);
 }
 
-bool SpaceSplitStringData::containsAll(SpaceSplitStringData& other)
+bool SpaceSplitString::Data::containsAll(Data& other)
 {
     if (this == &other)
         return true;
 
     size_t thisSize = m_vector.size();
     size_t otherSize = other.m_vector.size();
     for (size_t i = 0; i < otherSize; ++i) {
         const AtomicString& name = other.m_vector[i];
         size_t j;
         for (j = 0; j < thisSize; ++j) {
             if (m_vector[j] == name)
                 break;
         }
         if (j == thisSize)
             return false;
     }
     return true;
 }
 
-void SpaceSplitStringData::add(const AtomicString& string)
+void SpaceSplitString::Data::add(const AtomicString& string)
 {
     ASSERT(hasOneRef());
     ASSERT(!contains(string));
     m_vector.append(string);
 }
 
-void SpaceSplitStringData::remove(unsigned index)
+void SpaceSplitString::Data::remove(unsigned index)
 {
     ASSERT(hasOneRef());
     m_vector.remove(index);
 }
 
 void SpaceSplitString::add(const AtomicString& string)
 {
     // FIXME: add() does not allow duplicates but createVector() does.
     if (contains(string))
         return;
@@ skipping 14 matching lines @@
                 ensureUnique();
             m_data->remove(i);
             changed = true;
             continue;
         }
         ++i;
     }
     return changed;
 }
 
-typedef HashMap<AtomicString, SpaceSplitStringData*> SpaceSplitStringDataMap;
-
-static SpaceSplitStringDataMap& sharedDataMap()
+SpaceSplitString::DataMap& SpaceSplitString::sharedDataMap()
 {
-    DEFINE_STATIC_LOCAL(SpaceSplitStringDataMap, map, ());
+    DEFINE_STATIC_LOCAL(DataMap, map, ());
     return map;
 }
 
 void SpaceSplitString::set(const AtomicString& inputString, bool shouldFoldCase)
 {
     if (inputString.isNull()) {
         clear();
         return;
     }
 
     String string(inputString.string());
     if (shouldFoldCase && hasNonASCIIOrUpper(string))
         string = string.foldCase();
 
-    m_data = SpaceSplitStringData::create(AtomicString(string));
+    m_data = Data::create(AtomicString(string));
 }
 
-SpaceSplitStringData::~SpaceSplitStringData()
+SpaceSplitString::Data::~Data()
 {
     if (!m_keyString.isNull())
         sharedDataMap().remove(m_keyString);
 }
 
-PassRefPtr<SpaceSplitStringData> SpaceSplitStringData::create(const AtomicString& string)
+PassRefPtr<SpaceSplitString::Data> SpaceSplitString::Data::create(const AtomicString& string)
 {
-    SpaceSplitStringData*& data = sharedDataMap().add(string, 0).storedValue->value;
+    Data*& data = sharedDataMap().add(string, 0).storedValue->value;
     if (!data) {
-        data = new SpaceSplitStringData(string);
+        data = new Data(string);
         return adoptRef(data);
     }
     return data;
 }
 
-PassRefPtr<SpaceSplitStringData> SpaceSplitStringData::createUnique(const SpaceSplitStringData& other)
+PassRefPtr<SpaceSplitString::Data> SpaceSplitString::Data::createUnique(const Data& other)
 {
-    return adoptRef(new SpaceSplitStringData(other));
+    return adoptRef(new SpaceSplitString::Data(other));
 }
 
-SpaceSplitStringData::SpaceSplitStringData(const AtomicString& string)
+SpaceSplitString::Data::Data(const AtomicString& string)
     : m_keyString(string)
 {
     ASSERT(!string.isNull());
     createVector(string);
 }
 
-SpaceSplitStringData::SpaceSplitStringData(const SpaceSplitStringData& other)
-    : RefCounted<SpaceSplitStringData>()
+SpaceSplitString::Data::Data(const SpaceSplitString::Data& other)
+    : RefCounted<Data>()
     , m_vector(other.m_vector)
 {
     // Note that we don't copy m_keyString to indicate to the destructor that there's nothing
     // to be removed from the sharedDataMap().
 }
 
 } // namespace blink