diff options
Diffstat (limited to 'JavaScriptCore/wtf/Platform.h')
| -rw-r--r-- | JavaScriptCore/wtf/Platform.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 8bf0d86..95eb67f 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -1060,15 +1060,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #endif #endif -<<<<<<< HEAD #if PLATFORM(ANDROID) && !defined WTF_USE_ACCELERATED_COMPOSITING #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif -#if PLATFORM(IPHONE) -======= #if PLATFORM(IOS) ->>>>>>> webkit.org at r65072 #define WTF_USE_ACCELERATED_COMPOSITING 1 #endif |