| Index: Source/WTF/wtf/Platform.h
|
| diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
| index cb820331537935e944e09a656fb2dd54eb97d4ae..a0f2a36539c62a16b0e10c395c637345105dc46f 100644
|
| --- a/Source/WTF/wtf/Platform.h
|
| +++ b/Source/WTF/wtf/Platform.h
|
| @@ -507,11 +507,6 @@
|
| #define WTF_USE_LOW_QUALITY_IMAGE_NO_JPEG_FANCY_UPSAMPLING 1
|
| #endif
|
|
|
| -#if PLATFORM(GTK)
|
| -#define WTF_USE_CAIRO 1
|
| -#define ENABLE_GLOBAL_FASTMALLOC_NEW 0
|
| -#endif
|
| -
|
| /* On Windows, use QueryPerformanceCounter by default */
|
| #if OS(WINDOWS)
|
| #define WTF_USE_QUERY_PERFORMANCE_COUNTER 1
|
| @@ -597,7 +592,7 @@
|
| #define WTF_USE_CF 1
|
| #endif
|
|
|
| -#if PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)
|
| +#if PLATFORM(WIN) && !OS(WINCE)
|
| #define WTF_USE_CFNETWORK 1
|
| #endif
|
|
|
| @@ -920,7 +915,7 @@
|
| #endif
|
|
|
| /* Accelerated compositing */
|
| -#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO))
|
| +#if PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(QT) || (PLATFORM(WIN) && !OS(WINCE))
|
| #define WTF_USE_ACCELERATED_COMPOSITING 1
|
| #endif
|
|
|
| @@ -1033,7 +1028,7 @@
|
| #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
|
| #endif
|
|
|
| -#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !OS(WINCE) && !PLATFORM(WIN_CAIRO)) || PLATFORM(BLACKBERRY)
|
| +#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !OS(WINCE)) || PLATFORM(BLACKBERRY)
|
| #define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
|
| #endif
|
|
|
|
|