diff options
| author | Steve Block <steveblock@google.com> | 2009-10-23 12:43:55 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-27 11:12:06 +0000 |
| commit | 3a209a6ece975c026508762103516b7d0e55c18a (patch) | |
| tree | ac5d37ae7266755cf0462ac1ff54d50ef9e8daaa /WebCore/storage/Database.cpp | |
| parent | 1e13e466217c7ffb96f5cde0ad0ab8606c0c2481 (diff) | |
| download | external_webkit-3a209a6ece975c026508762103516b7d0e55c18a.zip external_webkit-3a209a6ece975c026508762103516b7d0e55c18a.tar.gz external_webkit-3a209a6ece975c026508762103516b7d0e55c18a.tar.bz2 | |
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
Diffstat (limited to 'WebCore/storage/Database.cpp')
| -rw-r--r-- | WebCore/storage/Database.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp index 3a8225b..403e132 100644 --- a/WebCore/storage/Database.cpp +++ b/WebCore/storage/Database.cpp @@ -46,6 +46,7 @@ #include "NotImplemented.h" #include "Page.h" #include "OriginQuotaManager.h" +#include "ScriptController.h" #include "SQLiteDatabase.h" #include "SQLiteFileSystem.h" #include "SQLiteStatement.h" @@ -57,9 +58,6 @@ #if USE(JSC) #include "JSDOMWindow.h" -#include <runtime/InitializeThreading.h> -#elif USE(V8) -#include "InitializeThreading.h" #endif namespace WebCore { @@ -165,11 +163,7 @@ Database::Database(Document* document, const String& name, const String& expecte if (m_name.isNull()) m_name = ""; -#if USE(JSC) - JSC::initializeThreading(); -#elif USE(V8) - V8::initializeThreading(); -#endif + ScriptController::initializeThreading(); m_guid = guidForOriginAndName(m_securityOrigin->toString(), name); |