Changeset 88921 in webkit

Timestamp:

Jun 15, 2011 6:17:18 AM (13 years ago)

Author:

hans@chromium.org

Message:

2011-06-14 Hans Wennborg <​hans@chromium.org>

Reviewed by Tony Gentilcore.

IndexedDB: LevelDB doesn't do incognito mode; fall back to SQLite.
​https://bugs.webkit.org/show_bug.cgi?id=62633

LevelDB does not support in-memory databases. Fall back to SQLite
for incognito mode browsing. This will be tested by browser_tests
in Chromium.

• src/WebIDBFactoryImpl.cpp: (WebKit::WebIDBFactoryImpl::open):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebIDBFactoryImpl.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-14  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Tony Gentilcore.
+
+        IndexedDB: LevelDB doesn't do incognito mode; fall back to SQLite.
+        https://bugs.webkit.org/show_bug.cgi?id=62633
+
+        LevelDB does not support in-memory databases. Fall back to SQLite
+        for incognito mode browsing. This will be tested by browser_tests
+        in Chromium.
+
+        * src/WebIDBFactoryImpl.cpp:
+        (WebKit::WebIDBFactoryImpl::open):
+
 2011-06-10  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp

@@ -76 +76 @@
     WebString path = dataDir;
     if (overriddenBackingStoreType != DefaultBackingStore) {
+        // Backing store type overridden by LayoutTestController.
         backingStoreType = overriddenBackingStoreType;
 
-        // The dataDir is empty for two reasons: LevelDB in icognito mode or
-        // LevelDB from DumpRenderTree. The first case is taken care of inside
-        // IDBFactoryBackendImpl.cpp by forcing SQLITE backend for incognito.
-        // For the DumpRenderTree case we need to keep track of the location
-        // so we can wipe it out when we're done with the test.
-        if (dataDir.isEmpty() && backingStoreType == LevelDBBackingStore)
+        // dataDir is empty for layout tests.
+        ASSERT(dataDir.isEmpty());
+
+        if (backingStoreType == LevelDBBackingStore) {
+            // LevelDB doesn't support in-memory databases, so use a temporary folder.
             path = tempDatabaseFolder;
+        }
+    } else if (dataDir.isEmpty() && backingStoreType == LevelDBBackingStore) {
+        // Fall back to SQLite for incognito mode.
+        backingStoreType = SQLiteBackingStore;
     }
+
     m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(adoptPtr(callbacks)), origin, 0, path, maximumSize, static_cast<IDBFactoryBackendInterface::BackingStoreType>(backingStoreType));
 }