Changeset 160659 in webkit

Timestamp:

Dec 16, 2013 1:26:59 PM (10 years ago)

Author:

beidson@apple.com

Message:

DatabaseProcess: Fix a few bugs with opening an IDB connection
​https://bugs.webkit.org/show_bug.cgi?id=125798

Reviewed by Alexey Proskuryakov.

Source/WebCore:

• Modules/indexeddb/IDBDatabaseBackend.cpp:

(WebCore::IDBDatabaseBackend::processPendingCalls): As the comment says, we should only

early return when there *are* pending delete calls. The logic here was backwards,
preventing the backend from ever getting to processPendingOpenCalls().

Source/WebKit2:

Database metadata always needs a non-zero database identifier, unique at runtime.

• DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:

(WebKit::generateDatabaseId):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-16  Brady Eidson  <beidson@apple.com>
+
+        DatabaseProcess: Fix a few bugs with opening an IDB connection
+        https://bugs.webkit.org/show_bug.cgi?id=125798
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Modules/indexeddb/IDBDatabaseBackend.cpp:
+        (WebCore::IDBDatabaseBackend::processPendingCalls): As the comment says, we should only
+          early return when there *are* pending delete calls. The logic here was backwards,
+          preventing the backend from ever getting to processPendingOpenCalls().
+
 2013-12-16  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackend.cpp

@@ -392 +392 @@
     // If there are any database deletions waiting for completion, we're done for now.
     // Further callbacks will be handled in a future call to processPendingCalls().
-    if (m_deleteCallbacksWaitingCompletion.isEmpty())
+    if (!m_deleteCallbacksWaitingCompletion.isEmpty())
         return;
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-16  Brady Eidson  <beidson@apple.com>
+
+        DatabaseProcess: Fix a few bugs with opening an IDB connection
+        https://bugs.webkit.org/show_bug.cgi?id=125798
+
+        Reviewed by Alexey Proskuryakov.
+
+        Database metadata always needs a non-zero database identifier, unique at runtime.
+
+        * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+        (WebKit::generateDatabaseId):
+        (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
+
 2013-12-16  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp

@@ -41 +41 @@
 // Current version of the metadata schema being used in the metadata database.
 static const int currentMetadataVersion = 1;
+
+static int64_t generateDatabaseId()
+{
+    static int64_t databaseID = 0;
+
+    ASSERT(!isMainThread());
+    return ++databaseID;
+}
 
 UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite(const UniqueIDBDatabaseIdentifier& identifier, const String& databaseDirectory)
@@ -174 +182 @@
         LOG_ERROR("Unable to establish IDB database at path '%s'", metadataDBFilename.utf8().data());
 
+    // The database id is a runtime concept and doesn't need to be stored in the metadata database.
+    metadata->id = generateDatabaseId();
+
     return metadata;
 }