Changeset 87257 in webkit

Timestamp:

May 24, 2011 8:00:58 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-24 Greg Simon <​gregsimon@chromium.org>

Reviewed by Dimitri Glazkov.

Control Indexeddb backends from LayoutTestController
​https://bugs.webkit.org/show_bug.cgi?id=61000

LayoutTest for migration between SQLite and LevelDB
in IndxededDB.

• storage/indexeddb/migrate-basics-expected.txt: Added.
• storage/indexeddb/migrate-basics.html: Added.

2011-05-24 Greg Simon <​gregsimon@chromium.org>

Reviewed by Dimitri Glazkov.

Control Indexeddb backends from LayoutTestController
​https://bugs.webkit.org/show_bug.cgi?id=61000

Test: storage/indexeddb/migrate-basics.html

• storage/IDBBackingStore.h:
• storage/IDBFactoryBackendImpl.cpp: (WebCore::IDBFactoryBackendImpl::IDBFactoryBackendImpl): (WebCore::IDBFactoryBackendImpl::open): (WebCore::IDBFactoryBackendImpl::setEnableMigration): (WebCore::IDBFactoryBackendImpl::migrate):
• storage/IDBFactoryBackendImpl.h:
• storage/IDBFactoryBackendInterface.h:
• storage/IDBLevelDBBackingStore.cpp: (WebCore::IDBLevelDBBackingStore::backingStoreExists):
• storage/IDBLevelDBBackingStore.h: (WebCore::IDBLevelDBBackingStore::backingStoreType):
• storage/IDBSQLiteBackingStore.cpp: (WebCore::IDBSQLiteBackingStore::backingStoreExists):
• storage/IDBSQLiteBackingStore.h: (WebCore::IDBSQLiteBackingStore::backingStoreType):

2011-05-24 Greg Simon <​gregsimon@chromium.org>

Reviewed by Dimitri Glazkov.

Control Indexeddb backends from LayoutTestController
​https://bugs.webkit.org/show_bug.cgi?id=61000

• public/WebIDBFactory.h: (WebKit::WebIDBFactory::setEnableMigration):
• src/AssertMatchingEnums.cpp:
• src/IDBFactoryBackendProxy.cpp: (WebKit::IDBFactoryBackendProxy::setEnableMigration):
• src/IDBFactoryBackendProxy.h:
• src/WebIDBFactoryImpl.cpp: (WebKit::WebIDBFactory::setOverrideBackingStoreType): (WebKit::WebIDBFactory::setTemporaryDatabaseFolder): (WebKit::WebIDBFactoryImpl::WebIDBFactoryImpl): (WebKit::WebIDBFactoryImpl::open): (WebKit::WebIDBFactoryImpl::setEnableMigration):
• src/WebIDBFactoryImpl.h:

2011-05-24 Greg Simon <​gregsimon@chromium.org>

Reviewed by Dimitri Glazkov.

Control Indexeddb backends from LayoutTestController
​https://bugs.webkit.org/show_bug.cgi?id=61000

• DumpRenderTree/chromium/LayoutTestController.cpp: (LayoutTestController::LayoutTestController): (LayoutTestController::setOverrideIndexedDBBackingStore): (LayoutTestController::clearAllDatabases):
• DumpRenderTree/chromium/LayoutTestController.h:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/storage/indexeddb/migrate-basics-expected.txt (added)
• LayoutTests/storage/indexeddb/migrate-basics.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/storage/IDBBackingStore.h (modified) (3 diffs)
• Source/WebCore/storage/IDBFactoryBackendImpl.cpp (modified) (4 diffs)
• Source/WebCore/storage/IDBFactoryBackendImpl.h (modified) (2 diffs)
• Source/WebCore/storage/IDBFactoryBackendInterface.h (modified) (1 diff)
• Source/WebCore/storage/IDBLevelDBBackingStore.cpp (modified) (1 diff)
• Source/WebCore/storage/IDBLevelDBBackingStore.h (modified) (1 diff)
• Source/WebCore/storage/IDBSQLiteBackingStore.cpp (modified) (1 diff)
• Source/WebCore/storage/IDBSQLiteBackingStore.h (modified) (1 diff)
• Source/WebKit/chromium/ChangeLog (modified) (1 diff)
• Source/WebKit/chromium/public/WebIDBFactory.h (modified) (1 diff)
• Source/WebKit/chromium/src/AssertMatchingEnums.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/IDBFactoryBackendProxy.cpp (modified) (1 diff)
• Source/WebKit/chromium/src/IDBFactoryBackendProxy.h (modified) (1 diff)
• Source/WebKit/chromium/src/WebIDBFactoryImpl.cpp (modified) (3 diffs)
• Source/WebKit/chromium/src/WebIDBFactoryImpl.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/LayoutTestController.cpp (modified) (5 diffs)
• Tools/DumpRenderTree/chromium/LayoutTestController.h (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-24  Greg Simon  <gregsimon@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Control Indexeddb backends from LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=61000
+
+        LayoutTest for migration between SQLite and LevelDB
+        in IndxededDB.
+
+        * storage/indexeddb/migrate-basics-expected.txt: Added.
+        * storage/indexeddb/migrate-basics.html: Added.
+
 2011-05-24  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-24  Greg Simon  <gregsimon@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Control Indexeddb backends from LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=61000
+
+        Test: storage/indexeddb/migrate-basics.html
+
+        * storage/IDBBackingStore.h:
+        * storage/IDBFactoryBackendImpl.cpp:
+        (WebCore::IDBFactoryBackendImpl::IDBFactoryBackendImpl):
+        (WebCore::IDBFactoryBackendImpl::open):
+        (WebCore::IDBFactoryBackendImpl::setEnableMigration):
+        (WebCore::IDBFactoryBackendImpl::migrate):
+        * storage/IDBFactoryBackendImpl.h:
+        * storage/IDBFactoryBackendInterface.h:
+        * storage/IDBLevelDBBackingStore.cpp:
+        (WebCore::IDBLevelDBBackingStore::backingStoreExists):
+        * storage/IDBLevelDBBackingStore.h:
+        (WebCore::IDBLevelDBBackingStore::backingStoreType):
+        * storage/IDBSQLiteBackingStore.cpp:
+        (WebCore::IDBSQLiteBackingStore::backingStoreExists):
+        * storage/IDBSQLiteBackingStore.h:
+        (WebCore::IDBSQLiteBackingStore::backingStoreType):
+
 2011-05-24  Leo Yang  <leo.yang@torchmobile.com.cn>
 

trunk/Source/WebCore/storage/IDBBackingStore.h

@@ -30 +30 @@
 
 #include "IDBCursor.h"
+#include "IDBFactoryBackendImpl.h"
+#include "IDBFactoryBackendInterface.h"
 #include "SQLiteDatabase.h"
 #include <wtf/PassRefPtr.h>
@@ -38 +40 @@
 namespace WebCore {
 
-class IDBFactoryBackendImpl;
 class IDBKey;
 class IDBKeyRange;
@@ -107 +108 @@
     };
     virtual PassRefPtr<Transaction> createTransaction() = 0;
+    virtual IDBFactoryBackendInterface::BackingStoreType backingStoreType() = 0;
 };
 

trunk/Source/WebCore/storage/IDBFactoryBackendImpl.cpp

@@ -46 +46 @@
 IDBFactoryBackendImpl::IDBFactoryBackendImpl()
     : m_transactionCoordinator(IDBTransactionCoordinator::create())
+    , m_migrateEnabled(false)
 {
 }
@@ -77 +78 @@
     IDBDatabaseBackendMap::iterator it = m_databaseBackendMap.find(uniqueIdentifier);
     if (it != m_databaseBackendMap.end()) {
-        callbacks->onSuccess(it->second);
-        return;
+        // Also check that backing store types match: this is important for migration.
+        if ((backingStoreType == DefaultBackingStore) || (backingStoreType == it->second->backingStore()->backingStoreType())) {
+            callbacks->onSuccess(it->second);
+            return;
+        }
     }
 
@@ -85 +89 @@
     RefPtr<IDBBackingStore> backingStore;
     IDBBackingStoreMap::iterator it2 = m_backingStoreMap.find(fileIdentifier);
-    if (it2 != m_backingStoreMap.end())
+    if (it2 != m_backingStoreMap.end() && (backingStoreType == it2->second->backingStoreType()))
         backingStore = it2->second;
     else {
-        if (backingStoreType == DefaultBackingStore)
+#if ENABLE(LEVELDB)
+        if (m_migrateEnabled) {
+            bool hasSQLBackend = IDBSQLiteBackingStore::backingStoreExists(securityOrigin.get(), dataDir);
+            bool hasLevelDbBackend = IDBLevelDBBackingStore::backingStoreExists(securityOrigin.get(), dataDir);
+
+            if (hasSQLBackend && hasLevelDbBackend)
+                backingStoreType = LevelDBBackingStore;
+
+            // Migration: if the database exists and is SQLite we want to migrate it to LevelDB.
+            if (hasSQLBackend && !hasLevelDbBackend) {
+                if (migrate(name, securityOrigin.get(), dataDir, maximumSize))
+                    backingStoreType = LevelDBBackingStore;
+                else
+                    backingStoreType = DefaultBackingStore;
+            }
+        }
+#endif
+
+        if (backingStoreType == DefaultBackingStore || backingStoreType == SQLiteBackingStore)
             backingStore = IDBSQLiteBackingStore::open(securityOrigin.get(), dataDir, maximumSize, fileIdentifier, this);
 #if ENABLE(LEVELDB)
@@ -105 +127 @@
 }
 
+void IDBFactoryBackendImpl::setEnableMigration(bool enabled)
+{
+    m_migrateEnabled = enabled;
+}
+
+bool IDBFactoryBackendImpl::migrate(const String& name, SecurityOrigin* securityOrigin, const String& dataDir, int64_t maximumSize)
+{
+    // FIXME: Implement migration.
+    return false;
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/storage/IDBFactoryBackendImpl.h

@@ -57 +57 @@
 
     virtual void open(const String& name, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType);
+    virtual void setEnableMigration(bool);
 
 private:
     IDBFactoryBackendImpl();
+    bool migrate(const String& name, SecurityOrigin*, const String& dataDir, int64_t maximumSize);
 
     typedef HashMap<String, IDBDatabaseBackendImpl*> IDBDatabaseBackendMap;
@@ -68 +70 @@
 
     RefPtr<IDBTransactionCoordinator> m_transactionCoordinator;
+
+    bool m_migrateEnabled;
 
     // Only one instance of the factory should exist at any given time.

trunk/Source/WebCore/storage/IDBFactoryBackendInterface.h

@@ -54 +54 @@
     enum BackingStoreType {
         DefaultBackingStore,
-        LevelDBBackingStore
+        LevelDBBackingStore,
+        SQLiteBackingStore
     };
 
     virtual void open(const String& name, PassRefPtr<IDBCallbacks>, PassRefPtr<SecurityOrigin>, Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType) = 0;
+    virtual void setEnableMigration(bool) = 0;
 };
 

trunk/Source/WebCore/storage/IDBLevelDBBackingStore.cpp

@@ -1267 +1267 @@
 }
 
+bool IDBLevelDBBackingStore::backingStoreExists(SecurityOrigin* securityOrigin, const String& pathBaseArg)
+{
+    String pathBase = pathBaseArg;
+
+    if (pathBase.isEmpty())
+        return false;
+
+    // FIXME: We should eventually use the same LevelDB database for all origins.
+    String path = pathByAppendingComponent(pathBase, securityOrigin->databaseIdentifier() + ".indexeddb.leveldb");
+
+    // FIXME: It would be more thorough to open the database here but also more expensive.
+    if (fileExists(path+"/CURRENT"))
+        return true;
+
+    return false;
+}
+
 // FIXME: deleteDatabase should be part of IDBBackingStore.
 

trunk/Source/WebCore/storage/IDBLevelDBBackingStore.h

@@ -73 +73 @@
 
     virtual PassRefPtr<Transaction> createTransaction();
+    virtual IDBFactoryBackendInterface::BackingStoreType backingStoreType() { return IDBFactoryBackendInterface::LevelDBBackingStore; }
+
+    static bool backingStoreExists(SecurityOrigin*, const String& pathBase);
 
 private:

trunk/Source/WebCore/storage/IDBSQLiteBackingStore.cpp

@@ -992 +992 @@
 }
 
+bool IDBSQLiteBackingStore::backingStoreExists(SecurityOrigin* securityOrigin, const String& pathBase)
+{
+    String path = pathByAppendingComponent(pathBase, securityOrigin->databaseIdentifier() + ".indexeddb");
+
+    SQLiteDatabase db;
+    if (!db.open(path))
+        return false;
+
+    db.close();
+    return true;
+}
+
 namespace {
 

trunk/Source/WebCore/storage/IDBSQLiteBackingStore.h

@@ -68 +68 @@
 
     virtual PassRefPtr<Transaction> createTransaction();
+    virtual IDBFactoryBackendInterface::BackingStoreType backingStoreType() { return IDBFactoryBackendInterface::SQLiteBackingStore; }
+
+    static bool backingStoreExists(SecurityOrigin*, const String& pathBase);
 
 private:

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-05-24  Greg Simon  <gregsimon@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Control Indexeddb backends from LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=61000
+
+        * public/WebIDBFactory.h:
+        (WebKit::WebIDBFactory::setEnableMigration):
+        * src/AssertMatchingEnums.cpp:
+        * src/IDBFactoryBackendProxy.cpp:
+        (WebKit::IDBFactoryBackendProxy::setEnableMigration):
+        * src/IDBFactoryBackendProxy.h:
+        * src/WebIDBFactoryImpl.cpp:
+        (WebKit::WebIDBFactory::setOverrideBackingStoreType):
+        (WebKit::WebIDBFactory::setTemporaryDatabaseFolder):
+        (WebKit::WebIDBFactoryImpl::WebIDBFactoryImpl):
+        (WebKit::WebIDBFactoryImpl::open):
+        (WebKit::WebIDBFactoryImpl::setEnableMigration):
+        * src/WebIDBFactoryImpl.h:
+
 2011-05-24  Jay Civelli  <jcivelli@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebIDBFactory.h

@@ -54 +54 @@
     enum BackingStoreType {
         DefaultBackingStore,
-        LevelDBBackingStore
+        LevelDBBackingStore,
+        SQLiteBackingStore
     };
 
     // The WebKit implementation of open ignores the WebFrame* parameter.
     virtual void open(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir, unsigned long long maximumSize, BackingStoreType) { WEBKIT_ASSERT_NOT_REACHED(); }
+    virtual void setEnableMigration(bool) { WEBKIT_ASSERT_NOT_REACHED(); }
 
     virtual void deleteDatabase(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir) { WEBKIT_ASSERT_NOT_REACHED(); }
+
+    // Used for DumpRenderTree tests.
+    WEBKIT_API static void setOverrideBackingStoreType(BackingStoreType);
+    WEBKIT_API static void setTemporaryDatabaseFolder(const WebString& path);
 };
 

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

@@ -400 +400 @@
 COMPILE_ASSERT_MATCHING_ENUM(WebIDBFactory::DefaultBackingStore, IDBFactoryBackendInterface::DefaultBackingStore);
 COMPILE_ASSERT_MATCHING_ENUM(WebIDBFactory::LevelDBBackingStore, IDBFactoryBackendInterface::LevelDBBackingStore);
+COMPILE_ASSERT_MATCHING_ENUM(WebIDBFactory::SQLiteBackingStore, IDBFactoryBackendInterface::SQLiteBackingStore);
 
 #if ENABLE(FILE_SYSTEM)

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

@@ -78 +78 @@
 }
 
+void IDBFactoryBackendProxy::setEnableMigration(bool enable)
+{
+    m_webIDBFactory->setEnableMigration(enable);
+}
+
+
 } // namespace WebKit
 

trunk/Source/WebKit/chromium/src/IDBFactoryBackendProxy.h

@@ -47 +47 @@
     PassRefPtr<WebCore::DOMStringList> databases(void) const;
     virtual void open(const String& name, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::SecurityOrigin>, WebCore::Frame*, const String& dataDir, int64_t maximumSize, BackingStoreType);
+    virtual void setEnableMigration(bool);
 
 private:

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

@@ -45 +45 @@
 namespace WebKit {
 
+static WebIDBFactory::BackingStoreType overriddenBackingStoreType = WebIDBFactory::DefaultBackingStore;
+static WebString tempDatabaseFolder;
+
 WebIDBFactory* WebIDBFactory::create()
 {
@@ -50 +53 @@
 }
 
+void WebIDBFactory::setOverrideBackingStoreType(BackingStoreType type)
+{
+    overriddenBackingStoreType = type;
+}
+
+void WebIDBFactory::setTemporaryDatabaseFolder(const WebString& path)
+{
+    tempDatabaseFolder = path;
+}
+
 WebIDBFactoryImpl::WebIDBFactoryImpl()
     : m_idbFactoryBackend(IDBFactoryBackendImpl::create())
 {
+    m_idbFactoryBackend->setEnableMigration(true);
 }
 
@@ -61 +75 @@
 void WebIDBFactoryImpl::open(const WebString& name, WebIDBCallbacks* callbacks, const WebSecurityOrigin& origin, WebFrame*, const WebString& dataDir, unsigned long long maximumSize, BackingStoreType backingStoreType)
 {
-    m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(adoptPtr(callbacks)), origin, 0, dataDir, maximumSize, static_cast<IDBFactoryBackendInterface::BackingStoreType>(backingStoreType));
+    WebString path = dataDir;
+    if (overriddenBackingStoreType != DefaultBackingStore) {
+        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)
+            path = tempDatabaseFolder;
+    }
+    m_idbFactoryBackend->open(name, IDBCallbacksProxy::create(adoptPtr(callbacks)), origin, 0, path, maximumSize, static_cast<IDBFactoryBackendInterface::BackingStoreType>(backingStoreType));
+}
+
+void WebIDBFactoryImpl::setEnableMigration(bool enable)
+{
+    m_idbFactoryBackend->setEnableMigration(enable);
 }
 

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

@@ -46 +46 @@
 
     virtual void open(const WebString& name, WebIDBCallbacks*, const WebSecurityOrigin&, WebFrame*, const WebString& dataDir, unsigned long long maximumSize, BackingStoreType);
+    virtual void setEnableMigration(bool);
 
 private:

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-24  Greg Simon  <gregsimon@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Control Indexeddb backends from LayoutTestController
+        https://bugs.webkit.org/show_bug.cgi?id=61000
+
+        * DumpRenderTree/chromium/LayoutTestController.cpp:
+        (LayoutTestController::LayoutTestController):
+        (LayoutTestController::setOverrideIndexedDBBackingStore):
+        (LayoutTestController::clearAllDatabases):
+        * DumpRenderTree/chromium/LayoutTestController.h:
+
 2011-05-24  Robert Hogan  <robert@webkit.org>
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.cpp

@@ -45 +45 @@
 #include "WebFrame.h"
 #include "WebGeolocationClientMock.h"
+#include "WebIDBFactory.h"
 #include "WebInputElement.h"
 #include "WebKit.h"
@@ -83 +84 @@
     // by CppBoundClass, the parent to LayoutTestController).
     bindMethod("addFileToPasteboardOnDrag", &LayoutTestController::addFileToPasteboardOnDrag);
+    bindMethod("addMockSpeechInputResult", &LayoutTestController::addMockSpeechInputResult);
     bindMethod("addOriginAccessWhitelistEntry", &LayoutTestController::addOriginAccessWhitelistEntry);
     bindMethod("addUserScript", &LayoutTestController::addUserScript);
@@ -160 +162 @@
     bindMethod("setMockGeolocationError", &LayoutTestController::setMockGeolocationError);
     bindMethod("setMockGeolocationPosition", &LayoutTestController::setMockGeolocationPosition);
-    bindMethod("addMockSpeechInputResult", &LayoutTestController::addMockSpeechInputResult);
+    bindMethod("setOverrideIndexedDBBackingStore", &LayoutTestController::setOverrideIndexedDBBackingStore);
     bindMethod("setPageVisibility", &LayoutTestController::setPageVisibility);
     bindMethod("setPluginsEnabled", &LayoutTestController::setPluginsEnabled);
@@ -1126 +1128 @@
     // We don't use the WebKit icon database.
     result->setNull();
+}
+
+void LayoutTestController::setOverrideIndexedDBBackingStore(const CppArgumentList& arguments, CppVariant* result)
+{
+    result->setNull();
+#if ENABLE(INDEXED_DATABASE)
+    if (arguments.size() < 1 || !arguments[0].isString())
+        return;
+    string name = arguments[0].toString();
+    if (name == "sqlite")
+        WebIDBFactory::setOverrideBackingStoreType(WebIDBFactory::SQLiteBackingStore);
+    else if (name == "default")
+        WebIDBFactory::setOverrideBackingStoreType(WebIDBFactory::DefaultBackingStore);
+    else if (name == "leveldb") {
+        WebIDBFactory::setOverrideBackingStoreType(WebIDBFactory::LevelDBBackingStore);
+
+        m_tempFolder = adoptPtr(webkit_support::CreateScopedTempDirectory());
+        if (m_tempFolder) {
+            if (m_tempFolder->CreateUniqueTempDir())
+                WebIDBFactory::setTemporaryDatabaseFolder(WebString::fromUTF8(m_tempFolder->path().c_str()));
+        }
+    }
+#endif
 }
 
@@ -1493 +1518 @@
     result->setNull();
     webkit_support::ClearAllDatabases();
+    m_tempFolder.clear();
 }
 

trunk/Tools/DumpRenderTree/chromium/LayoutTestController.h

@@ -57 +57 @@
 }
 
+namespace webkit_support {
+class ScopedTempDirectory;
+}
+
 class TestShell;
 
@@ -305 +309 @@
     // Sets the default quota for all origins
     void setDatabaseQuota(const CppArgumentList&, CppVariant*);
+    // Overrides the backend for IndexedDB
+    void setOverrideIndexedDBBackingStore(const CppArgumentList&, CppVariant*);
 
     // Calls setlocale(LC_ALL, ...) for a specified locale.
@@ -588 +594 @@
     CppVariant m_globalFlag;
 
+    // Used to create and destroy temporary folders.
+    OwnPtr<webkit_support::ScopedTempDirectory> m_tempFolder;
+
     // Bound variable counting the number of top URLs visited.
     CppVariant m_webHistoryItemCount;