Changeset 246011 in webkit

Timestamp:

May 31, 2019, 9:16:40 PM (7 years ago)

Author:

sihui_liu@apple.com

Message:

Remove outdated FIXME in StorageManager
​https://bugs.webkit.org/show_bug.cgi?id=198049

Reviewed by Geoffrey Garen.

Previously StorageManager messages were dispatched and handled in the same thread, so we could perform a message
check. Now they are on different thread, and we would not be able to verify those parameters when dispatching
the message.

• NetworkProcess/WebStorage/StorageManager.cpp:

(WebKit::StorageManager::createLocalStorageMap):
(WebKit::StorageManager::createTransientLocalStorageMap):
(WebKit::StorageManager::createSessionStorageMap):
(WebKit::StorageManager::destroyStorageMap):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/WebStorage/StorageManager.cpp (modified) (6 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-31  Sihui Liu  <sihui_liu@apple.com>
+
+        Remove outdated FIXME in StorageManager
+        https://bugs.webkit.org/show_bug.cgi?id=198049
+
+        Reviewed by Geoffrey Garen.
+
+        Previously StorageManager messages were dispatched and handled in the same thread, so we could perform a message
+        check. Now they are on different thread, and we would not be able to verify those parameters when dispatching
+        the message.
+
+        * NetworkProcess/WebStorage/StorageManager.cpp:
+        (WebKit::StorageManager::createLocalStorageMap):
+        (WebKit::StorageManager::createTransientLocalStorageMap):
+        (WebKit::StorageManager::createSessionStorageMap):
+        (WebKit::StorageManager::destroyStorageMap):
+
 2019-05-31  Jiewen Tan  <jiewen_tan@apple.com>
 

trunk/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp

@@ -716 +716 @@
         std::pair<IPC::Connection::UniqueID, uint64_t> connectionAndStorageMapIDPair(connectionID, storageMapID);
 
-        // FIXME: This should be a message check.
         ASSERT((HashMap<std::pair<IPC::Connection::UniqueID, uint64_t>, RefPtr<StorageArea>>::isValidKey(connectionAndStorageMapIDPair)));
 
         auto result = m_storageAreasByConnection.add(connectionAndStorageMapIDPair, nullptr);
-
-        // FIXME: These should be a message checks.
         ASSERT(result.isNewEntry);
         ASSERT((HashMap<uint64_t, RefPtr<LocalStorageNamespace>>::isValidKey(storageNamespaceID)));
 
         LocalStorageNamespace* localStorageNamespace = getOrCreateLocalStorageNamespace(storageNamespaceID);
-
-        // FIXME: This should be a message check.
         ASSERT(localStorageNamespace);
 
@@ -740 +735 @@
 {
     m_queue->dispatch([this, protectedThis = makeRef(*this), connectionID = connection.uniqueID(), storageMapID, storageNamespaceID, topLevelOriginData = topLevelOriginData.isolatedCopy(), origin = origin.isolatedCopy()]() mutable {
-        // FIXME: This should be a message check.
         ASSERT(m_storageAreasByConnection.isValidKey({ connectionID, storageMapID }));
 
@@ -765 +759 @@
 
         auto& slot = m_storageAreasByConnection.add({ connectionID, storageMapID }, nullptr).iterator->value;
-
-        // FIXME: This should be a message check.
         ASSERT(!slot);
 
@@ -785 +777 @@
             return;
         }
-        // FIXME: This should be a message check.
+
         ASSERT(m_sessionStorageNamespaces.isValidKey(storageNamespaceID));
 
@@ -795 +787 @@
         }
 
-        // FIXME: This should be a message check.
         ASSERT(m_storageAreasByConnection.isValidKey({ connectionID, storageMapID }));
 
         auto& slot = m_storageAreasByConnection.add({ connectionID, storageMapID }, nullptr).iterator->value;
-
-        // FIXME: This should be a message check.
         ASSERT(!slot);
-
-        // FIXME: This should be a message check.
         ASSERT(sessionStorageNamespace->allowedConnections().contains(connectionID));
 
@@ -817 +804 @@
     m_queue->dispatch([this, protectedThis = makeRef(*this), connectionID = connection.uniqueID(), storageMapID]() mutable {
         std::pair<IPC::Connection::UniqueID, uint64_t> connectionAndStorageMapIDPair(connectionID, storageMapID);
-
-        // FIXME: This should be a message check.
         ASSERT(m_storageAreasByConnection.isValidKey(connectionAndStorageMapIDPair));