diff options
Diffstat (limited to 'WebCore/loader/icon/IconDatabase.cpp')
| -rw-r--r-- | WebCore/loader/icon/IconDatabase.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp index 5705f7a..7e339c1 100644 --- a/WebCore/loader/icon/IconDatabase.cpp +++ b/WebCore/loader/icon/IconDatabase.cpp @@ -40,11 +40,16 @@ #include "PageURLRecord.h" #include "SQLiteStatement.h" #include "SQLiteTransaction.h" -#include <runtime/InitializeThreading.h> #include <wtf/CurrentTime.h> #include <wtf/MainThread.h> #include <wtf/StdLibExtras.h> +#if USE(JSC) +#include <runtime/InitializeThreading.h> +#elif USE(V8) +#include "V8InitializeThreading.h" +#endif + #if PLATFORM(WIN_OS) #include <windows.h> #include <winbase.h> @@ -106,7 +111,11 @@ static IconDatabaseClient* defaultClient() IconDatabase* iconDatabase() { if (!sharedIconDatabase) { +#if USE(JSC) JSC::initializeThreading(); +#elif USE(V8) + V8::initializeThreading(); +#endif sharedIconDatabase = new IconDatabase; } return sharedIconDatabase; @@ -149,7 +158,7 @@ bool IconDatabase::open(const String& databasePath) // Lock here as well as first thing in the thread so the thread doesn't actually commence until the createThread() call // completes and m_syncThreadRunning is properly set m_syncLock.lock(); - m_syncThread = createThread(IconDatabase::iconDatabaseSyncThreadStart, this, "WebCore::IconDatabase"); + m_syncThread = createThread(IconDatabase::iconDatabaseSyncThreadStart, this, "WebCore: IconDatabase"); m_syncLock.unlock(); if (!m_syncThread) return false; |