Changeset 243812 in webkit

Timestamp:

Apr 3, 2019, 10:45:17 AM (7 years ago)

Author:

youenn@apple.com

Message:

Clear WorkerCacheStorageConnection callbacks on WorkerGlobalScope termination
​https://bugs.webkit.org/show_bug.cgi?id=196521

Reviewed by Alex Christensen.

When the worker global scope is preparing for termination,
all ActiveDOMObjects are stopped.
At that time, the completion handlers related to
WorkerCacheStorageConnection should be cleared to be able to free
memory, and as they are now no-op anyway.

We clear the completion handlers once the active DOM objects are stopped
to limit the processing triggered by clearing them.

Introducing a new Stopped error code to handle this case.
Add an assertion so that this error does not surface to JS.

Covered by existing tests.

• Modules/cache/CacheStorageConnection.cpp:

(WebCore::CacheStorageConnection::clearPendingRequests):

• Modules/cache/CacheStorageConnection.h:
• Modules/cache/DOMCacheEngine.cpp:

(WebCore::DOMCacheEngine::errorToException):

• Modules/cache/DOMCacheEngine.h:
• workers/WorkerGlobalScope.cpp:

(WebCore::WorkerGlobalScope::prepareForTermination):
(WebCore::WorkerGlobalScope::stopIndexedDatabase):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/cache/CacheStorageConnection.cpp (modified) (1 diff)
• Modules/cache/CacheStorageConnection.h (modified) (1 diff)
• Modules/cache/DOMCacheEngine.cpp (modified) (1 diff)
• Modules/cache/DOMCacheEngine.h (modified) (1 diff)
• workers/WorkerGlobalScope.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-04-03  Youenn Fablet  <youenn@apple.com>
+
+        Clear WorkerCacheStorageConnection callbacks on WorkerGlobalScope termination
+        https://bugs.webkit.org/show_bug.cgi?id=196521
+
+        Reviewed by Alex Christensen.
+
+        When the worker global scope is preparing for termination,
+        all ActiveDOMObjects are stopped.
+        At that time, the completion handlers related to
+        WorkerCacheStorageConnection should be cleared to be able to free
+        memory, and as they are now no-op anyway.
+
+        We clear the completion handlers once the active DOM objects are stopped
+        to limit the processing triggered by clearing them.
+
+        Introducing a new Stopped error code to handle this case.
+        Add an assertion so that this error does not surface to JS.
+
+        Covered by existing tests.
+
+        * Modules/cache/CacheStorageConnection.cpp:
+        (WebCore::CacheStorageConnection::clearPendingRequests):
+        * Modules/cache/CacheStorageConnection.h:
+        * Modules/cache/DOMCacheEngine.cpp:
+        (WebCore::DOMCacheEngine::errorToException):
+        * Modules/cache/DOMCacheEngine.h:
+        * workers/WorkerGlobalScope.cpp:
+        (WebCore::WorkerGlobalScope::prepareForTermination):
+        (WebCore::WorkerGlobalScope::stopIndexedDatabase):
+
 2019-04-03  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/Modules/cache/CacheStorageConnection.cpp

@@ -33 +33 @@
 namespace WebCore {
 using namespace WebCore::DOMCacheEngine;
+
+void CacheStorageConnection::clearPendingRequests()
+{
+    auto openAndRemoveCachePendingRequests = WTFMove(m_openAndRemoveCachePendingRequests);
+    for (auto& callback : openAndRemoveCachePendingRequests.values())
+        callback(makeUnexpected(DOMCacheEngine::Error::Stopped));
+
+    auto retrieveCachesPendingRequests = WTFMove(m_retrieveCachesPendingRequests);
+    for (auto& callback : retrieveCachesPendingRequests.values())
+        callback(makeUnexpected(DOMCacheEngine::Error::Stopped));
+
+    auto retrieveRecordsPendingRequests = WTFMove(m_retrieveRecordsPendingRequests);
+    for (auto& callback : retrieveRecordsPendingRequests.values())
+        callback(makeUnexpected(DOMCacheEngine::Error::Stopped));
+
+    auto batchDeleteAndPutPendingRequests = WTFMove(m_batchDeleteAndPutPendingRequests);
+    for (auto& callback : batchDeleteAndPutPendingRequests.values())
+        callback(makeUnexpected(DOMCacheEngine::Error::Stopped));
+}
 
 void CacheStorageConnection::open(const ClientOrigin& origin, const String& cacheName, CacheIdentifierCallback&& callback)

trunk/Source/WebCore/Modules/cache/CacheStorageConnection.h

@@ -58 +58 @@
     virtual void updateQuotaBasedOnSpaceUsage(const ClientOrigin&) { }
 
+    void clearPendingRequests();
+
 protected:
     CacheStorageConnection() =  default;

trunk/Source/WebCore/Modules/cache/DOMCacheEngine.cpp

@@ -47 +47 @@
     case Error::QuotaExceeded:
         return Exception { QuotaExceededError, "Quota exceeded"_s };
+    case Error::Internal:
+        return Exception { TypeError, "Internal error"_s };
     default:
-        return Exception { TypeError, "Internal error"_s };
+        ASSERT_NOT_REACHED();
+        return Exception { TypeError, "Connection stopped"_s };
     }
 }

trunk/Source/WebCore/Modules/cache/DOMCacheEngine.h

@@ -45 +45 @@
     WriteDisk,
     QuotaExceeded,
-    Internal
+    Internal,
+    Stopped
 };
 

trunk/Source/WebCore/workers/WorkerGlobalScope.cpp

@@ -114 +114 @@
     stopActiveDOMObjects();
 
+    if (m_cacheStorageConnection)
+        m_cacheStorageConnection->clearPendingRequests();
+
     m_inspectorController->workerTerminating();