From 3a209a6ece975c026508762103516b7d0e55c18a Mon Sep 17 00:00:00 2001 From: Steve Block Date: Fri, 23 Oct 2009 12:43:55 +0100 Subject: Adds ScriptController::initializeThreading(), to allow initializeThreading() to be used with both JSC and V8 without the use of ifdefs. See https://bugs.webkit.org/show_bug.cgi?id=30678 This has now been upstreamed to webkit.org, so submitting to Android to avoid future merge conflicts. Change-Id: Ia17a9f02060f04b11a8bffa367164162775516ba --- WebCore/loader/icon/IconDatabase.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'WebCore/loader') diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp index 8982cda..5a9bfaa 100644 --- a/WebCore/loader/icon/IconDatabase.cpp +++ b/WebCore/loader/icon/IconDatabase.cpp @@ -36,6 +36,7 @@ #include "IconRecord.h" #include "IntSize.h" #include "Logging.h" +#include "ScriptController.h" #include "SQLiteStatement.h" #include "SQLiteTransaction.h" #include "SuddenTermination.h" @@ -43,12 +44,6 @@ #include #include -#if USE(JSC) -#include -#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()) @@ -98,11 +93,7 @@ static IconDatabaseClient* defaultClient() IconDatabase* iconDatabase() { if (!sharedIconDatabase) { -#if USE(JSC) - JSC::initializeThreading(); -#elif USE(V8) - V8::initializeThreading(); -#endif + ScriptController::initializeThreading(); sharedIconDatabase = new IconDatabase; } return sharedIconDatabase; -- cgit v1.1