Changeset 148160 in webkit

Timestamp:

Apr 10, 2013 6:03:03 PM (11 years ago)

Author:

andersca@apple.com

Message:

Rename StorageManager messages to refer to the StorageMap instead of the StorageArea
​https://bugs.webkit.org/show_bug.cgi?id=114401

Reviewed by Ryosuke Niwa.

• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::createStorageMap):
(WebKit::StorageManager::destroyStorageMap):
(WebKit::StorageManager::setItem):

• UIProcess/Storage/StorageManager.h:
• UIProcess/Storage/StorageManager.messages.in:
• WebProcess/Storage/StorageAreaImpl.cpp:

(WebKit::StorageAreaImpl::StorageAreaImpl):
(WebKit::StorageAreaImpl::~StorageAreaImpl):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (4 diffs)
• UIProcess/Storage/StorageManager.h (modified) (1 diff)
• UIProcess/Storage/StorageManager.messages.in (modified) (1 diff)
• WebProcess/Storage/StorageAreaImpl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-10  Anders Carlsson  <andersca@apple.com>
+
+        Rename StorageManager messages to refer to the StorageMap instead of the StorageArea
+        https://bugs.webkit.org/show_bug.cgi?id=114401
+
+        Reviewed by Ryosuke Niwa.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::createStorageMap):
+        (WebKit::StorageManager::destroyStorageMap):
+        (WebKit::StorageManager::setItem):
+        * UIProcess/Storage/StorageManager.h:
+        * UIProcess/Storage/StorageManager.messages.in:
+        * WebProcess/Storage/StorageAreaImpl.cpp:
+        (WebKit::StorageAreaImpl::StorageAreaImpl):
+        (WebKit::StorageAreaImpl::~StorageAreaImpl):
+
 2013-04-10  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp

@@ -213 +213 @@
 }
 
-void StorageManager::createStorageArea(CoreIPC::Connection* connection, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
-{
-    std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageAreaIDPair(connection, storageAreaID);
-
-    // FIXME: This should be a message check.
-    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageAreaIDPair)));
-
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreas.add(connectionAndStorageAreaIDPair, 0);
+void StorageManager::createStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
+{
+    std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+
+    // FIXME: This should be a message check.
+    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair)));
+
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreas.add(connectionAndStorageMapIDPair, 0);
 
     // FIXME: This should be a message check.
@@ -238 +238 @@
 
     RefPtr<StorageArea> storageArea = sessionStorageNamespace->getOrCreateStorageArea(securityOriginData.securityOrigin());
-    storageArea->addListener(connection, storageAreaID);
+    storageArea->addListener(connection, storageMapID);
 
     result.iterator->value = storageArea.release();
 }
 
-void StorageManager::destroyStorageArea(CoreIPC::Connection* connection, uint64_t storageAreaID)
-{
-    std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageAreaIDPair(connection, storageAreaID);
-
-    // FIXME: This should be a message check.
-    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageAreaIDPair)));
-
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::iterator it = m_storageAreas.find(connectionAndStorageAreaIDPair);
+void StorageManager::destroyStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID)
+{
+    std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageMapIDPair(connection, storageMapID);
+
+    // FIXME: This should be a message check.
+    ASSERT((HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::isValidKey(connectionAndStorageMapIDPair)));
+
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::iterator it = m_storageAreas.find(connectionAndStorageMapIDPair);
 
     // FIXME: This should be a message check.
     ASSERT(it != m_storageAreas.end());
 
-    it->value->removeListener(connection, storageAreaID);
-
-    m_storageAreas.remove(connectionAndStorageAreaIDPair);
+    it->value->removeListener(connection, storageMapID);
+
+    m_storageAreas.remove(connectionAndStorageMapIDPair);
 }
 
@@ -265 +265 @@
 }
 
-void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageAreaID, const String& key, const String& value, const String& urlString)
-{
-    StorageArea* storageArea = findStorageArea(connection, storageAreaID);
+void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageMapID, const String& key, const String& value, const String& urlString)
+{
+    StorageArea* storageArea = findStorageArea(connection, storageMapID);
 
     // FIXME: This should be a message check.
@@ -273 +273 @@
 
     bool quotaError;
-    storageArea->setItem(connection, storageAreaID, key, value, urlString, quotaError);
-    connection->send(Messages::StorageAreaMap::DidSetItem(key, quotaError), storageAreaID);
+    storageArea->setItem(connection, storageMapID, key, value, urlString, quotaError);
+    connection->send(Messages::StorageAreaMap::DidSetItem(key, quotaError), storageMapID);
 }
 

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h

@@ -60 +60 @@
 
     // Message handlers.
-    void createStorageArea(CoreIPC::Connection*, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData&);
-    void destroyStorageArea(CoreIPC::Connection*, uint64_t storageAreaID);
-    void getValues(CoreIPC::Connection*, uint64_t storageAreaID, HashMap<String, String>& values);
+    void createStorageMap(CoreIPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
+    void destroyStorageMap(CoreIPC::Connection*, uint64_t storageMapID);
+    void getValues(CoreIPC::Connection*, uint64_t storageMapID, HashMap<String, String>& values);
     void setItem(CoreIPC::Connection*, uint64_t storageAreaID, const String& key, const String& value, const String& urlString);
 

trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in

@@ -22 +22 @@
 
 messages -> StorageManager {
-    CreateStorageArea(uint64_t storageAreaID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
-    DestroyStorageArea(uint64_t storageAreaID) WantsConnection
+    CreateStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
+    DestroyStorageMap(uint64_t storageMapID) WantsConnection
 
-    GetValues(uint64_t storageAreaID) -> (WTF::HashMap<WTF::String, WTF::String> values) WantsConnection
+    GetValues(uint64_t storageMapID) -> (WTF::HashMap<WTF::String, WTF::String> values) WantsConnection
 
-    SetItem(uint64_t storageAreaID, WTF::String key, WTF::String value, WTF::String urlString) WantsConnection
+    SetItem(uint64_t storageMapID, WTF::String key, WTF::String value, WTF::String urlString) WantsConnection
 }

trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp

@@ -60 +60 @@
     , m_securityOrigin(securityOrigin)
 {
-    WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageArea(m_storageAreaID, StorageNamespaceImpl->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
+    WebProcess::shared().connection()->send(Messages::StorageManager::CreateStorageMap(m_storageAreaID, StorageNamespaceImpl->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
     WebProcess::shared().addMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageAreaID, this);
 }
@@ -66 +66 @@
 StorageAreaImpl::~StorageAreaImpl()
 {
-    WebProcess::shared().connection()->send(Messages::StorageManager::DestroyStorageArea(m_storageAreaID), 0);
+    WebProcess::shared().connection()->send(Messages::StorageManager::DestroyStorageMap(m_storageAreaID), 0);
     WebProcess::shared().removeMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageAreaID);
 }