Changeset 239380 in webkit

Timestamp:

Dec 19, 2018 10:57:09 AM (5 years ago)

Author:

Truitt Savell

Message:

Unreviewed, rolling out r239358.

Revision caused imported/w3c/web-platform-tests/IndexedDB/ to
crash on Debug bots

Reverted changeset:

"Clean up IndexedDB files between tests"
​https://bugs.webkit.org/show_bug.cgi?id=192796
​https://trac.webkit.org/changeset/239358

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (5 diffs)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/TestController.h (modified) (1 diff)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-19  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r239358.
+
+        Revision caused imported/w3c/web-platform-tests/IndexedDB/ to
+        crash on Debug bots
+
+        Reverted changeset:
+
+        "Clean up IndexedDB files between tests"
+        https://bugs.webkit.org/show_bug.cgi?id=192796
+        https://trac.webkit.org/changeset/239358
+
 2018-12-19  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp

@@ -510 +510 @@
 
     HashSet<UniqueIDBDatabase*> openDatabases;
-    for (auto& database : m_uniqueIDBDatabaseMap.values())
-        openDatabases.add(database.get());
+    for (auto* connection : m_databaseConnections.values())
+        openDatabases.add(connection->database());
 
     for (auto& database : openDatabases)

trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp

@@ -295 +295 @@
     m_backingStoreIsEphemeral = false;
 
-    if (!m_databaseQueue.isEmpty()) {
-        postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::shutdownForClose));
-        return;
-    }
+    ASSERT(m_databaseQueue.isEmpty());
     m_databaseQueue.kill();
 
@@ -340 +337 @@
 
     m_deleteBackingStoreInProgress = false;
-
-    if (!m_hardClosedForUserDelete)
-        invokeOperationAndTransactionTimer();
+    invokeOperationAndTransactionTimer();
 }
 
@@ -349 +344 @@
     ASSERT(isMainThread());
     LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations - There are %u pending", m_pendingOpenDBRequests.size());
-
-    if (m_hardClosedForUserDelete)
-        return;
+    ASSERT(!m_hardClosedForUserDelete);
 
     if (m_deleteBackingStoreInProgress)
@@ -1286 +1279 @@
     LOG(IndexedDB, "(db) UniqueIDBDatabase::performPrefetchCursor");
 
-    if (m_owningPointerForClose)
-        return;
-
     if (m_backingStore->prefetchCursor(transactionIdentifier, cursorIdentifier))
         postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::performPrefetchCursor, transactionIdentifier, cursorIdentifier));
@@ -1829 +1819 @@
         transaction->databaseConnection().deleteTransaction(*transaction);
     m_pendingTransactions.clear();
+    m_objectStoreTransactionCounts.clear();
+    m_objectStoreWriteTransactions.clear();
 
     // Error out all pending callbacks

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-19  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r239358.
+
+        Revision caused imported/w3c/web-platform-tests/IndexedDB/ to
+        crash on Debug bots
+
+        Reverted changeset:
+
+        "Clean up IndexedDB files between tests"
+        https://bugs.webkit.org/show_bug.cgi?id=192796
+        https://trac.webkit.org/changeset/239358
+
 2018-12-18  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

@@ -512 +512 @@
 }
 
-void WKWebsiteDataStoreRemoveAllIndexedDatabases(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreRemoveAllIndexedDatabasesCallback callback)
+void WKWebsiteDataStoreRemoveAllIndexedDatabases(WKWebsiteDataStoreRef dataStoreRef)
 {
     OptionSet<WebKit::WebsiteDataType> dataTypes = WebKit::WebsiteDataType::IndexedDBDatabases;
-    WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, -WallTime::infinity(), [context, callback] {
-        if (callback)
-            callback(context);
-    });
+    WebKit::toImpl(dataStoreRef)->websiteDataStore().removeData(dataTypes, -WallTime::infinity(), [] { });
 }
 

trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h

@@ -104 +104 @@
 WK_EXPORT void WKWebsiteDataStoreRemoveAllServiceWorkerRegistrations(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreRemoveAllServiceWorkerRegistrationsCallback callback);
 
-typedef void (*WKWebsiteDataStoreRemoveAllIndexedDatabasesCallback)(void* functionContext);
-WK_EXPORT void WKWebsiteDataStoreRemoveAllIndexedDatabases(WKWebsiteDataStoreRef dataStoreRef, void* context, WKWebsiteDataStoreRemoveAllIndexedDatabasesCallback callback);
+WK_EXPORT void WKWebsiteDataStoreRemoveAllIndexedDatabases(WKWebsiteDataStoreRef dataStoreRef);
 
 typedef void (*WKWebsiteDataStoreGetFetchCacheOriginsFunction)(WKArrayRef, void*);

trunk/Tools/ChangeLog

@@ +1 @@
+2018-12-19  Truitt Savell  <tsavell@apple.com>
+
+        Unreviewed, rolling out r239358.
+
+        Revision caused imported/w3c/web-platform-tests/IndexedDB/ to
+        crash on Debug bots
+
+        Reverted changeset:
+
+        "Clean up IndexedDB files between tests"
+        https://bugs.webkit.org/show_bug.cgi?id=192796
+        https://trac.webkit.org/changeset/239358
+
 2018-12-18  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -2013 +2013 @@
     gTestRunner->setIconDatabaseEnabled(false);
     gTestRunner->clearAllApplicationCaches();
-    gTestRunner->clearAllDatabases();
-    gTestRunner->setIDBPerOriginQuota(50 * MB);
 
     if (disallowedURLs)

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -868 +868 @@
     WKContextClearCachedCredentials(TestController::singleton().context());
 
-    ClearIndexedDatabases();
-    setIDBPerOriginQuota(50 * MB);
-
     clearServiceWorkerRegistrations();
     clearDOMCaches();
@@ -2763 +2760 @@
 }
 
-struct RemoveAllIndexedDatabasesCallbackContext {
-    explicit RemoveAllIndexedDatabasesCallbackContext(TestController& controller)
-        : testController(controller)
-        {
-        }
-    TestController& testController;
-    bool done { false };
-};
-static void RemoveAllIndexedDatabasesCallback(void* userData)
-{
-    auto* context = static_cast<RemoveAllIndexedDatabasesCallbackContext*>(userData);
-    context->done = true;
-    context->testController.notifyDone();
-}
-void TestController::ClearIndexedDatabases()
-{
-    auto websiteDataStore = WKContextGetWebsiteDataStore(platformContext());
-    RemoveAllIndexedDatabasesCallbackContext context(*this);
-    WKWebsiteDataStoreRemoveAllIndexedDatabases(websiteDataStore, &context, RemoveAllIndexedDatabasesCallback);
-    runUntil(context.done, noTimeout);
-}
-
 struct FetchCacheOriginsCallbackContext {
     FetchCacheOriginsCallbackContext(TestController& controller, WKStringRef origin)

trunk/Tools/WebKitTestRunner/TestController.h

@@ -243 +243 @@
     void removeAllSessionCredentials();
 
-    void ClearIndexedDatabases();
-
     void clearServiceWorkerRegistrations();
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -904 +904 @@
     
     if (WKStringIsEqualToUTF8CString(messageName, "DeleteAllIndexedDatabases")) {
-        WKWebsiteDataStoreRemoveAllIndexedDatabases(WKContextGetWebsiteDataStore(TestController::singleton().context()), nullptr, { });
+        WKWebsiteDataStoreRemoveAllIndexedDatabases(WKContextGetWebsiteDataStore(TestController::singleton().context()));
         return nullptr;
     }