diff options
Diffstat (limited to 'JavaScriptCore/wtf/Platform.h')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index ac4ef5a..1877917 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -1074,29 +1074,13 @@ #define WTF_USE_ATSUI 1 #define WTF_USE_CORE_TEXT 0 #endif -<<<<<<< HEAD - -/* Accelerated compositing */ -#if !defined(BUILDING_ON_TIGER) -#define WTF_USE_ACCELERATED_COMPOSITING 1 -#endif #endif +/* Accelerated compositing */ #if PLATFORM(ANDROID) && !defined WTF_USE_ACCELERATED_COMPOSITING #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -#if PLATFORM(IOS) -#define WTF_USE_ACCELERATED_COMPOSITING 1 -#endif - -#if PLATFORM(QT) -#define WTF_USE_ACCELERATED_COMPOSITING 1 -======= ->>>>>>> webkit.org at r70949 -#endif - -/* Accelerated compositing */ #if (PLATFORM(MAC) && !defined(BUILDING_ON_TIGER)) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) &&!defined(WIN_CAIRO)) #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif |