diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-17 19:00:37 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-17 19:00:37 +0100 |
| commit | ab4f4d6e9dcd2465524619737cd0bbd7386fa14e (patch) | |
| tree | 36864c081e46c3b5311da4fbbb022b8569cfd43f /WebCore | |
| parent | 69f588f94a1f7829b6b8a1c45319ffc4f17ea5e6 (diff) | |
| download | external_webkit-ab4f4d6e9dcd2465524619737cd0bbd7386fa14e.zip external_webkit-ab4f4d6e9dcd2465524619737cd0bbd7386fa14e.tar.gz external_webkit-ab4f4d6e9dcd2465524619737cd0bbd7386fa14e.tar.bz2 | |
Continue with linker error fixes.
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.v8.mk | 1 | ||||
| -rw-r--r-- | WebCore/loader/icon/IconDatabase.cpp | 11 | ||||
| -rw-r--r-- | WebCore/storage/Database.cpp | 5 |
3 files changed, 16 insertions, 1 deletions
diff --git a/WebCore/Android.v8.mk b/WebCore/Android.v8.mk index bf3d131..cd1b423 100644 --- a/WebCore/Android.v8.mk +++ b/WebCore/Android.v8.mk @@ -143,6 +143,7 @@ LOCAL_SRC_FILES := \ css/MediaQuery.cpp \ css/MediaQueryEvaluator.cpp \ css/MediaQueryExp.cpp \ + css/RGBColor.cpp \ ifeq ($(ENABLE_SVG), true) LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \ 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; diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp index 2292a0a..5504cb1 100644 --- a/WebCore/storage/Database.cpp +++ b/WebCore/storage/Database.cpp @@ -56,6 +56,8 @@ #if USE(JSC) #include "JSDOMWindow.h" #include <runtime/InitializeThreading.h> +#elif USE(V8) +#include "InitializeThreading.h" #endif namespace WebCore { @@ -147,6 +149,9 @@ Database::Database(Document* document, const String& name, const String& expecte JSC::initializeThreading(); // Database code violates the normal JSCore contract by calling jsUnprotect from a secondary thread, and thus needs additional locking. JSDOMWindow::commonJSGlobalData()->heap.setGCProtectNeedsLocking(); +#elif USE(V8) + // TODO(benm): do we need the extra locking in V8 too? (See JSC comment above) + V8::initializeThreading(); #endif m_guid = guidForOriginAndName(m_securityOrigin->toString(), name); |