Title: [190899] trunk/Source/WebCore
Revision
190899
Author
beid...@apple.com
Date
2015-10-12 15:51:59 -0700 (Mon, 12 Oct 2015)

Log Message

Followup to:
Modern IDB: Start version change transaction for connections to new database.
https://bugs.webkit.org/show_bug.cgi?id=150033

Reviewed by NOBODY (Fixing existing test flakiness)

No new tests (Covered by existing tests)

* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Early return if a version change transaction
  is already in progress.

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (190898 => 190899)


--- trunk/Source/WebCore/ChangeLog	2015-10-12 22:43:49 UTC (rev 190898)
+++ trunk/Source/WebCore/ChangeLog	2015-10-12 22:51:59 UTC (rev 190899)
@@ -1,3 +1,17 @@
+2015-10-12  Brady Eidson  <beid...@apple.com>
+
+        Followup to:
+        Modern IDB: Start version change transaction for connections to new database.
+        https://bugs.webkit.org/show_bug.cgi?id=150033
+
+        Reviewed by NOBODY (Fixing existing test flakiness)
+
+        No new tests (Covered by existing tests)
+
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations): Early return if a version change transaction
+          is already in progress.
+
 2015-10-12  Myles C. Maxfield  <mmaxfi...@apple.com>
 
         [Font Features] Tiny cleanup regarding FontCascade::typesettingFeatures()

Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (190898 => 190899)


--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2015-10-12 22:43:49 UTC (rev 190898)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp	2015-10-12 22:51:59 UTC (rev 190899)
@@ -68,6 +68,11 @@
     ASSERT(isMainThread());
     LOG(IndexedDB, "(main) UniqueIDBDatabase::handleOpenDatabaseOperations");
 
+    // If a version change transaction is currently in progress, no new connections can be opened right now.
+    // We will try again later.
+    if (m_versionChangeDatabaseConnection)
+        return;
+
     auto operation = m_pendingOpenDatabaseOperations.takeFirst();
 
     // 3.3.1 Opening a database
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to