Changeset 282222 in webkit

Timestamp:

Sep 9, 2021, 10:03:31 AM (5 years ago)

Author:

sihui_liu@apple.com

Message:

Address post-commit comments on r282130 (Add basic support for Storage API)
​https://bugs.webkit.org/show_bug.cgi?id=230059

Reviewed by Youenn Fablet.

Source/WebCore:

No new tests as no behavior change.

• Modules/storage/StorageManager.cpp:

(WebCore::StorageManager::StorageManager):
(WebCore::StorageManager::persisted):
(WebCore::StorageManager::persist):
(WebCore::clientOrigin): Deleted.

• Modules/storage/StorageManager.h:
• dom/Document.cpp:

(WebCore::Document::storageConnection):

• dom/Document.h:
• dom/ScriptExecutionContext.h:

(WebCore::ScriptExecutionContext::storageConnection):

• page/NavigatorBase.cpp:

(WebCore::NavigatorBase::storage):

• page/NavigatorBase.h:

Source/WebKit:

• NetworkProcess/storage/NetworkStorageManager.cpp:

(WebKit::NetworkStorageManager::localOriginStorageManager):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/storage/StorageManager.cpp (modified) (1 diff)
• WebCore/Modules/storage/StorageManager.h (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/dom/Document.h (modified) (1 diff)
• WebCore/dom/ScriptExecutionContext.h (modified) (1 diff)
• WebCore/page/NavigatorBase.cpp (modified) (1 diff)
• WebCore/page/NavigatorBase.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/storage/NetworkStorageManager.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-09-09  Sihui Liu  <sihui_liu@apple.com>
+
+        Address post-commit comments on r282130 (Add basic support for Storage API)
+        https://bugs.webkit.org/show_bug.cgi?id=230059
+
+        Reviewed by Youenn Fablet.
+
+        No new tests as no behavior change.
+
+        * Modules/storage/StorageManager.cpp:
+        (WebCore::StorageManager::StorageManager):
+        (WebCore::StorageManager::persisted):
+        (WebCore::StorageManager::persist):
+        (WebCore::clientOrigin): Deleted.
+        * Modules/storage/StorageManager.h:
+        * dom/Document.cpp:
+        (WebCore::Document::storageConnection):
+        * dom/Document.h:
+        * dom/ScriptExecutionContext.h:
+        (WebCore::ScriptExecutionContext::storageConnection):
+        * page/NavigatorBase.cpp:
+        (WebCore::NavigatorBase::storage):
+        * page/NavigatorBase.h:
+
 2021-09-09  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/Modules/storage/StorageManager.cpp

@@ -43 +43 @@
 
 StorageManager::StorageManager(NavigatorBase& navigator)
-    : m_navigator(navigator)
+    : m_navigator(makeWeakPtr(navigator))
 {
-}
-
-static ClientOrigin clientOrigin(ScriptExecutionContext& context)
-{
-    auto* origin = context.securityOrigin();
-    return { context.topOrigin().data(), origin ? origin->data() : SecurityOriginData { } };
 }
 
 void StorageManager::persisted(DOMPromiseDeferred<IDLBoolean>&& promise)
 {
-    auto context = m_navigator.scriptExecutionContext();
+    if (!m_navigator)
+        return promise.reject(Exception { InvalidStateError, "Navigator does not exist"_s });
+
+    auto context = m_navigator->scriptExecutionContext();
     if (!context)
         return promise.reject(Exception { InvalidStateError, "The context is invalid"_s });
 
-    if (auto connection = context->storageConnection()) {
-        return connection->persisted(clientOrigin(*context), [promise = WTFMove(promise)](bool persisted) mutable {
-            promise.resolve(persisted);
-        });
-    }
+    auto connection = context->storageConnection();
+    if (!connection)
+        return promise.reject(Exception { InvalidStateError, "The connection is invalid"_s });
 
-    return promise.reject(Exception { InvalidStateError, "The connection is invalid"_s });
+    auto* origin = context->securityOrigin();
+    if (!origin)
+        return promise.reject(Exception { InvalidStateError, "Origin is invalid"_s });
+
+    return connection->persisted({ context->topOrigin().data(), origin->data() }, [promise = WTFMove(promise)](bool persisted) mutable {
+        promise.resolve(persisted);
+    });
 }
 
 void StorageManager::persist(DOMPromiseDeferred<IDLBoolean>&& promise)
 {
-    auto context = m_navigator.scriptExecutionContext();
+    if (!m_navigator)
+        return promise.reject(Exception { InvalidStateError, "Navigator does not exist"_s });
+
+    auto context = m_navigator->scriptExecutionContext();
     if (!context)
         return promise.reject(Exception { InvalidStateError, "The context is invalid"_s });
 
-    if (auto connection = context->storageConnection()) {
-        return connection->persist(clientOrigin(*context), [promise = WTFMove(promise)](bool persisted) mutable {
-            promise.resolve(persisted);
-        });
-    }
+    auto connection = context->storageConnection();
+    if (!connection)
+        return promise.reject(Exception { InvalidStateError, "The connection is invalid"_s });
 
-    return promise.reject(Exception { InvalidStateError, "The connection is invalid"_s });
+    auto* origin = context->securityOrigin();
+    if (!origin)
+        return promise.reject(Exception { InvalidStateError, "Origin is invalid"_s });
+
+    return connection->persist({ context->topOrigin().data(), origin->data() }, [promise = WTFMove(promise)](bool persisted) mutable {
+        promise.resolve(persisted);
+    });
 }
 

trunk/Source/WebCore/Modules/storage/StorageManager.h

@@ -44 +44 @@
     explicit StorageManager(NavigatorBase&);
 
-    NavigatorBase& m_navigator;
+    WeakPtr<NavigatorBase> m_navigator;
 };
 

trunk/Source/WebCore/dom/Document.cpp

@@ -3560 +3560 @@
 }
 
-RefPtr<StorageConnection> Document::storageConnection()
+StorageConnection* Document::storageConnection()
 {
     return page() ? &page()->storageConnection() : nullptr;

trunk/Source/WebCore/dom/Document.h

@@ -707 +707 @@
     IDBClient::IDBConnectionProxy* idbConnectionProxy() final;
     RefPtr<PermissionController> permissionController() final;
-    RefPtr<StorageConnection> storageConnection() final;
+    StorageConnection* storageConnection() final;
     SocketProvider* socketProvider() final;
     RefPtr<RTCDataChannelRemoteHandlerConnection> createRTCDataChannelRemoteHandlerConnection() final;

trunk/Source/WebCore/dom/ScriptExecutionContext.h

@@ -119 +119 @@
     virtual IDBClient::IDBConnectionProxy* idbConnectionProxy() = 0;
     virtual RefPtr<PermissionController> permissionController() { return nullptr; }
-    virtual RefPtr<StorageConnection> storageConnection() { return nullptr; }
+    virtual StorageConnection* storageConnection() { return nullptr; }
 
     virtual SocketProvider* socketProvider() = 0;

trunk/Source/WebCore/page/NavigatorBase.cpp

@@ -141 +141 @@
 }
 
-ExceptionOr<StorageManager&> NavigatorBase::storage()
+StorageManager& NavigatorBase::storage()
 {
     if (!m_storageManager)

trunk/Source/WebCore/page/NavigatorBase.h

@@ -60 +60 @@
     static Vector<String> languages();
 
-    ExceptionOr<StorageManager&> storage();
+    StorageManager& storage();
 
 protected:

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-09-09  Sihui Liu  <sihui_liu@apple.com>
+
+        Address post-commit comments on r282130 (Add basic support for Storage API)
+        https://bugs.webkit.org/show_bug.cgi?id=230059
+
+        Reviewed by Youenn Fablet.
+
+        * NetworkProcess/storage/NetworkStorageManager.cpp:
+        (WebKit::NetworkStorageManager::localOriginStorageManager):
+
 2021-09-09  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp

@@ -92 +92 @@
     ASSERT(!RunLoop::isMain());
 
-    return *m_localOriginStorageManagers.ensure(origin, [path = m_path, origin, salt = m_salt] {
-        return makeUnique<OriginStorageManager>(originPath(path, origin, salt));
+    return *m_localOriginStorageManagers.ensure(origin, [&] {
+        return makeUnique<OriginStorageManager>(originPath(m_path, origin, m_salt));
     }).iterator->value;
 }