Title: [250951] trunk/Source/WebCore
- Revision
- 250951
- Author
- [email protected]
- Date
- 2019-10-09 18:44:50 -0700 (Wed, 09 Oct 2019)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (250950 => 250951)
--- trunk/Source/WebCore/ChangeLog 2019-10-10 01:27:14 UTC (rev 250950)
+++ trunk/Source/WebCore/ChangeLog 2019-10-10 01:44:50 UTC (rev 250951)
@@ -1,3 +1,13 @@
+2019-10-09 Sihui Liu <[email protected]>
+
+ 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 <[email protected]>
[Clipboard API] Refactor Pasteboard item reading functions to work on both iOS and macOS
Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (250950 => 250951)
--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2019-10-10 01:27:14 UTC (rev 250950)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2019-10-10 01:44:50 UTC (rev 250951)
@@ -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();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
