Changeset 148229 in webkit

Timestamp:

Apr 11, 2013 1:14:45 PM (11 years ago)

Author:

andersca@apple.com

Message:

Clean up related storage areas when a connection is destroyed
​https://bugs.webkit.org/show_bug.cgi?id=114459

Reviewed by Beth Dakin.

• UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::processWillCloseConnection):
Dispatch invalidateConnectionInternal on the work queue.

(WebKit::StorageManager::createStorageMap):
(WebKit::StorageManager::destroyStorageMap):
Rename m_storageAreas to m_storageAreasByConnection.

(WebKit::StorageManager::invalidateConnectionInternal):
Go over all known storage areas and remove this connection as a listener.

(WebKit::StorageManager::findStorageArea):
Rename m_storageAreas to m_storageAreasByConnection.

• UIProcess/Storage/StorageManager.h:

Rename m_storageAreas to m_storageAreasByConnection.

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-04-11  Anders Carlsson  <andersca@apple.com>
+
+        Clean up related storage areas when a connection is destroyed
+        https://bugs.webkit.org/show_bug.cgi?id=114459
+
+        Reviewed by Beth Dakin.
+
+        * UIProcess/Storage/StorageManager.cpp:
+        (WebKit::StorageManager::processWillCloseConnection):
+        Dispatch invalidateConnectionInternal on the work queue.
+        
+        (WebKit::StorageManager::createStorageMap):
+        (WebKit::StorageManager::destroyStorageMap):
+        Rename m_storageAreas to m_storageAreasByConnection.
+
+        (WebKit::StorageManager::invalidateConnectionInternal):
+        Go over all known storage areas and remove this connection as a listener.
+
+        (WebKit::StorageManager::findStorageArea):
+        Rename m_storageAreas to m_storageAreasByConnection.
+
+        * UIProcess/Storage/StorageManager.h:
+        Rename m_storageAreas to m_storageAreasByConnection.
+
 2013-04-11  Anders Carlsson  <andersca@apple.com>
 

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

@@ -207 +207 @@
 {
     webProcessProxy->connection()->removeWorkQueueMessageReceiver(Messages::StorageManager::messageReceiverName());
+
+    m_queue->dispatch(bind(&StorageManager::invalidateConnectionInternal, this, RefPtr<CoreIPC::Connection>(webProcessProxy->connection())));
 }
 
@@ -216 +218 @@
     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);
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::AddResult result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, 0);
 
     // FIXME: This should be a message check.
@@ -246 +248 @@
     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());
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::iterator it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair);
+
+    // FIXME: This should be a message check.
+    ASSERT(it != m_storageAreasByConnection.end());
 
     it->value->removeListener(connection, storageMapID);
-
-    m_storageAreas.remove(connectionAndStorageMapIDPair);
+    m_storageAreasByConnection.remove(connectionAndStorageMapIDPair);
 }
 
@@ -305 +306 @@
 }
 
+void StorageManager::invalidateConnectionInternal(CoreIPC::Connection* connection)
+{
+    Vector<std::pair<RefPtr<CoreIPC::Connection>, uint64_t> > connectionAndStorageMapIDPairsToRemove;
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > storageAreasByConnection = m_storageAreasByConnection;
+    for (HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> >::const_iterator it = storageAreasByConnection.begin(), end = storageAreasByConnection.end(); it != end; ++it) {
+        if (it->key.first != connection)
+            continue;
+
+        it->value->removeListener(it->key.first.get(), it->key.second);
+        connectionAndStorageMapIDPairsToRemove.append(it->key);
+    }
+
+    for (size_t i = 0; i < connectionAndStorageMapIDPairsToRemove.size(); ++i)
+        m_storageAreasByConnection.remove(connectionAndStorageMapIDPairsToRemove[i]);
+}
+
 StorageManager::StorageArea* StorageManager::findStorageArea(CoreIPC::Connection* connection, uint64_t storageMapID) const
 {
@@ -311 +328 @@
         return 0;
 
-    return m_storageAreas.get(connectionAndStorageMapIDPair).get();
+    return m_storageAreasByConnection.get(connectionAndStorageMapIDPair).get();
 }
 

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

@@ -70 +70 @@
     void cloneSessionStorageNamespaceInternal(uint64_t storageNamespaceID, uint64_t newStorageNamespaceID);
 
+    void invalidateConnectionInternal(CoreIPC::Connection*);
+
     class StorageArea;
     StorageArea* findStorageArea(CoreIPC::Connection*, uint64_t) const;
@@ -78 +80 @@
     HashMap<uint64_t, RefPtr<SessionStorageNamespace> > m_sessionStorageNamespaces;
 
-    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreas;
+    HashMap<std::pair<RefPtr<CoreIPC::Connection>, uint64_t>, RefPtr<StorageArea> > m_storageAreasByConnection;
 };