From a1edb80aa888aba706e054f29adf5b9f95768efd Mon Sep 17 00:00:00 2001 From: "ddkilzer@apple.com" Date: Mon, 11 Feb 2013 23:54:55 +0000 Subject: [PATCH] [iOS] Upstream changes to Platform.h Reviewed by Benjamin Poulain. * wtf/Platform.h: - Changes for armv7s. - Add ENABLE() definitions for DASHBOARD_SUPPORT and WEBGL. - Re-sort USE() macros. - Remove ENABLE() macros for JIT, LLINT and YARR_JIT to enable on iOS Simulator. They are already defined below. - Turn off HAVE(HOSTED_CORE_ANIMATION) for iOS. - Turn on USE(COREMEDIA) for iOS 6.0 and later. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@142537 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WTF/ChangeLog | 16 ++++++++++++++++ Source/WTF/wtf/Platform.h | 30 ++++++++++++------------------ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog index def97a0737d7..c9f9b75cace8 100644 --- a/Source/WTF/ChangeLog +++ b/Source/WTF/ChangeLog @@ -1,3 +1,19 @@ +2013-02-11 David Kilzer + + [iOS] Upstream changes to Platform.h + + + Reviewed by Benjamin Poulain. + + * wtf/Platform.h: + - Changes for armv7s. + - Add ENABLE() definitions for DASHBOARD_SUPPORT and WEBGL. + - Re-sort ENABLE() and USE() macros. + - Remove ENABLE() macros for JIT, LLINT and YARR_JIT to enable + on iOS Simulator. They are already defined below. + - Turn off HAVE(HOSTED_CORE_ANIMATION) for iOS. + - Turn on USE(COREMEDIA) for iOS 6.0 and later. + 2013-02-08 Oliver Hunt Harden FastMalloc (again) diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h index 62589bf667aa..fda345a2d440 100644 --- a/Source/WTF/wtf/Platform.h +++ b/Source/WTF/wtf/Platform.h @@ -216,7 +216,8 @@ #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 /* RVCT sets _TARGET_ARCH_ARM */ @@ -254,8 +255,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 */ @@ -603,6 +605,8 @@ #if PLATFORM(IOS) #define ENABLE_CONTEXT_MENUS 0 +#define ENABLE_DASHBOARD_SUPPORT 0 +#define ENABLE_DELETION_UI 0 #define ENABLE_DRAG_SUPPORT 0 #define ENABLE_GEOLOCATION 1 #define ENABLE_ICONDATABASE 0 @@ -611,25 +615,15 @@ #define ENABLE_ORIENTATION_EVENTS 1 #define ENABLE_REPAINT_THROTTLING 1 #define ENABLE_WEB_ARCHIVE 1 -#define ENABLE_DELETION_UI 0 +#define ENABLE_WEBGL 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_WEB_THREAD 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 @@ -720,11 +714,11 @@ #if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1060 #define HAVE_DISPATCH_H 1 -#define HAVE_HOSTED_CORE_ANIMATION 1 #define HAVE_MADV_FREE 1 #define HAVE_PTHREAD_SETNAME_NP 1 #if !PLATFORM(IOS) +#define HAVE_HOSTED_CORE_ANIMATION 1 #define HAVE_MADV_FREE_REUSE 1 #endif /* !PLATFORM(IOS) */ @@ -1136,7 +1130,7 @@ #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 -- 2.36.0