Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (148159 => 148160)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-04-11 00:20:36 UTC (rev 148159)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2013-04-11 01:03:03 UTC (rev 148160)
@@ -212,14 +212,14 @@
webProcessProxy->connection()->removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
}
-void StorageManager::createStorageArea(CoreIPC::Connection* connection, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
+void StorageManager::createStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
{
- std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageAreaIDPair(connection, storageAreaID);
+ 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(connectionAndStorageAreaIDPair)));
+ 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(connectionAndStorageAreaIDPair, 0);
+ HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreas.add(connectionAndStorageMapIDPair, 0);
// FIXME: This should be a message check.
ASSERT(result.isNewEntry);
@@ -237,26 +237,26 @@
ASSERT(connection == sessionStorageNamespace->allowedConnection());
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)
+void StorageManager::destroyStorageMap(CoreIPC::Connection* connection, uint64_t storageMapID)
{
- std::pair<RefPtr<CoreIPC::Connection>, uint64_t> connectionAndStorageAreaIDPair(connection, storageAreaID);
+ 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(connectionAndStorageAreaIDPair)));
+ 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(connectionAndStorageAreaIDPair);
+ 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);
+ it->value->removeListener(connection, storageMapID);
- m_storageAreas.remove(connectionAndStorageAreaIDPair);
+ m_storageAreas.remove(connectionAndStorageMapIDPair);
}
void StorageManager::getValues(CoreIPC::Connection*, uint64_t, HashMap<String, String>&)
@@ -264,16 +264,16 @@
// FIXME: Implement this.
}
-void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageAreaID, const String& key, const String& value, const String& urlString)
+void StorageManager::setItem(CoreIPC::Connection* connection, uint64_t storageMapID, const String& key, const String& value, const String& urlString)
{
- StorageArea* storageArea = findStorageArea(connection, storageAreaID);
+ StorageArea* storageArea = findStorageArea(connection, storageMapID);
// FIXME: This should be a message check.
ASSERT(storageArea);
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);
}
void StorageManager::createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes)
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (148159 => 148160)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-04-11 00:20:36 UTC (rev 148159)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2013-04-11 01:03:03 UTC (rev 148160)
@@ -59,9 +59,9 @@
virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>& replyEncoder) OVERRIDE;
// 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);
void createSessionStorageNamespaceInternal(uint64_t storageNamespaceID, CoreIPC::Connection* allowedConnection, unsigned quotaInBytes);
Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in (148159 => 148160)
--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2013-04-11 00:20:36 UTC (rev 148159)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2013-04-11 01:03:03 UTC (rev 148160)
@@ -21,10 +21,10 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
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
}
Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp (148159 => 148160)
--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp 2013-04-11 00:20:36 UTC (rev 148159)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaImpl.cpp 2013-04-11 01:03:03 UTC (rev 148160)
@@ -59,13 +59,13 @@
, m_storageAreaID(generateStorageAreaID())
, 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);
}
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);
}
