Changeset 144675 in webkit

Timestamp:

Mar 4, 2013 2:25:57 PM (11 years ago)

Author:

andersca@apple.com

Message:

Create and destroy storage areas in the UI process
​https://bugs.webkit.org/show_bug.cgi?id=111361

Reviewed by Sam Weinig.

• UIProcess/Storage/StorageManager.cpp:

(StorageManager::StorageArea):
Keep track of listener connection and storage area ID pairs.

(WebKit::StorageManager::StorageArea::~StorageArea):
Assert that we don't have any listeners left.

(WebKit::StorageManager::StorageArea::addListener):
Add the pair to the set of listeners.

(WebKit::StorageManager::StorageArea::removeListener):
Remove the pair from the set of listeners.

(WebKit::StorageManager::SessionStorageNamespace::getOrCreateStorageArea):
Given an origin, look up or create the storage area.

(WebKit::StorageManager::createStorageArea):
Create the storage area if it doesn't already exist.

(WebKit::StorageManager::destroyStorageArea):
Look up the storage area and destroy it.

• UIProcess/Storage/StorageManager.h:

Add a map of open storage areas.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Storage/StorageManager.cpp (modified) (6 diffs)
• UIProcess/Storage/StorageManager.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-04  Anders Carlsson  <andersca@apple.com>
+
+        Create and destroy storage areas in the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=111361
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (StorageManager::StorageArea):
+        Keep track of listener connection and storage area ID pairs.
+        
+        (WebKit::StorageManager::StorageArea::~StorageArea):
+        Assert that we don't have any listeners left.
+
+        (WebKit::StorageManager::StorageArea::addListener):
+        Add the pair to the set of listeners.
+        
+        (WebKit::StorageManager::StorageArea::removeListener):
+        Remove the pair from the set of listeners.
+        
+        (WebKit::StorageManager::SessionStorageNamespace::getOrCreateStorageArea):
+        Given an origin, look up or create the storage area.
+
+        (WebKit::StorageManager::createStorageArea):
+        Create the storage area if it doesn't already exist.
+
+        (WebKit::StorageManager::destroyStorageArea):
+        Look up the storage area and destroy it.
+
+        * UIProcess/Storage/StorageManager.h:
+        Add a map of open storage areas.
+
 2013-03-04  Jer Noble  <jer.noble@apple.com>
 

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

@@ -43 +43 @@
     ~StorageArea();
 
+    void addListener(CoreIPC::Connection*, uint64_t storageAreaID);
+    void removeListener(CoreIPC::Connection*, uint64_t storageAreaID);
+
 private:
     StorageArea();
+
+    HashSet<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>> m_eventListeners;
 };
 
@@ -58 +63 @@
 StorageManager::StorageArea::~StorageArea()
 {
+    ASSERT(m_eventListeners.isEmpty());
+}
+
+void StorageManager::StorageArea::addListener(CoreIPC::Connection* connection, uint64_t storageAreaID)
+{
+    ASSERT(!m_eventListeners.contains(std::make_pair(connection, storageAreaID)));
+    m_eventListeners.add(std::make_pair(connection, storageAreaID));
+}
+
+void StorageManager::StorageArea::removeListener(CoreIPC::Connection* connection, uint64_t storageAreaID)
+{
+    ASSERT(m_eventListeners.contains(std::make_pair(connection, storageAreaID)));
+    m_eventListeners.remove(std::make_pair(connection, storageAreaID));
 }
 
@@ -70 +88 @@
     void setAllowedConnection(CoreIPC::Connection*);
 
+    PassRefPtr<StorageArea> getOrCreateStorageArea(PassRefPtr<SecurityOrigin>);
+
     void cloneTo(SessionStorageNamespace& newSessionStorageNamespace);
 
@@ -100 +120 @@
 }
 
+PassRefPtr<StorageManager::StorageArea> StorageManager::SessionStorageNamespace::getOrCreateStorageArea(PassRefPtr<SecurityOrigin> securityOrigin)
+{
+    HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageArea> >::AddResult result = m_storageAreaMap.add(securityOrigin, 0);
+    if (result.isNewEntry)
+        result.iterator->value = StorageArea::create();
+
+    return result.iterator->value;
+}
+
 void StorageManager::SessionStorageNamespace::cloneTo(SessionStorageNamespace& newSessionStorageNamespace)
 {
@@ -153 +182 @@
 void StorageManager::createStorageArea(CoreIPC::Connection* connection, uint64_t storageAreaID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
 {
-    UNUSED_PARAM(storageAreaID);
-    UNUSED_PARAM(storageNamespaceID);
+    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);
+
+    // FIXME: This should be a message check.
+    ASSERT(result.isNewEntry);
 
     if (!storageNamespaceID) {
@@ -160 +196 @@
         ASSERT_NOT_REACHED();
     }
-}
-
-void StorageManager::destroyStorageArea(CoreIPC::Connection*, uint64_t)
-{
+
+    ASSERT((HashMap<uint64_t, RefPtr<SessionStorageNamespace> >::isValidKey(storageNamespaceID)));
+    SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID).get();
+
+    // FIXME: These should be message checks.
+    ASSERT(sessionStorageNamespace);
+    ASSERT(connection == sessionStorageNamespace->allowedConnection());
+
+    RefPtr<StorageArea> storageArea = sessionStorageNamespace->getOrCreateStorageArea(securityOriginData.securityOrigin());
+    storageArea->addListener(connection, storageAreaID);
+
+    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);
+
+    // FIXME: This should be a message check.
+    ASSERT(it != m_storageAreas.end());
+
+    it->value->removeListener(connection, storageAreaID);
+
+    m_storageAreas.remove(connectionAndStorageAreaIDPair);
 }
 

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

@@ -76 +76 @@
 
     class StorageArea;
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreas;
 };