Changeset 194275 in webkit

Timestamp:

Dec 18, 2015, 10:31:34 AM (11 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: Refactor when opening the backing store takes place.
​https://bugs.webkit.org/show_bug.cgi?id=152405

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (At least one failing test now passes).

• Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection): Move the "open backing store" logic

from here to performCurrentOpenOperation.

(WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation): If the database backing store is

not open yet, kick off opening it here.

(WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations): Rework this stuff to be better.

LayoutTests:

• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-12-18  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Refactor when opening the backing store takes place.
+        https://bugs.webkit.org/show_bug.cgi?id=152405
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
 2015-12-18  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -100 +100 @@
 storage/indexeddb/odd-strings.html [ Failure ]
 storage/indexeddb/open-db-private-browsing.html [ Failure ]
-storage/indexeddb/open-ordering.html [ Failure ]
 storage/indexeddb/properties-disabled-at-runtime.html [ Failure ]
 storage/indexeddb/setversion-blocked-by-versionchange-close.html [ Failure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-12-18  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Refactor when opening the backing store takes place.
+        https://bugs.webkit.org/show_bug.cgi?id=152405
+
+        Reviewed by Alex Christensen.
+
+        No new tests (At least one failing test now passes).
+
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::openDatabaseConnection): Move the "open backing store" logic
+          from here to performCurrentOpenOperation.
+        (WebCore::IDBServer::UniqueIDBDatabase::performCurrentOpenOperation): If the database backing store is
+          not open yet, kick off opening it here.
+        (WebCore::IDBServer::UniqueIDBDatabase::handleDatabaseOperations): Rework this stuff to be better.
+
 2015-12-17  Brady Eidson  <beidson@apple.com>
 

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

@@ -76 +76 @@
         return;
 
-    if (m_databaseInfo) {
-        handleDatabaseOperations();
-        return;
-    }
-
-    m_isOpeningBackingStore = true;
-    m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::openBackingStore, m_identifier));
+    handleDatabaseOperations();
 }
 
@@ -109 +103 @@
     ASSERT(m_currentOperation);
     ASSERT(m_currentOperation->isOpenRequest());
+
+    if (!m_databaseInfo) {
+        m_isOpeningBackingStore = true;
+        m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::openBackingStore, m_identifier));
+        return;
+    }
 
     // If we previously started a version change operation but were blocked by having open connections,
@@ -207 +207 @@
     LOG(IndexedDB, "(main) UniqueIDBDatabase::handleDatabaseOperations - There are %zu pending", m_pendingDatabaseOperations.size());
 
-    if (m_pendingDatabaseOperations.isEmpty())
-        return;
-
     if (m_versionChangeDatabaseConnection || m_currentOperation) {
         // We can't start the next database operation quite yet, but we might need to notify all open connections
         // about a pending delete.
-        if (m_pendingDatabaseOperations.first()->isDeleteRequest() && !m_hasNotifiedConnectionsOfDelete) {
+        if (!m_pendingDatabaseOperations.isEmpty() && m_pendingDatabaseOperations.first()->isDeleteRequest() && !m_hasNotifiedConnectionsOfDelete) {
             m_hasNotifiedConnectionsOfDelete = true;
             notifyConnectionsOfVersionChange(0);
         }
-    }
+
+        // Some operations (such as the first open operation after a delete) require multiple passes to completely handle
+        if (m_currentOperation)
+            handleCurrentOperation();
+
+        return;
+    }
+
+    if (m_pendingDatabaseOperations.isEmpty())
+        return;
 
     m_currentOperation = m_pendingDatabaseOperations.takeFirst();