WebCore/ChangeLog

2009-09-30  Jeremy Orlow  <jorlow@chromium.org>

        Reviewed by NOBODY (OOPS!).

        Clean up use of const and mutable in StorageMap

        https://bugs.webkit.org/show_bug.cgi?id=29933

        What's the point of having every single member variable be mutable and nearly

        every method be const?  Let's clean it up.

        * storage/StorageMap.cpp:

        (WebCore::StorageMap::setIteratorToIndex):

        (WebCore::StorageMap::key):

        (WebCore::StorageMap::importItem):

        * storage/StorageMap.h:

2009-09-21  Jeremy Orlow  <jorlow@chromium.org>

        Reviewed by Adam Barth.

48939

WebCore/storage/StorageMap.cpp

@@void StorageMap::invalidateIterator()

    m_iteratorIndex = UINT_MAX;

}

57 void StorageMap::setIteratorToIndex(unsigned index) ~~const~~

57void StorageMap::setIteratorToIndex(unsigned index)

{

    // FIXME: Once we have bidirectional iterators for HashMap we can be more intelligent about this.

    // The requested index will be closest to begin(), our current iterator, or end(), and we

@@unsigned StorageMap::length() const

    return m_map.size();

}

85 String StorageMap::key(unsigned index) ~~const~~

85String StorageMap::key(unsigned index)

{

    if (index >= length())

        return String();

@@bool StorageMap::contains(const String&

    return m_map.contains(key);

}

148 void StorageMap::importItem(const String& key, const String& value) ~~const~~

148void StorageMap::importItem(const String& key, const String& value)

{

    // Be sure to copy the keys/values as items imported on a background thread are destined

    // to cross a thread boundary

48912

WebCore/storage/StorageMap.h

@@namespace WebCore {

        static PassRefPtr<StorageMap> create();

        unsigned length() const;

45 String key(unsigned index) ~~const~~;

45 String key(unsigned index);

        String getItem(const String&) const;

        PassRefPtr<StorageMap> setItem(const String& key, const String& value, String& oldValue);

        PassRefPtr<StorageMap> removeItem(const String&, String& oldValue);

        bool contains(const String& key) const;

52 void importItem(const String& key, const String& value) ~~const~~;

52 void importItem(const String& key, const String& value);

    private:

        StorageMap();

        PassRefPtr<StorageMap> copy();

        void invalidateIterator();

58 void setIteratorToIndex(unsigned) ~~const~~;

58 void setIteratorToIndex(unsigned);

5959

        mutable HashMap<String, String> m_map;

        mutable HashMap<String, String>::iterator m_iterator;

        mutable unsigned m_iteratorIndex;

        HashMap<String, String> m_map;

        HashMap<String, String>::iterator m_iterator;

        unsigned m_iteratorIndex;

    };

} // namespace WebCore

48912