diff options
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 5 | ||||
| -rw-r--r-- | JavaScriptCore/wtf/Threading.cpp | 6 | ||||
| -rw-r--r-- | JavaScriptCore/wtf/Threading.h | 4 | ||||
| -rw-r--r-- | JavaScriptCore/wtf/TypeTraits.cpp | 4 | ||||
| -rw-r--r-- | WebCore/config.h | 22 |
5 files changed, 10 insertions, 31 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index df05811..92ab043 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -728,11 +728,6 @@ #define ENABLE_TEXT_CARET 1 #endif -// ANDROID addition: allow web archive to be disabled -#if !defined(ENABLE_ARCHIVE) -#define ENABLE_ARCHIVE 1 -#endif - #if !defined(ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL) #define ENABLE_ON_FIRST_TEXTAREA_FOCUS_SELECT_ALL 0 #endif diff --git a/JavaScriptCore/wtf/Threading.cpp b/JavaScriptCore/wtf/Threading.cpp index 35ba017..74c47f4 100644 --- a/JavaScriptCore/wtf/Threading.cpp +++ b/JavaScriptCore/wtf/Threading.cpp @@ -28,10 +28,6 @@ #include <string.h> -#if PLATFORM(ANDROID) -#include <memory> -#endif - namespace WTF { struct NewThreadContext : FastAllocBase { @@ -79,7 +75,7 @@ ThreadIdentifier createThread(ThreadFunction entryPoint, void* data, const char* NewThreadContext* context = new NewThreadContext(entryPoint, data, name); - // Prevent the thread body from executing until we've established the thread identifier + // Prevent the thread body from executing until we've established the thread identifier. MutexLocker locker(context->creationMutex); return createThreadInternal(threadEntryPoint, context, name); diff --git a/JavaScriptCore/wtf/Threading.h b/JavaScriptCore/wtf/Threading.h index c5e8f2f..b161e77 100644 --- a/JavaScriptCore/wtf/Threading.h +++ b/JavaScriptCore/wtf/Threading.h @@ -73,7 +73,7 @@ #include <windows.h> #elif PLATFORM(DARWIN) #include <libkern/OSAtomic.h> -#elif defined ANDROID +#elif PLATFORM(ANDROID) #include "cutils/atomic.h" #elif COMPILER(GCC) #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) @@ -234,7 +234,7 @@ inline int atomicDecrement(int volatile* addend) { return InterlockedDecrement(r inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); } inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); } -#elif defined ANDROID +#elif PLATFORM(ANDROID) inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); } inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); } diff --git a/JavaScriptCore/wtf/TypeTraits.cpp b/JavaScriptCore/wtf/TypeTraits.cpp index 7c00c38..36fc6c6 100644 --- a/JavaScriptCore/wtf/TypeTraits.cpp +++ b/JavaScriptCore/wtf/TypeTraits.cpp @@ -24,10 +24,6 @@ #include "Assertions.h" -#if PLATFORM(ANDROID) -#include <memory> -#endif - namespace WTF { COMPILE_ASSERT(IsInteger<bool>::value, WTF_IsInteger_bool_true); diff --git a/WebCore/config.h b/WebCore/config.h index 9aa9fbb..f4b93c5 100644 --- a/WebCore/config.h +++ b/WebCore/config.h @@ -76,28 +76,22 @@ #endif /* PLATFORM(WIN_OS) */ // ANDROID def should be after all PLATFORM to avoid override. -// USE_SYSTEM_MALLOC needs to be defined before include FastMalloc.h #if PLATFORM(ANDROID) #define WEBCORE_NAVIGATOR_VENDOR "Google Inc." +// This must be defined before we include FastMalloc.h, below. #define USE_SYSTEM_MALLOC 1 #define ANDROID_MOBILE // change can be merged back to WebKit.org for MOBILE #define LOG_DISABLED 1 #include <wtf/Assertions.h> -// center place to handle which option feature ANDROID will enable -#undef ENABLE_CHANNEL_MESSAGING +// Central place to set which optional features Android uses. #define ENABLE_CHANNEL_MESSAGING 1 -#undef ENABLE_DATABASE -#define ENABLE_DATABASE 1 -#undef ENABLE_DOM_STORAGE #define ENABLE_DOM_STORAGE 1 -#undef ENABLE_FTPDIR +#undef ENABLE_FTPDIR // Enabled by default in Platform.h #define ENABLE_FTPDIR 0 #ifndef ENABLE_SVG #define ENABLE_SVG 0 #endif -#undef ENABLE_VIDEO #define ENABLE_VIDEO 1 -#undef ENABLE_WORKERS #define ENABLE_WORKERS 1 #if ENABLE_SVG #if !defined(ENABLE_SVG_ANIMATION) @@ -116,15 +110,13 @@ #define ENABLE_XPATH 0 #define ENABLE_XSLT 0 -#undef ENABLE_ARCHIVE -#define ENABLE_ARCHIVE 0 // ANDROID addition: allow web archive to be disabled +#define ENABLE_ARCHIVE 0 #define ENABLE_OFFLINE_WEB_APPLICATIONS 1 #define ENABLE_TOUCH_EVENTS 1 -#undef ENABLE_GEOLOCATION +#undef ENABLE_GEOLOCATION // Disabled by default in Platform.h #define ENABLE_GEOLOCATION 1 -#undef ENABLE_INSPECTOR +#undef ENABLE_INSPECTOR // Enabled by default in Platform.h #define ENABLE_INSPECTOR 0 -#undef ENABLE_EVENT_SOURCE #define ENABLE_EVENT_SOURCE 0 #define FLATTEN_FRAMESET @@ -197,7 +189,7 @@ // or if javascript tried to change the location. #define ANDROID_USER_GESTURE -#endif // PLATFORM(ANDROID) +#endif /* PLATFORM(ANDROID) */ #ifdef __cplusplus |