Changeset 192748 in webkit

Timestamp:

Nov 23, 2015, 11:41:05 AM (10 years ago)

Author:

beidson@apple.com

Message:

Modern IDB: Unskip storage/indexeddb/mozilla/global-data.html.
​https://bugs.webkit.org/show_bug.cgi?id=151557

Reviewed by Alex Christensen.

Source/WebCore:

No new tests (Unskipping existing test storage/indexeddb/mozilla/global-data.html).

• Reworking some invalid ASSERTS
• Actually opening pending open-database-requests after a version change transaction completes
• Allow starting new transactions when the version change transaction has *started* finishing, but before it finishes finishing.

• Modules/indexeddb/client/IDBDatabaseImpl.cpp:

(WebCore::IDBClient::IDBDatabase::transaction):

• Modules/indexeddb/client/IDBTransactionImpl.h:

• Modules/indexeddb/server/MemoryObjectStore.cpp:

(WebCore::IDBServer::MemoryObjectStore::~MemoryObjectStore):

• Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:

(WebCore::IDBServer::MemoryObjectStoreCursor::keyAdded): Deleted.

• Modules/indexeddb/server/UniqueIDBDatabase.cpp:

(WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
(WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations):
(WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):

• Modules/indexeddb/server/UniqueIDBDatabase.h:

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/client/IDBDatabaseImpl.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/MemoryObjectStore.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/MemoryObjectStoreCursor.cpp (modified) (1 diff)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (modified) (3 diffs)
• Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-11-23  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Unskip storage/indexeddb/mozilla/global-data.html.
+        https://bugs.webkit.org/show_bug.cgi?id=151557
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
 2015-11-17  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -73 +73 @@
 # But Modern IndexedDB is.
 storage/indexeddb/modern [ Pass ]
+storage/indexeddb/mozilla/global-data.html [ Pass ]
 
 # Fails with WebKit1 only.

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-23  Brady Eidson  <beidson@apple.com>
+
+        Modern IDB: Unskip storage/indexeddb/mozilla/global-data.html.
+        https://bugs.webkit.org/show_bug.cgi?id=151557
+
+        Reviewed by Alex Christensen.
+
+        No new tests (Unskipping existing test storage/indexeddb/mozilla/global-data.html).
+
+        - Reworking some invalid ASSERTS
+        - Actually opening pending open-database-requests after a version change transaction completes
+        - Allow starting new transactions when the version change transaction has *started* finishing, 
+          but before it finishes finishing.
+
+        * Modules/indexeddb/client/IDBDatabaseImpl.cpp:
+        (WebCore::IDBClient::IDBDatabase::transaction):
+        
+        * Modules/indexeddb/client/IDBTransactionImpl.h:
+        
+        * Modules/indexeddb/server/MemoryObjectStore.cpp:
+        (WebCore::IDBServer::MemoryObjectStore::~MemoryObjectStore):
+        
+        * Modules/indexeddb/server/MemoryObjectStoreCursor.cpp:
+        (WebCore::IDBServer::MemoryObjectStoreCursor::keyAdded): Deleted.
+        
+        * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+        (WebCore::IDBServer::UniqueIDBDatabase::UniqueIDBDatabase):
+        (WebCore::IDBServer::UniqueIDBDatabase::handleOpenDatabaseOperations):
+        (WebCore::IDBServer::UniqueIDBDatabase::commitTransaction):
+        * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
 2015-11-23  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

trunk/Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp

@@ -157 +157 @@
     }
 
-    if (m_versionChangeTransaction) {
+    if (m_versionChangeTransaction && !m_versionChangeTransaction->isFinishedOrFinishing()) {
         ec = INVALID_STATE_ERR;
         return nullptr;

trunk/Source/WebCore/Modules/indexeddb/client/IDBTransactionImpl.h

@@ -124 +124 @@
     void operationDidComplete(TransactionOperation&);
 
+    bool isFinishedOrFinishing() const;
+
 private:
     IDBTransaction(IDBDatabase&, const IDBTransactionInfo&, IDBOpenDBRequest*);
-
-    bool isFinishedOrFinishing() const;
 
     void commit();

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

@@ -56 +56 @@
 MemoryObjectStore::~MemoryObjectStore()
 {
-    ASSERT(!m_writeTransaction);
+    m_writeTransaction = nullptr;
 }
 

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

@@ -63 +63 @@
 void MemoryObjectStoreCursor::keyAdded(std::set<IDBKeyData>::iterator iterator)
 {
-    ASSERT(m_currentPositionKey.isValid());
-
     if (hasIterators())
         return;

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

@@ -46 +46 @@
     , m_identifier(identifier)
     , m_deleteOrRunTransactionsTimer(*this, &UniqueIDBDatabase::deleteOrRunTransactionsTimerFired)
+    , m_handleOpenDatabaseOperationsTimer(*this, &UniqueIDBDatabase::handleOpenDatabaseOperations)
 {
 }
@@ -114 +115 @@
     // We will try again later.
     if (m_versionChangeDatabaseConnection)
+        return;
+
+    if (m_pendingOpenDatabaseOperations.isEmpty())
         return;
 
@@ -714 +718 @@
         m_versionChangeTransaction = nullptr;
         m_versionChangeDatabaseConnection = nullptr;
+
+        if (!m_handleOpenDatabaseOperationsTimer.isActive())
+            m_handleOpenDatabaseOperationsTimer.startOneShot(0);
     }
 

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

@@ -187 +187 @@
 
     Timer m_deleteOrRunTransactionsTimer;
+    Timer m_handleOpenDatabaseOperationsTimer;
 
     Deque<RefPtr<UniqueIDBDatabaseTransaction>> m_pendingTransactions;