diff options
Diffstat (limited to 'src/3rdparty/masm/wtf/Platform.h')
| -rw-r--r-- | src/3rdparty/masm/wtf/Platform.h | 361 |
1 files changed, 84 insertions, 277 deletions
diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h index f2fd3b0ad5..5c85c15634 100644 --- a/src/3rdparty/masm/wtf/Platform.h +++ b/src/3rdparty/masm/wtf/Platform.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. + * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved. * Copyright (C) 2007-2009 Torch Mobile, Inc. * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved. * @@ -163,6 +163,8 @@ #endif /* CPU(ARM) - ARM, any version*/ +#define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N) + #if defined(arm) \ || defined(__arm__) \ || defined(ARM) \ @@ -179,19 +181,15 @@ #elif !defined(__ARM_EABI__) \ && !defined(__EABI__) \ && !defined(__VFP_FP__) \ - && !defined(_WIN32_WCE) \ - && !defined(ANDROID) + && !defined(_WIN32_WCE) #define WTF_CPU_MIDDLE_ENDIAN 1 #endif -#define WTF_ARM_ARCH_AT_LEAST(N) (CPU(ARM) && WTF_ARM_ARCH_VERSION >= N) - /* Set WTF_ARM_ARCH_VERSION */ #if defined(__ARM_ARCH_4__) \ || defined(__ARM_ARCH_4T__) \ - || defined(__MARM_ARMV4__) \ - || defined(_ARMV4I_) + || defined(__MARM_ARMV4__) #define WTF_ARM_ARCH_VERSION 4 #elif defined(__ARM_ARCH_5__) \ @@ -216,9 +214,14 @@ #define WTF_ARM_ARCH_VERSION 6 #elif defined(__ARM_ARCH_7A__) \ - || defined(__ARM_ARCH_7R__) + || defined(__ARM_ARCH_7R__) \ + || defined(__ARM_ARCH_7S__) #define WTF_ARM_ARCH_VERSION 7 +/* MSVC sets _M_ARM */ +#elif defined(_M_ARM) +#define WTF_ARM_ARCH_VERSION _M_ARM + /* RVCT sets _TARGET_ARCH_ARM */ #elif defined(__TARGET_ARCH_ARM) #define WTF_ARM_ARCH_VERSION __TARGET_ARCH_ARM @@ -254,8 +257,9 @@ #elif defined(__ARM_ARCH_6T2__) \ || defined(__ARM_ARCH_7__) \ || defined(__ARM_ARCH_7A__) \ + || defined(__ARM_ARCH_7M__) \ || defined(__ARM_ARCH_7R__) \ - || defined(__ARM_ARCH_7M__) + || defined(__ARM_ARCH_7S__) #define WTF_THUMB_ARCH_VERSION 4 /* RVCT sets __TARGET_ARCH_THUMB */ @@ -319,11 +323,6 @@ /* ==== OS() - underlying operating system; only to be used for mandated low-level services like virtual memory, not to choose a GUI toolkit ==== */ -/* OS(ANDROID) - Android */ -#ifdef ANDROID -#define WTF_OS_ANDROID 1 -#endif - /* OS(AIX) - AIX */ #ifdef _AIX #define WTF_OS_AIX 1 @@ -411,7 +410,6 @@ /* OS(UNIX) - Any Unix-like system */ #if OS(AIX) \ - || OS(ANDROID) \ || OS(DARWIN) \ || OS(FREEBSD) \ || OS(HURD) \ @@ -429,7 +427,6 @@ /* Operating environments */ /* FIXME: these are all mixes of OS, operating environment and policy choices. */ -/* PLATFORM(CHROMIUM) */ /* PLATFORM(QT) */ /* PLATFORM(WX) */ /* PLATFORM(EFL) */ @@ -437,9 +434,7 @@ /* PLATFORM(BLACKBERRY) */ /* PLATFORM(MAC) */ /* PLATFORM(WIN) */ -#if defined(BUILDING_CHROMIUM__) -#define WTF_PLATFORM_CHROMIUM 1 -#elif defined(BUILDING_QT__) +#if defined(BUILDING_QT__) #define WTF_PLATFORM_QT 1 #elif defined(BUILDING_WX__) #define WTF_PLATFORM_WX 1 @@ -477,30 +472,7 @@ #define WTF_USE_CA 1 #endif -/* USE(SKIA) for Win/Linux/Mac/Android */ -#if PLATFORM(CHROMIUM) -#if OS(DARWIN) -#define WTF_USE_SKIA 1 -#define WTF_USE_ICCJPEG 1 -#define WTF_USE_QCMSLIB 1 -#elif OS(ANDROID) -#define WTF_USE_SKIA 1 -#define WTF_USE_LOW_QUALITY_IMAGE_INTERPOLATION 1 -#define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_DITHERING 1 -#define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_FANCY_UPSAMPLING 1 -#else -#define WTF_USE_SKIA 1 -#define WTF_USE_ICCJPEG 1 -#define WTF_USE_QCMSLIB 1 -#endif -#endif - -#if OS(QNX) -#define USE_SYSTEM_MALLOC 1 -#endif - #if PLATFORM(BLACKBERRY) -#define WTF_USE_MERSENNE_TWISTER_19937 1 #define WTF_USE_SKIA 1 #define WTF_USE_LOW_QUALITY_IMAGE_INTERPOLATION 1 #define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_DITHERING 1 @@ -512,11 +484,6 @@ #define ENABLE_GLOBAL_FASTMALLOC_NEW 0 #endif - -#if OS(WINCE) -#define WTF_USE_MERSENNE_TWISTER_19937 1 -#endif - /* On Windows, use QueryPerformanceCounter by default */ #if OS(WINDOWS) #define WTF_USE_QUERY_PERFORMANCE_COUNTER 1 @@ -546,25 +513,12 @@ #define WTF_USE_PLUGIN_HOST_PROCESS 1 #endif #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 -#define ENABLE_GESTURE_EVENTS 1 -#define ENABLE_RUBBER_BANDING 1 #define WTF_USE_SCROLLBAR_PAINTER 1 #define HAVE_XPC 1 #endif -#if !defined(ENABLE_DASHBOARD_SUPPORT) -#define ENABLE_DASHBOARD_SUPPORT 1 -#endif #define WTF_USE_CF 1 -#define WTF_USE_PTHREADS 1 #define HAVE_READLINE 1 #define HAVE_RUNLOOP_TIMER 1 -#define ENABLE_FULLSCREEN_API 1 -#define ENABLE_SMOOTH_SCROLLING 1 -#define ENABLE_WEB_ARCHIVE 1 -#define ENABLE_WEB_AUDIO 1 -#if defined(ENABLE_VIDEO) -#define ENABLE_VIDEO_TRACK 1 -#endif #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 #define HAVE_LAYER_HOSTING_IN_WINDOW_SERVER 1 #endif @@ -572,24 +526,6 @@ #define WTF_USE_SECURITY_FRAMEWORK 1 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */ -#if PLATFORM(CHROMIUM) && OS(DARWIN) -#define WTF_USE_CF 1 -#define WTF_USE_PTHREADS 1 -#define WTF_USE_WK_SCROLLBAR_PAINTER 1 -#endif - -#if PLATFORM(CHROMIUM) -#if OS(DARWIN) -/* We can't override the global operator new and delete on OS(DARWIN) because - * some object are allocated by WebKit and deallocated by the embedder. */ -#define ENABLE_GLOBAL_FASTMALLOC_NEW 0 -#else /* !OS(DARWIN) */ -/* On non-OS(DARWIN), the "system malloc" is actually TCMalloc anyway, so there's - * no need to use WebKit's copy of TCMalloc. */ -#define USE_SYSTEM_MALLOC 1 -#endif /* OS(DARWIN) */ -#endif /* PLATFORM(CHROMIUM) */ - #if PLATFORM(IOS) #define DONT_FINALIZE_ON_MAIN_THREAD 1 #endif @@ -603,39 +539,20 @@ #endif #if PLATFORM(IOS) -#define ENABLE_CONTEXT_MENUS 0 -#define ENABLE_DRAG_SUPPORT 0 -#define ENABLE_GEOLOCATION 1 -#define ENABLE_ICONDATABASE 0 -#define ENABLE_INSPECTOR 1 -#define ENABLE_NETSCAPE_PLUGIN_API 0 -#define ENABLE_ORIENTATION_EVENTS 1 -#define ENABLE_REPAINT_THROTTLING 1 -#define ENABLE_WEB_ARCHIVE 1 #define HAVE_READLINE 1 +#define WTF_USE_APPKIT 0 #define WTF_USE_CF 1 #define WTF_USE_CFNETWORK 1 #define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1 -#define WTF_USE_PTHREADS 1 - -#if PLATFORM(IOS_SIMULATOR) - #define ENABLE_JIT 0 - #define ENABLE_YARR_JIT 0 -#else - #define ENABLE_JIT 1 - #define ENABLE_LLINT 1 - #define ENABLE_YARR_JIT 1 -#endif - -#define WTF_USE_APPKIT 0 #define WTF_USE_SECURITY_FRAMEWORK 0 -#endif +#define WTF_USE_WEB_THREAD 1 +#endif /* PLATFORM(IOS) */ #if PLATFORM(WIN) && !OS(WINCE) #define WTF_USE_CF 1 #endif -#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !PLATFORM(WIN_CAIRO) +#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO) #define WTF_USE_CFNETWORK 1 #endif @@ -643,14 +560,6 @@ #define WTF_USE_CFURLCACHE 1 #endif -#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !PLATFORM(QT) -#define ENABLE_WEB_ARCHIVE 1 -#endif - -#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(CHROMIUM) && !PLATFORM(WIN_CAIRO) && !PLATFORM(QT) -#define ENABLE_FULLSCREEN_API 1 -#endif - #if PLATFORM(WX) #if !CPU(PPC) #if !defined(ENABLE_ASSEMBLER) @@ -662,23 +571,28 @@ #define ENABLE_LLINT 0 #if OS(DARWIN) #define WTF_USE_CF 1 -#define ENABLE_WEB_ARCHIVE 1 #endif #endif -#if OS(UNIX) && (PLATFORM(GTK) || PLATFORM(QT)) -#define WTF_USE_PTHREADS 1 -#endif - #if !defined(HAVE_ACCESSIBILITY) -#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && !OS(ANDROID)) || PLATFORM(EFL) +#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL) #define HAVE_ACCESSIBILITY 1 #endif #endif /* !defined(HAVE_ACCESSIBILITY) */ #if OS(UNIX) +#define HAVE_ERRNO_H 1 +#define HAVE_MMAP 1 #define HAVE_SIGNAL_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_SYS_PARAM_H 1 +#define HAVE_SYS_TIME_H 1 #define WTF_USE_OS_RANDOMNESS 1 +#define WTF_USE_PTHREADS 1 +#endif /* OS(UNIX) */ + +#if OS(UNIX) && !OS(QNX) +#define HAVE_LANGINFO_H 1 #endif #if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__) @@ -697,9 +611,7 @@ #endif #endif -#if !OS(WINDOWS) && !OS(SOLARIS) \ - && !OS(RVCT) \ - && !OS(ANDROID) +#if !OS(WINDOWS) && !OS(SOLARIS) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 #define HAVE_TIMEGM 1 @@ -707,78 +619,43 @@ #if OS(DARWIN) -#define HAVE_ERRNO_H 1 -#define HAVE_LANGINFO_H 1 -#define HAVE_MMAP 1 +#define HAVE_DISPATCH_H 1 +#define HAVE_MADV_FREE 1 +#define HAVE_MADV_FREE_REUSE 1 #define HAVE_MERGESORT 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_TIME_H 1 +#define HAVE_PTHREAD_SETNAME_NP 1 #define HAVE_SYS_TIMEB_H 1 #define WTF_USE_ACCELERATE 1 -#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 - -#define HAVE_DISPATCH_H 1 -#define HAVE_HOSTED_CORE_ANIMATION 1 - #if !PLATFORM(IOS) -#define HAVE_MADV_FREE_REUSE 1 -#define HAVE_MADV_FREE 1 -#define HAVE_PTHREAD_SETNAME_NP 1 -#endif - -#endif - -#if PLATFORM(IOS) -#define HAVE_MADV_FREE 1 -#define HAVE_PTHREAD_SETNAME_NP 1 -#endif +#define HAVE_HOSTED_CORE_ANIMATION 1 +#endif /* !PLATFORM(IOS) */ -#elif OS(WINDOWS) +#endif /* OS(DARWIN) */ -#if !OS(WINCE) +#if OS(WINDOWS) && !OS(WINCE) #define HAVE_SYS_TIMEB_H 1 #define HAVE_ALIGNED_MALLOC 1 #define HAVE_ISDEBUGGERPRESENT 1 #endif + +#if OS(WINDOWS) #define HAVE_VIRTUALALLOC 1 #define WTF_USE_OS_RANDOMNESS 1 +#endif -#elif OS(QNX) - -#define HAVE_ERRNO_H 1 -#define HAVE_MMAP 1 +#if OS(QNX) #define HAVE_MADV_FREE_REUSE 1 #define HAVE_MADV_FREE 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_TIME_H 1 -#define WTF_USE_PTHREADS 1 - -#elif OS(ANDROID) - -#define HAVE_ERRNO_H 1 -#define HAVE_NMAP 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_TIME_H 1 - -#else - -/* FIXME: is this actually used or do other platforms generate their own config.h? */ - -#define HAVE_ERRNO_H 1 -#define HAVE_LANGINFO_H 1 -#define HAVE_MMAP 1 -#define HAVE_STRINGS_H 1 -#define HAVE_SYS_PARAM_H 1 -#define HAVE_SYS_TIME_H 1 - #endif /* ENABLE macro defaults */ +/* FIXME: move out all ENABLE() defines from here to FeatureDefines.h */ + +/* Include feature macros */ +#include <wtf/FeatureDefines.h> + #if PLATFORM(QT) /* We must not customize the global operator new and delete for the Qt port. */ #define ENABLE_GLOBAL_FASTMALLOC_NEW 0 @@ -787,66 +664,14 @@ #endif #endif -#if !defined(ENABLE_ICONDATABASE) -#define ENABLE_ICONDATABASE 1 -#endif - -#if !defined(ENABLE_SQL_DATABASE) -#define ENABLE_SQL_DATABASE 1 -#endif - -#if !defined(ENABLE_JAVASCRIPT_DEBUGGER) -#define ENABLE_JAVASCRIPT_DEBUGGER 1 -#endif - -#if !defined(ENABLE_FTPDIR) -#define ENABLE_FTPDIR 1 -#endif - -#if !defined(ENABLE_CONTEXT_MENUS) -#define ENABLE_CONTEXT_MENUS 1 -#endif - -#if !defined(ENABLE_DRAG_SUPPORT) -#define ENABLE_DRAG_SUPPORT 1 -#endif - -#if !defined(ENABLE_INSPECTOR) -#define ENABLE_INSPECTOR 1 -#endif - -#if !defined(ENABLE_NETSCAPE_PLUGIN_API) -#define ENABLE_NETSCAPE_PLUGIN_API 1 +#if PLATFORM(EFL) +#define ENABLE_GLOBAL_FASTMALLOC_NEW 0 #endif #if !defined(ENABLE_GLOBAL_FASTMALLOC_NEW) #define ENABLE_GLOBAL_FASTMALLOC_NEW 1 #endif -#if !defined(ENABLE_PARSED_STYLE_SHEET_CACHING) -#define ENABLE_PARSED_STYLE_SHEET_CACHING 1 -#endif - -#if !defined(ENABLE_SUBPIXEL_LAYOUT) -#if PLATFORM(CHROMIUM) -#define ENABLE_SUBPIXEL_LAYOUT 1 -#else -#define ENABLE_SUBPIXEL_LAYOUT 0 -#endif -#endif - -#if !defined(ENABLE_SATURATED_LAYOUT_ARITHMETIC) -#define ENABLE_SATURATED_LAYOUT_ARITHMETIC 0 -#endif - -#if ENABLE(ENABLE_SATURATED_LAYOUT_ARITHMETIC) && !ENABLE(ENABLE_SUBPIXEL_LAYOUT) -#error "ENABLE_SATURATED_LAYOUT_ARITHMETIC requires ENABLE_SUBPIXEL_LAYOUT" -#endif - -#if ENABLE(INPUT_TYPE_DATE) || ENABLE(INPUT_TYPE_DATETIME) || ENABLE(INPUT_TYPE_DATETIMELOCAL) || ENABLE(INPUT_TYPE_MONTH) || ENABLE(INPUT_TYPE_TIME) || ENABLE(INPUT_TYPE_WEEK) -#define ENABLE_DATE_AND_TIME_INPUT_TYPES 1 -#endif - #define ENABLE_DEBUG_WITH_BREAKPOINT 0 #define ENABLE_SAMPLING_COUNTERS 0 #define ENABLE_SAMPLING_FLAGS 0 @@ -860,10 +685,6 @@ #define ENABLE_SAMPLING_THREAD 1 #endif -#if !defined(ENABLE_TEXT_CARET) && !PLATFORM(IOS) -#define ENABLE_TEXT_CARET 1 -#endif - #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \ || (CPU(IA64) && !CPU(IA64_32)) \ @@ -882,12 +703,6 @@ #define ENABLE_JIT 0 #endif -/* JIT is not implemented for Windows 64-bit */ -#if !defined(ENABLE_JIT) && OS(WINDOWS) && CPU(X86_64) -#define ENABLE_JIT 0 -#define ENABLE_YARR_JIT 0 -#endif - #if !defined(ENABLE_JIT) && CPU(SH4) && PLATFORM(QT) #define ENABLE_JIT 1 #endif @@ -927,13 +742,13 @@ && ENABLE(JIT) \ && (OS(DARWIN) || OS(LINUX)) \ && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK) || PLATFORM(QT)) \ - && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2)) + && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(MIPS)) #define ENABLE_LLINT 1 #endif #if !defined(ENABLE_DFG_JIT) && ENABLE(JIT) && !COMPILER(MSVC) /* Enable the DFG JIT on X86 and X86_64. Only tested on Mac and GNU/Linux. */ -#if (CPU(X86) || CPU(X86_64)) && (PLATFORM(MAC) || OS(LINUX)) +#if (CPU(X86) || CPU(X86_64)) && (OS(DARWIN) || OS(LINUX)) #define ENABLE_DFG_JIT 1 #endif /* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt Linux. */ @@ -944,6 +759,10 @@ #if CPU(ARM_TRADITIONAL) #define ENABLE_DFG_JIT 1 #endif +/* Enable the DFG JIT on MIPS. */ +#if CPU(MIPS) +#define ENABLE_DFG_JIT 1 +#endif #endif /* If the jit is not available, enable the LLInt C Loop: */ @@ -984,6 +803,16 @@ #define ENABLE_WRITE_BARRIER_PROFILING 0 #endif +/* Enable verification that that register allocations are not made within generated control flow. + Turned on for debug builds. */ +#if !defined(ENABLE_DFG_REGISTER_ALLOCATION_VALIDATION) && ENABLE(DFG_JIT) +#if !defined(NDEBUG) +#define ENABLE_DFG_REGISTER_ALLOCATION_VALIDATION 1 +#else +#define ENABLE_DFG_REGISTER_ALLOCATION_VALIDATION 0 +#endif +#endif + /* Configure the JIT */ #if CPU(X86) && COMPILER(MSVC) #define JSC_HOST_CALL __fastcall @@ -994,7 +823,7 @@ #endif /* Configure the interpreter */ -#if COMPILER(GCC) || (RVCT_VERSION_AT_LEAST(4, 0, 0, 0) && defined(__GNUC__)) +#if COMPILER(GCC) || (COMPILER(RVCT) && defined(__GNUC__)) #define HAVE_COMPUTED_GOTO 1 #endif @@ -1007,7 +836,7 @@ #define ENABLE_REGEXP_TRACING 0 /* Yet Another Regex Runtime - turned on by default for JIT enabled ports. */ -#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !PLATFORM(CHROMIUM) && !(OS(QNX) && PLATFORM(QT)) +#if !defined(ENABLE_YARR_JIT) && (ENABLE(JIT) || ENABLE(LLINT_C_LOOP)) && !(OS(QNX) && PLATFORM(QT)) #define ENABLE_YARR_JIT 1 /* Setting this flag compares JIT results with interpreter results. */ @@ -1028,22 +857,13 @@ /* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ #if ENABLE(ASSEMBLER) -#if CPU(X86_64) || PLATFORM(IOS) +#if CPU(X86_64) && !OS(WINDOWS) || PLATFORM(IOS) #define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 #else #define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 #endif #endif -#if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS) -#define ENABLE_PAN_SCROLLING 1 -#endif - -/*Add other platforms as they update their platfrom specific code to handle TextRun's with 8 bit data. */ -#if PLATFORM(MAC) -#define ENABLE_8BIT_TEXTRUN 1 -#endif - /* Use the QXmlStreamReader implementation for XMLDocumentParser */ /* Use the QXmlQuery implementation for XSLTProcessor */ #if PLATFORM(QT) @@ -1058,10 +878,6 @@ #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -#if PLATFORM(MAC) || PLATFORM(IOS) -#define ENABLE_CSS_IMAGE_SET 1 -#endif - #if ENABLE(WEBGL) && !defined(WTF_USE_3D_GRAPHICS) #define WTF_USE_3D_GRAPHICS 1 #endif @@ -1076,7 +892,7 @@ #endif /* Compositing on the UI-process in WebKit2 */ -#if PLATFORM(QT) +#if USE(3D_GRAPHICS) && PLATFORM(QT) #define WTF_USE_COORDINATED_GRAPHICS 1 #endif @@ -1084,14 +900,6 @@ #define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1 #endif -#if !ENABLE(NETSCAPE_PLUGIN_API) || (ENABLE(NETSCAPE_PLUGIN_API) && ((OS(UNIX) && (PLATFORM(GTK) || PLATFORM(QT) || PLATFORM(WX))) || PLATFORM(EFL))) -#define ENABLE_PLUGIN_PACKAGE_SIMPLE_HASH 1 -#endif - -#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 -#define ENABLE_THREADED_SCROLLING 1 -#endif - /* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */ #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK @@ -1120,7 +928,7 @@ #define ENABLE_THREADING_GENERIC 1 #endif -#if ENABLE(GLIB_SUPPORT) +#if USE(GLIB) #include <wtf/gobject/GTypedefs.h> #endif @@ -1157,11 +965,15 @@ #define ENABLE_GC_VALIDATION 1 #endif +#if !defined(ENABLE_BINDING_INTEGRITY) +#define ENABLE_BINDING_INTEGRITY 1 +#endif + #if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 #define WTF_USE_AVFOUNDATION 1 #endif -#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 +#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080) #define WTF_USE_COREMEDIA 1 #endif @@ -1169,7 +981,11 @@ #define HAVE_AVFOUNDATION_TEXT_TRACK_SUPPORT 1 #endif -#if PLATFORM(MAC) || PLATFORM(GTK) || PLATFORM(EFL) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) || PLATFORM(BLACKBERRY) +#if PLATFORM(MAC) && !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 +#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1 +#endif + +#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) || PLATFORM(BLACKBERRY) #define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1 #endif @@ -1185,19 +1001,6 @@ #define WTF_USE_COREAUDIO 1 #endif -#if !defined(WTF_USE_V8) && PLATFORM(CHROMIUM) -#define WTF_USE_V8 1 -#endif - -/* Not using V8 implies using JSC and vice versa */ -#if !USE(V8) -#define WTF_USE_JSC 1 -#endif - -#if ENABLE(NOTIFICATIONS) && PLATFORM(MAC) -#define ENABLE_TEXT_NOTIFICATIONS_ONLY 1 -#endif - #if !defined(WTF_USE_ZLIB) && !PLATFORM(QT) #define WTF_USE_ZLIB 1 #endif @@ -1209,4 +1012,8 @@ #endif #endif +#if !PLATFORM(IOS) && PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 +#define WTF_USE_CONTENT_FILTERING 1 +#endif + #endif /* WTF_Platform_h */ |