IndexedDB: Object stores not persisting between sessions

inexorabletash · webkit-commit-queue · commit 7fd840514538 · 2011-11-03T17:46:03.000Z
https://bugs.webkit.org/show_bug.cgi?id=71313 Patch by Joshua Bell <jsbell@chromium.org> on 2011-11-03 Reviewed by Tony Chang. Logic flaw introduced with r98806 skipped the loading of object stores during subsequent sessions. * storage/IDBDatabaseBackendImpl.cpp: (WebCore::IDBDatabaseBackendImpl::IDBDatabaseBackendImpl): (WebCore::IDBDatabaseBackendImpl::openInternal): Canonical link: https://commits.webkit.org/87808@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@99218 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2011-11-03  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Object stores not persisting between sessions
+        https://bugs.webkit.org/show_bug.cgi?id=71313
+
+        Reviewed by Tony Chang.
+
+        Logic flaw introduced with r98806 skipped the loading of object stores
+        during subsequent sessions.
+
+        * storage/IDBDatabaseBackendImpl.cpp:
+        (WebCore::IDBDatabaseBackendImpl::IDBDatabaseBackendImpl):
+        (WebCore::IDBDatabaseBackendImpl::openInternal):
+
 2011-11-03  Pavel Feldman  <pfeldman@google.com>
 
         Web Inspector: fix heap profiler rendering and resize.
diff --git a/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp b/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp
@@ -103,18 +103,19 @@ IDBDatabaseBackendImpl::IDBDatabaseBackendImpl(const String& name, IDBBackingSto
     , m_transactionCoordinator(coordinator)
 {
     ASSERT(!m_name.isNull());
-
-    bool success = m_backingStore->getIDBDatabaseMetaData(m_name, m_version, m_id);
-    ASSERT(success == (m_id != InvalidId));
-    if (!success)
-        openInternal();
+    openInternal();
 }
 
 void IDBDatabaseBackendImpl::openInternal()
 {
+    bool success = m_backingStore->getIDBDatabaseMetaData(m_name, m_version, m_id);
+    ASSERT(success == (m_id != InvalidId));
+    if (success) {
+        loadObjectStores();
+        return;
+    }
     if (!m_backingStore->createIDBDatabaseMetaData(m_name, m_version, m_id))
         ASSERT_NOT_REACHED(); // FIXME: Need better error handling.
-    loadObjectStores();
 }
 
 IDBDatabaseBackendImpl::~IDBDatabaseBackendImpl()

Original file line number	Diff line number	Diff line change
`@@ -103,18 +103,19 @@ IDBDatabaseBackendImpl::IDBDatabaseBackendImpl(const String& name, IDBBackingSto`
`103`	`103`	`, m_transactionCoordinator(coordinator)`
`104`	`104`	`{`
`105`	`105`	`ASSERT(!m_name.isNull());`
`106`		`-`
`107`		`- bool success = m_backingStore->getIDBDatabaseMetaData(m_name, m_version, m_id);`
`108`		`- ASSERT(success == (m_id != InvalidId));`
`109`		`- if (!success)`
`110`		`- openInternal();`
	`106`	`+ openInternal();`
`111`	`107`	`}`
`112`	`108`
`113`	`109`	`void IDBDatabaseBackendImpl::openInternal()`
`114`	`110`	`{`
	`111`	`+ bool success = m_backingStore->getIDBDatabaseMetaData(m_name, m_version, m_id);`
	`112`	`+ ASSERT(success == (m_id != InvalidId));`
	`113`	`+ if (success) {`
	`114`	`+ loadObjectStores();`
	`115`	`+ return;`
	`116`	`+ }`
`115`	`117`	`if (!m_backingStore->createIDBDatabaseMetaData(m_name, m_version, m_id))`
`116`	`118`	`ASSERT_NOT_REACHED(); // FIXME: Need better error handling.`
`117`		`- loadObjectStores();`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`IDBDatabaseBackendImpl::~IDBDatabaseBackendImpl()`