Attachment 371106 Details for Bug 198049 – Patch for landing

[patch] Patch for landing

bug-198049-20190531203316.patch (text/plain), 5.39 KB, created by Sihui Liu on 2019-05-31 20:33:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-05-31 20:33:17 PDT

Size: 5.39 KB

patch

obsolete

>Subversion Revision: 246008
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 76747df8e03372cc0197700aac36d5fd1c1523fd..1eb9493eab3d54411ee01efb4175100bc437f938 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,20 @@
>+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>
> 
>         Teach AuxiliaryProcess about LoadOptimizer
>diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp b/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>index 434f3e36f5d789bf9501680d8f99a49a0644166f..68bfc42dd9c45913f347ee6ee45bdb5c7789d06e 100644
>--- a/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>+++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>@@ -715,18 +715,13 @@ void StorageManager::createLocalStorageMap(IPC::Connection& connection, uint64_t
>         ASSERT(!m_isEphemeral);
>         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);
> 
>         auto storageArea = localStorageNamespace->getOrCreateStorageArea(WTFMove(securityOriginData));
>@@ -739,7 +734,6 @@ void StorageManager::createLocalStorageMap(IPC::Connection& connection, uint64_t
> void StorageManager::createTransientLocalStorageMap(IPC::Connection& connection, uint64_t storageMapID, uint64_t storageNamespaceID, SecurityOriginData&& topLevelOriginData, SecurityOriginData&& origin)
> {
>     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 }));
> 
>         // See if we already have session storage for this connection/origin combo.
>@@ -764,8 +758,6 @@ void StorageManager::createTransientLocalStorageMap(IPC::Connection& connection,
>         }
> 
>         auto& slot = m_storageAreasByConnection.add({ connectionID, storageMapID }, nullptr).iterator->value;
>-
>-        // FIXME: This should be a message check.
>         ASSERT(!slot);
> 
>         auto* transientLocalStorageNamespace = getOrCreateTransientLocalStorageNamespace(storageNamespaceID, WTFMove(topLevelOriginData));
>@@ -784,7 +776,7 @@ void StorageManager::createSessionStorageMap(IPC::Connection& connection, uint64
>             m_ephemeralStorage.add(securityOriginData, WebCore::StorageMap::create(localStorageDatabaseQuotaInBytes));
>             return;
>         }
>-        // FIXME: This should be a message check.
>+
>         ASSERT(m_sessionStorageNamespaces.isValidKey(storageNamespaceID));
> 
>         SessionStorageNamespace* sessionStorageNamespace = m_sessionStorageNamespaces.get(storageNamespaceID);
>@@ -794,15 +786,10 @@ void StorageManager::createSessionStorageMap(IPC::Connection& connection, uint64
>             return;
>         }
> 
>-        // 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));
> 
>         auto storageArea = sessionStorageNamespace->getOrCreateStorageArea(WTFMove(securityOriginData));
>@@ -816,8 +803,6 @@ void StorageManager::destroyStorageMap(IPC::Connection& connection, uint64_t sto
> {
>     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));
> 
>         auto it = m_storageAreasByConnection.find(connectionAndStorageMapIDPair);

Actions: View | Formatted Diff | Diff

Attachments on bug 198049: 370593 | 371106