Changeset 48992 in webkit

Timestamp:

Oct 1, 2009 12:54:25 PM (15 years ago)

Author:

jorlow@chromium.org

Message:

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

Reviewed by Darin Adler.

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:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/StorageMap.cpp (modified) (3 diffs)
• storage/StorageMap.h (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-30  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        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-10-01  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/storage/StorageMap.cpp

@@ -55 +55 @@
 }
 
-void StorageMap::setIteratorToIndex(unsigned index) const
+void StorageMap::setIteratorToIndex(unsigned index)
 {
     // FIXME: Once we have bidirectional iterators for HashMap we can be more intelligent about this.
@@ -83 +83 @@
 }
 
-String StorageMap::key(unsigned index) const
+String StorageMap::key(unsigned index)
 {
     if (index >= length())
@@ -146 +146 @@
 }
 
-void StorageMap::importItem(const String& key, const String& value) const
+void StorageMap::importItem(const String& key, const String& value)
 {
     // Be sure to copy the keys/values as items imported on a background thread are destined

trunk/WebCore/storage/StorageMap.h

@@ -43 +43 @@
 
         unsigned length() const;
-        String key(unsigned index) const;
+        String key(unsigned index);
         String getItem(const String&) const;
         PassRefPtr<StorageMap> setItem(const String& key, const String& value, String& oldValue);
@@ -50 +50 @@
         bool contains(const String& key) const;
 
-        void importItem(const String& key, const String& value) const;
+        void importItem(const String& key, const String& value);
 
     private:
@@ -56 +56 @@
         PassRefPtr<StorageMap> copy();
         void invalidateIterator();
-        void setIteratorToIndex(unsigned) const;
+        void setIteratorToIndex(unsigned);
 
-        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;
     };