Attachment 370593 Details for Bug 198049 – Patch

[patch] Patch

bug-198049-20190524143746.patch (text/plain), 5.14 KB, created by Sihui Liu on 2019-05-24 14:37:47 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-05-24 14:37:47 PDT

Size: 5.14 KB

patch

obsolete

>Subversion Revision: 245746
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 76cf24000ad7630ec8edd27d4ded69cea75fc34e..ae4d33192b6abf15e892abfa9f99cf0118b78a27 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-24  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Remove outdated FIXME in StorageManager
>+        https://bugs.webkit.org/show_bug.cgi?id=198049
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/WebStorage/StorageManager.cpp:
>+        (WebKit::StorageManager::createLocalStorageMap):
>+        (WebKit::StorageManager::createTransientLocalStorageMap):
>+        (WebKit::StorageManager::createSessionStorageMap):
>+        (WebKit::StorageManager::destroyStorageMap):
>+
> 2019-05-23  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         Socket-based RWI should be able to inspect a JSContext
>diff --git a/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp b/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>index 003945053f55034c23087e90798bf9b7dfbe8623..db3e23bf127baa47711ac885e74c6ef92bbf7bb7 100644
>--- a/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>+++ b/Source/WebKit/NetworkProcess/WebStorage/StorageManager.cpp
>@@ -715,18 +715,15 @@ 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 +736,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 +760,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 +778,6 @@ 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 +787,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 +804,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