Changeset 295189 in webkit

Timestamp:

Jun 2, 2022, 11:45:44 PM (4 years ago)

Author:

Alan Coon

Message:

Cherry-pick cb6ddf5edf6c. rdar://problem/92853663

Create a stopped CacheStorageConnection for workers in case of detached documents
​https://bugs.webkit.org/show_bug.cgi?id=240224
<rdar://problem/92853663>

Reviewed by Chris Dumez.

A worker might not always have a main thread connection as its document may be detached.
In that case, we now create a StoppedCacheStorageConnection that will always return Error::Stopped to any callback.

Covered by existing tests.

• Modules/cache/WorkerCacheStorageConnection.cpp: (WebCore::StoppedCacheStorageConnection::create): (WebCore::createMainThreadConnection): (WebCore::WorkerCacheStorageConnection::WorkerCacheStorageConnection): (WebCore::WorkerCacheStorageConnection::~WorkerCacheStorageConnection): (WebCore::WorkerCacheStorageConnection::create): Deleted.
• Modules/cache/WorkerCacheStorageConnection.h:

Canonical link: ​https://commits.webkit.org/250442@main
git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@294006 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-613-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/cache/WorkerCacheStorageConnection.cpp (modified) (3 diffs)
• Modules/cache/WorkerCacheStorageConnection.h (modified) (2 diffs)

branches/safari-613-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2022-05-10  Youenn Fablet  <youenn@apple.com>
+
+        Create a stopped CacheStorageConnection for workers in case of detached documents
+        https://bugs.webkit.org/show_bug.cgi?id=240224
+        <rdar://problem/92853663>
+
+        Reviewed by Chris Dumez.
+
+        A worker might not always have a main thread connection as its document may be detached.
+        In that case, we now create a StoppedCacheStorageConnection that will always return Error::Stopped to any callback.
+
+        Covered by existing tests.
+
+        * Modules/cache/WorkerCacheStorageConnection.cpp:
+        (WebCore::StoppedCacheStorageConnection::create):
+        (WebCore::createMainThreadConnection):
+        (WebCore::WorkerCacheStorageConnection::WorkerCacheStorageConnection):
+        (WebCore::WorkerCacheStorageConnection::~WorkerCacheStorageConnection):
+        (WebCore::WorkerCacheStorageConnection::create): Deleted.
+        * Modules/cache/WorkerCacheStorageConnection.h:
+
 2022-05-13  Brent Fulgham  <bfulgham@apple.com>
 

branches/safari-613-branch/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.cpp

@@ -32 +32 @@
 #include "ClientOrigin.h"
 #include "Document.h"
+#include "Logging.h"
 #include "Page.h"
 #include "WorkerGlobalScope.h"
@@ -114 +115 @@
 }
 
-Ref<WorkerCacheStorageConnection> WorkerCacheStorageConnection::create(WorkerGlobalScope& scope)
-{
-    auto connection = adoptRef(*new WorkerCacheStorageConnection(scope));
-    callOnMainThreadAndWait([workerThread = Ref { scope.thread() }, connection = connection.ptr()]() mutable {
-        connection->m_mainThreadConnection = workerThread->workerLoaderProxy().createCacheStorageConnection();
-    });
-    ASSERT(connection->m_mainThreadConnection);
-    return connection;
+class StoppedCacheStorageConnection final : public CacheStorageConnection {
+public:
+    static Ref<CacheStorageConnection> create() { return adoptRef(*new StoppedCacheStorageConnection); }
+
+private:
+    void open(const ClientOrigin&, const String&, DOMCacheEngine::CacheIdentifierCallback&& callback) final { callback(makeUnexpected(DOMCacheEngine::Error::Stopped)); }
+    void remove(uint64_t, DOMCacheEngine::CacheIdentifierCallback&& callback)  final { callback(makeUnexpected(DOMCacheEngine::Error::Stopped)); }
+    void retrieveCaches(const ClientOrigin&, uint64_t, DOMCacheEngine::CacheInfosCallback&& callback)  final { callback(makeUnexpected(DOMCacheEngine::Error::Stopped)); }
+    void retrieveRecords(uint64_t, RetrieveRecordsOptions&&, DOMCacheEngine::RecordsCallback&& callback)  final { callback(makeUnexpected(DOMCacheEngine::Error::Stopped)); }
+    void batchDeleteOperation(uint64_t, const ResourceRequest&, CacheQueryOptions&&, DOMCacheEngine::RecordIdentifiersCallback&& callback)  final { callback(makeUnexpected(DOMCacheEngine::Error::Stopped)); }
+    void batchPutOperation(uint64_t, Vector<DOMCacheEngine::Record>&&, DOMCacheEngine::RecordIdentifiersCallback&& callback)  final { callback(makeUnexpected(DOMCacheEngine::Error::Stopped)); }
+    void reference(uint64_t)  final { }
+    void dereference(uint64_t)  final { }
+};
+
+static Ref<CacheStorageConnection> createMainThreadConnection(WorkerGlobalScope& scope)
+{
+    RefPtr<CacheStorageConnection> mainThreadConnection;
+    callOnMainThreadAndWait([workerThread = Ref { scope.thread() }, &mainThreadConnection]() mutable {
+        mainThreadConnection = workerThread->workerLoaderProxy().createCacheStorageConnection();
+        if (!mainThreadConnection) {
+            RELEASE_LOG_INFO(ServiceWorker, "Creating stopped WorkerCacheStorageConnection");
+            mainThreadConnection = StoppedCacheStorageConnection::create();
+        }
+    });
+    return mainThreadConnection.releaseNonNull();
 }
 
 WorkerCacheStorageConnection::WorkerCacheStorageConnection(WorkerGlobalScope& scope)
     : m_scope(scope)
+    , m_mainThreadConnection(createMainThreadConnection(scope))
 {
 }
@@ -131 +151 @@
 WorkerCacheStorageConnection::~WorkerCacheStorageConnection()
 {
-    if (m_mainThreadConnection)
-        callOnMainThread([mainThreadConnection = WTFMove(m_mainThreadConnection)]() mutable { });
+    callOnMainThread([mainThreadConnection = WTFMove(m_mainThreadConnection)]() mutable { });
 }
 

branches/safari-613-branch/Source/WebCore/Modules/cache/WorkerCacheStorageConnection.h

@@ -38 +38 @@
 class WorkerCacheStorageConnection final : public CacheStorageConnection {
 public:
-    static Ref<WorkerCacheStorageConnection> create(WorkerGlobalScope&);
+    static Ref<WorkerCacheStorageConnection> create(WorkerGlobalScope& scope) { return adoptRef(*new WorkerCacheStorageConnection(scope)); }
     ~WorkerCacheStorageConnection();
 
@@ -73 +73 @@
     WorkerGlobalScope& m_scope;
 
-    RefPtr<CacheStorageConnection> m_mainThreadConnection;
+    Ref<CacheStorageConnection> m_mainThreadConnection;
 
     HashMap<uint64_t, DOMCacheEngine::CacheIdentifierCallback> m_openAndRemoveCachePendingRequests;