Diff
Modified: trunk/LayoutTests/ChangeLog (241760 => 241761)
--- trunk/LayoutTests/ChangeLog 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/LayoutTests/ChangeLog 2019-02-19 16:42:21 UTC (rev 241761)
@@ -1,3 +1,18 @@
+2019-02-19 Commit Queue <[email protected]>
+
+ 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-19 Antoine Quint <[email protected]>
[iOS] "touch-action: none" should not prevent text selection or tapping on a link
Deleted: trunk/LayoutTests/storage/indexeddb/IDBObject-leak.html (241760 => 241761)
--- trunk/LayoutTests/storage/indexeddb/IDBObject-leak.html 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/LayoutTests/storage/indexeddb/IDBObject-leak.html 2019-02-19 16:42:21 UTC (rev 241761)
@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<script src=""
-<script src=""
-<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>
Modified: trunk/Source/WebCore/ChangeLog (241760 => 241761)
--- trunk/Source/WebCore/ChangeLog 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/ChangeLog 2019-02-19 16:42:21 UTC (rev 241761)
@@ -1,3 +1,18 @@
+2019-02-19 Commit Queue <[email protected]>
+
+ 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-16 Darin Adler <[email protected]>
Continue reducing use of String::format, now focusing on hex: "%p", "%x", etc.
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (241760 => 241761)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2019-02-19 16:42:21 UTC (rev 241761)
@@ -264,8 +264,7 @@
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);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (241760 => 241761)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2019-02-19 16:42:21 UTC (rev 241761)
@@ -79,9 +79,6 @@
, 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,16 +106,8 @@
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()
{
return m_database->connectionProxy();
@@ -1445,8 +1434,7 @@
{
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 @@
ASSERT(m_transactionOperationsInProgressQueue.first() == operation.get());
operation->doComplete(IDBResultData::error(operation->identifier(), error));
}
- m_currentlyCompletingRequest = nullptr;
connectionProxy().forgetActiveOperations(operations);
@@ -1467,7 +1454,6 @@
m_idbError = error;
m_domError = error.toDOMException();
- m_database->didAbortTransaction(*this);
fireOnAbort();
}
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h (241760 => 241761)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h 2019-02-19 16:42:21 UTC (rev 241761)
@@ -152,8 +152,6 @@
void visitReferencedObjectStores(JSC::SlotVisitor&) const;
- WEBCORE_EXPORT static HashSet<IDBTransaction*>& allIDBTransactions();
-
private:
IDBTransaction(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest*);
Modified: trunk/Source/WebCore/testing/Internals.cpp (241760 => 241761)
--- trunk/Source/WebCore/testing/Internals.cpp 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/testing/Internals.cpp 2019-02-19 16:42:21 UTC (rev 241761)
@@ -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 @@
return document->page()->countFindMatches(text, parsedOptions.releaseReturnValue(), 1000);
}
-unsigned Internals::numberOfIDBTransactions() const
-{
- return IDBTransaction::allIDBTransactions().size();
-}
-
unsigned Internals::numberOfLiveNodes() const
{
unsigned nodeCount = 0;
Modified: trunk/Source/WebCore/testing/Internals.h (241760 => 241761)
--- trunk/Source/WebCore/testing/Internals.h 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/testing/Internals.h 2019-02-19 16:42:21 UTC (rev 241761)
@@ -378,8 +378,6 @@
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;
Modified: trunk/Source/WebCore/testing/Internals.idl (241760 => 241761)
--- trunk/Source/WebCore/testing/Internals.idl 2019-02-19 10:45:48 UTC (rev 241760)
+++ trunk/Source/WebCore/testing/Internals.idl 2019-02-19 16:42:21 UTC (rev 241761)
@@ -405,8 +405,6 @@
void beginSimulatedMemoryPressure();
void endSimulatedMemoryPressure();
- unsigned long numberOfIDBTransactions();
-
unsigned long numberOfLiveNodes();
unsigned long numberOfLiveDocuments();
unsigned long referencingNodeCount(Document document);
