commit 3473c2d1f339ad9d366a2f0fc63bb385f19f42b3
author sihui_liu@apple.com <sihui_liu@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Oct 10 01:44:50 2019 +0000
committer sihui_liu@apple.com <sihui_liu@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Thu Oct 10 01:44:50 2019 +0000
tree 3c292c3b35047343aea32988a673aa1c96d67f7c
parent 5f149ec359e42103ef84148247c17c244c452e22

Unreviewed, fix an asserition after r250937.

Space increase tasks will be finished once it's started.


* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::finishSpaceIncreaseTask):
(WebCore::IDBServer::UniqueIDBDatabase::immediateCloseForUserDelete):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@250951 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 83252d6..f5d8002 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2019-10-09  Sihui Liu  <sihui_liu@apple.com>
+
+        Unreviewed, fix an asserition after r250937.
+
+        Space increase tasks will be finished once it's started.
+
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::finishSpaceIncreaseTask):
+        (WebCore::IDBServer::UniqueIDBDatabase::immediateCloseForUserDelete):
+
 2019-10-09  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [Clipboard API] Refactor Pasteboard item reading functions to work on both iOS and macOS

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

diff --git a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
index 06e956c..525ade9 100644
--- a/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
+++ b/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp
@@ -229,13 +229,11 @@
 void UniqueIDBDatabase::finishSpaceIncreaseTask(uint64_t identifier, bool isTaskSuccessful)
 {
     auto iterator = m_pendingSpaceIncreaseTasks.find(identifier);
-    ASSERT(iterator != m_pendingSpaceIncreaseTasks.end() || !isTaskSuccessful);
-    if (iterator != m_pendingSpaceIncreaseTasks.end()) {
-        m_server->decreasePotentialSpaceUsed(m_identifier.origin(), iterator->value);
-        if (isTaskSuccessful)
-            m_server->increaseSpaceUsed(m_identifier.origin(), iterator->value);
-        m_pendingSpaceIncreaseTasks.remove(iterator);
-    }
+    ASSERT(iterator != m_pendingSpaceIncreaseTasks.end());
+    m_server->decreasePotentialSpaceUsed(m_identifier.origin(), iterator->value);
+    if (isTaskSuccessful)
+        m_server->increaseSpaceUsed(m_identifier.origin(), iterator->value);
+    m_pendingSpaceIncreaseTasks.remove(iterator);
 }
 
 void UniqueIDBDatabase::performCurrentOpenOperation()
@@ -2208,10 +2206,6 @@
 
     ASSERT(isMainThread());
 
-    for (auto size : m_pendingSpaceIncreaseTasks.values())
-        m_server->decreasePotentialSpaceUsed(m_identifier.origin(), size);
-    m_pendingSpaceIncreaseTasks.clear();
-
     // Error out all transactions
     for (auto& identifier : copyToVector(m_inProgressTransactions.keys()))
         m_inProgressTransactions.get(identifier)->abortWithoutCallback();