Attachment 362358 Details for Bug 194801 – ROLLOUT of r241722

[patch] ROLLOUT of r241722

bug-194801-20190218173918.patch (text/plain), 8.90 KB, created by WebKit Commit Bot on 2019-02-18 17:39:18 PST

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-02-18 17:39:18 PST

Size: 8.90 KB

patch

obsolete

>Subversion Revision: 241750
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 5b161f97e19c2093627d6ad6c776ec15fd931408..e31b4c8913e62c1fc7efdddf20213d02fb968ed6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-18  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241722.
>+        https://bugs.webkit.org/show_bug.cgi?id=194801
>+
>+        Causing time outs and EWS failures after expectation file was
>+        added. (Requested by ShawnRoberts on #webkit).
>+
>+        Reverted changeset:
>+
>+        "IndexedDB: leak IDBDatabase and IDBTransacstion in layout
>+        tests"
>+        https://bugs.webkit.org/show_bug.cgi?id=194709
>+        https://trac.webkit.org/changeset/241722
>+
> 2019-02-18  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         [iOS] Support pasting item-provider-backed data on the pasteboard as attachment elements
>diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp b/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp
>index 0a095725fd2fbd324b957118924149eba26364e7..1847439190a8b79bef706432fd2f9d7556907365 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp
>+++ b/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp
>@@ -264,8 +264,7 @@ void IDBDatabase::connectionToServerLost(const IDBError& error)
>     m_closePending = true;
>     m_closedInServer = true;
> 
>-    auto transactions = copyToVector(m_activeTransactions.values());
>-    for (auto& transaction : transactions)
>+    for (auto& transaction : m_activeTransactions.values())
>         transaction->connectionClosedFromServer(error);
> 
>     auto errorEvent = Event::create(m_eventNames.errorEvent, Event::CanBubble::Yes, Event::IsCancelable::No);
>diff --git a/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp b/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
>index e38204c684a84ca3d6712e458f2d23e3071f8a5f..2e965e97d2909ec0c70f3f8741a188ff6c549b2f 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
>+++ b/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
>@@ -79,9 +79,6 @@ IDBTransaction::IDBTransaction(IDBDatabase& database, const IDBTransactionInfo&
>     , m_currentlyCompletingRequest(request)
> 
> {
>-    auto addResult = allIDBTransactions().add(this);
>-    ASSERT_UNUSED(addResult, addResult.isNewEntry);
>-
>     LOG(IndexedDB, "IDBTransaction::IDBTransaction - %s", m_info.loggingString().utf8().data());
>     ASSERT(&m_database->originThread() == &Thread::current());
> 
>@@ -109,14 +106,6 @@ IDBTransaction::IDBTransaction(IDBDatabase& database, const IDBTransactionInfo&
> IDBTransaction::~IDBTransaction()
> {
>     ASSERT(&m_database->originThread() == &Thread::current());
>-    ASSERT(allIDBTransactions().contains(this));
>-    allIDBTransactions().remove(this);
>-}
>-
>-HashSet<IDBTransaction*>& IDBTransaction::allIDBTransactions()
>-{
>-    static NeverDestroyed<HashSet<IDBTransaction*>> transactions;
>-    return transactions;
> }
> 
> IDBClient::IDBConnectionProxy& IDBTransaction::connectionProxy()
>@@ -1445,8 +1434,7 @@ void IDBTransaction::connectionClosedFromServer(const IDBError& error)
> {
>     LOG(IndexedDB, "IDBTransaction::connectionClosedFromServer - %s", error.message().utf8().data());
> 
>-    m_database->willAbortTransaction(*this);
>-    transitionedToFinishing(IndexedDB::TransactionState::Aborting);
>+    m_state = IndexedDB::TransactionState::Aborting;
> 
>     abortInProgressOperations(error);
> 
>@@ -1457,7 +1445,6 @@ void IDBTransaction::connectionClosedFromServer(const IDBError& error)
>         ASSERT(m_transactionOperationsInProgressQueue.first() == operation.get());
>         operation->doComplete(IDBResultData::error(operation->identifier(), error));
>     }
>-    m_currentlyCompletingRequest = nullptr;
> 
>     connectionProxy().forgetActiveOperations(operations);
> 
>@@ -1467,7 +1454,6 @@ void IDBTransaction::connectionClosedFromServer(const IDBError& error)
> 
>     m_idbError = error;
>     m_domError = error.toDOMException();
>-    m_database->didAbortTransaction(*this);
>     fireOnAbort();
> }
> 
>diff --git a/Source/WebCore/Modules/indexeddb/IDBTransaction.h b/Source/WebCore/Modules/indexeddb/IDBTransaction.h
>index edd15e6c10efcd084513057460df26550876d646..722f12c84a787dc1a32a33bc5d236f0cecdc4f04 100644
>--- a/Source/WebCore/Modules/indexeddb/IDBTransaction.h
>+++ b/Source/WebCore/Modules/indexeddb/IDBTransaction.h
>@@ -152,8 +152,6 @@ public:
> 
>     void visitReferencedObjectStores(JSC::SlotVisitor&) const;
> 
>-    WEBCORE_EXPORT static HashSet<IDBTransaction*>& allIDBTransactions();
>-
> private:
>     IDBTransaction(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest*);
> 
>diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
>index 8d57b7d6e0492cfcf0fb4062a7e9eb4aac52ffa4..21a0597b675ce3a430504c4f8a725eb644e272cb 100644
>--- a/Source/WebCore/testing/Internals.cpp
>+++ b/Source/WebCore/testing/Internals.cpp
>@@ -93,8 +93,6 @@
> #include "HistoryController.h"
> #include "HistoryItem.h"
> #include "HitTestResult.h"
>-#include "IDBRequest.h"
>-#include "IDBTransaction.h"
> #include "InspectorClient.h"
> #include "InspectorController.h"
> #include "InspectorFrontendClientLocal.h"
>@@ -2385,11 +2383,6 @@ ExceptionOr<unsigned> Internals::countFindMatches(const String& text, const Vect
>     return document->page()->countFindMatches(text, parsedOptions.releaseReturnValue(), 1000);
> }
> 
>-unsigned Internals::numberOfIDBTransactions() const
>-{
>-    return IDBTransaction::allIDBTransactions().size();
>-}
>-
> unsigned Internals::numberOfLiveNodes() const
> {
>     unsigned nodeCount = 0;
>diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
>index 4e4d9d74a774658c8d086c6ec6c8341a07b86bd2..c19382f1639c5dadff3dd36bab16d71a2369ecb3 100644
>--- a/Source/WebCore/testing/Internals.h
>+++ b/Source/WebCore/testing/Internals.h
>@@ -378,8 +378,6 @@ public:
>     ExceptionOr<void> insertAuthorCSS(const String&) const;
>     ExceptionOr<void> insertUserCSS(const String&) const;
> 
>-    unsigned numberOfIDBTransactions() const;
>-
>     unsigned numberOfLiveNodes() const;
>     unsigned numberOfLiveDocuments() const;
>     unsigned referencingNodeCount(const Document&) const;
>diff --git a/Source/WebCore/testing/Internals.idl b/Source/WebCore/testing/Internals.idl
>index 01399ec80ade258a1a19dfd3c6ff6db7697ef8ed..e638512de819c0c105b094b3549fa51cb0982e33 100644
>--- a/Source/WebCore/testing/Internals.idl
>+++ b/Source/WebCore/testing/Internals.idl
>@@ -405,8 +405,6 @@ enum CompositingPolicy {
>     void beginSimulatedMemoryPressure();
>     void endSimulatedMemoryPressure();
> 
>-    unsigned long numberOfIDBTransactions();
>-
>     unsigned long numberOfLiveNodes();
>     unsigned long numberOfLiveDocuments();
>     unsigned long referencingNodeCount(Document document);
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 589a9cde734aefb13459124ad14e6e9505a89f6f..c0694dc8c7030c6a18a05d64978749940b7393ff 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-18  Commit Queue  <commit-queue@webkit.org>
>+
>+        Unreviewed, rolling out r241722.
>+        https://bugs.webkit.org/show_bug.cgi?id=194801
>+
>+        Causing time outs and EWS failures after expectation file was
>+        added. (Requested by ShawnRoberts on #webkit).
>+
>+        Reverted changeset:
>+
>+        "IndexedDB: leak IDBDatabase and IDBTransacstion in layout
>+        tests"
>+        https://bugs.webkit.org/show_bug.cgi?id=194709
>+        https://trac.webkit.org/changeset/241722
>+
> 2019-02-18  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Focus ring for checkboxes, radio buttons, buttons and search fields should hug tighter to the contour
>diff --git a/LayoutTests/storage/indexeddb/IDBObject-leak.html b/LayoutTests/storage/indexeddb/IDBObject-leak.html
>deleted file mode 100644
>index 5507b82bf7806719224bedcb3e92e3bc6655c49e..0000000000000000000000000000000000000000
>--- a/LayoutTests/storage/indexeddb/IDBObject-leak.html
>+++ /dev/null
>@@ -1,38 +0,0 @@
>-<!DOCTYPE html>
>-<script src="../../resources/js-test.js"></script>
>-<script src="resources/shared.js"></script>
>-<script>
>-description('This test verifies that IDBTransaction objects are freed.');
>-
>-function test() {
>-    if (!window.internals || !internals.numberOfIDBTransactions) {
>-        testFailed('This test requires access to the Internals object');
>-        finishJSTest();
>-        return;
>-    }
>-
>-    if (sessionStorage.doneFirstLoad) {
>-        gc();
>-        shouldBeEqualToNumber("internals.numberOfIDBTransactions()", 0);
>-        finishJSTest();
>-        return;
>-    }
>-
>-    var dbname = setDBNameFromPath() + Date();
>-    var request =  window.indexedDB.open(dbname);
>-    request.onupgradeneeded = function(evt) {
>-        sessionStorage.doneFirstLoad = true;
>-        if (window.testRunner) {
>-            testRunner.waitUntilDone();
>-            testRunner.terminateNetworkProcess();
>-        } else {
>-            testFailed('This test requires access to the TestRunner object');
>-        }
>-        setTimeout((()=> {
>-            location.reload();
>-        }), 0);
>-    }
>-}
>-
>-test();
>-</script>

Actions: View | Formatted Diff | Diff

Attachments on bug 194801: 362358