summaryrefslogtreecommitdiffstats
path: root/WebCore/loader
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2009-08-17 19:00:37 +0100
committerBen Murdoch <benm@google.com>2009-08-17 19:00:37 +0100
commitab4f4d6e9dcd2465524619737cd0bbd7386fa14e (patch)
tree36864c081e46c3b5311da4fbbb022b8569cfd43f /WebCore/loader
parent69f588f94a1f7829b6b8a1c45319ffc4f17ea5e6 (diff)
downloadexternal_webkit-ab4f4d6e9dcd2465524619737cd0bbd7386fa14e.zip
external_webkit-ab4f4d6e9dcd2465524619737cd0bbd7386fa14e.tar.gz
external_webkit-ab4f4d6e9dcd2465524619737cd0bbd7386fa14e.tar.bz2
Continue with linker error fixes.
Diffstat (limited to 'WebCore/loader')
-rw-r--r--WebCore/loader/icon/IconDatabase.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index 9c026d7..1835f69 100644
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -39,11 +39,16 @@
#include "SQLiteStatement.h"
#include "SQLiteTransaction.h"
#include "SuddenTermination.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 "InitializeThreading.h"
+#endif
+
// For methods that are meant to support API from the main thread - should not be called internally
#define ASSERT_NOT_SYNC_THREAD() ASSERT(!m_syncThreadRunning || !IS_ICON_SYNC_THREAD())
@@ -93,7 +98,11 @@ static IconDatabaseClient* defaultClient()
IconDatabase* iconDatabase()
{
if (!sharedIconDatabase) {
+#if USE(JSC)
JSC::initializeThreading();
+#elif USE(V8)
+ V8::initializeThreading();
+#endif
sharedIconDatabase = new IconDatabase;
}
return sharedIconDatabase;