Changeset 144103 in webkit

Timestamp:

Feb 26, 2013, 1:54:50 PM (12 years ago)

Author:

andersca@apple.com

Message:

StorageMap can just import an entire map of items at once
​https://bugs.webkit.org/show_bug.cgi?id=110904

Reviewed by Beth Dakin.

Instead of iterating over the map inside StorageAreaSync, just pass it directly
(through StorageAreaImpl) to StorageMap and iterate over it there.

• storage/StorageAreaImpl.cpp:

(WebCore::StorageAreaImpl::importItems):

• storage/StorageAreaImpl.h:

(StorageAreaImpl):

• storage/StorageAreaSync.cpp:

(WebCore::StorageAreaSync::performImport):

• storage/StorageMap.cpp:

(WebCore::StorageMap::importItems):

• storage/StorageMap.h:

(StorageMap):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• storage/StorageAreaImpl.cpp (modified) (1 diff)
• storage/StorageAreaImpl.h (modified) (2 diffs)
• storage/StorageAreaSync.cpp (modified) (1 diff)
• storage/StorageMap.cpp (modified) (1 diff)
• storage/StorageMap.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Anders Carlsson  <andersca@apple.com>
+
+        StorageMap can just import an entire map of items at once
+        https://bugs.webkit.org/show_bug.cgi?id=110904
+
+        Reviewed by Beth Dakin.
+
+        Instead of iterating over the map inside StorageAreaSync, just pass it directly
+        (through StorageAreaImpl) to StorageMap and iterate over it there.
+
+        * storage/StorageAreaImpl.cpp:
+        (WebCore::StorageAreaImpl::importItems):
+        * storage/StorageAreaImpl.h:
+        (StorageAreaImpl):
+        * storage/StorageAreaSync.cpp:
+        (WebCore::StorageAreaSync::performImport):
+        * storage/StorageMap.cpp:
+        (WebCore::StorageMap::importItems):
+        * storage/StorageMap.h:
+        (StorageMap):
+
 2013-02-26  CHAUDHARY VINEET  <rgf748@motorola.com>
 

trunk/Source/WebCore/storage/StorageAreaImpl.cpp

@@ -271 +271 @@
 }
 
-void StorageAreaImpl::importItem(const String& key, const String& value)
-{
-    ASSERT(!m_isShutdown);
-    m_storageMap->importItem(key, value);
+void StorageAreaImpl::importItems(const HashMap<String, String>& items)
+{
+    ASSERT(!m_isShutdown);
+
+    m_storageMap->importItems(items);
 }
 

trunk/Source/WebCore/storage/StorageAreaImpl.h

@@ -30 +30 @@
 #include "Timer.h"
 
+#include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
@@ -65 +66 @@
 
         // Only called from a background thread.
-        void importItem(const String& key, const String& value);
+        void importItems(const HashMap<String, String>& items);
 
         // Used to clear a StorageArea and close db before backing db file is deleted.

trunk/Source/WebCore/storage/StorageAreaSync.cpp

@@ -342 +342 @@
     }
 
-    HashMap<String, String>::iterator it = itemMap.begin();
-    HashMap<String, String>::iterator end = itemMap.end();
-
-    for (; it != end; ++it)
-        m_storageArea->importItem(it->key, it->value);
+    m_storageArea->importItems(itemMap);
 
     markImported();

trunk/Source/WebCore/storage/StorageMap.cpp

@@ -168 +168 @@
 }
 
-void StorageMap::importItem(const String& key, const String& value)
+void StorageMap::importItems(const HashMap<String, String>& items)
 {
-    // Be sure to copy the keys/values as items imported on a background thread are destined
-    // to cross a thread boundary
-    HashMap<String, String>::AddResult result = m_map.add(key.isolatedCopy(), value.isolatedCopy());
-    ASSERT_UNUSED(result, result.isNewEntry); // True if the key didn't exist previously.
+    for (HashMap<String, String>::const_iterator it = items.begin(), end = items.end(); it != end; ++it) {
+        const String& key = it->key;
+        const String& value = it->value;
 
-    ASSERT(m_currentLength + key.length() >= m_currentLength);
-    m_currentLength += key.length();
-    ASSERT(m_currentLength + value.length() >= m_currentLength);
-    m_currentLength += value.length();
+        HashMap<String, String>::AddResult result = m_map.add(key, value);
+        ASSERT_UNUSED(result, result.isNewEntry); // True if the key didn't exist previously.
+
+        ASSERT(m_currentLength + key.length() >= m_currentLength);
+        m_currentLength += key.length();
+        ASSERT(m_currentLength + value.length() >= m_currentLength);
+        m_currentLength += value.length();
+    }
 }
 

trunk/Source/WebCore/storage/StorageMap.h

@@ -48 +48 @@
         bool contains(const String& key) const;
 
-        void importItem(const String& key, const String& value);
+        void importItems(const HashMap<String, String>&);
 
         unsigned quota() const { return m_quotaSize; }