| Index: Source/WTF/wtf/Platform.h
|
| diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
|
| index 02b1dc182312d0c704caeec36ae65a902e94814e..e5a94875f3796cb17bd590815692a44d6f2bd588 100644
|
| --- a/Source/WTF/wtf/Platform.h
|
| +++ b/Source/WTF/wtf/Platform.h
|
| @@ -438,7 +438,6 @@
|
| /* PLATFORM(QT) */
|
| /* PLATFORM(WX) */
|
| /* PLATFORM(GTK) */
|
| -/* PLATFORM(BLACKBERRY) */
|
| /* PLATFORM(MAC) */
|
| /* PLATFORM(WIN) */
|
| #if defined(BUILDING_CHROMIUM__)
|
| @@ -449,8 +448,6 @@
|
| #define WTF_PLATFORM_WX 1
|
| #elif defined(BUILDING_GTK__)
|
| #define WTF_PLATFORM_GTK 1
|
| -#elif defined(BUILDING_BLACKBERRY__)
|
| -#define WTF_PLATFORM_BLACKBERRY 1
|
| #elif OS(DARWIN)
|
| #define WTF_PLATFORM_MAC 1
|
| #elif OS(WINDOWS)
|
| @@ -497,13 +494,6 @@
|
| #endif
|
| #endif
|
|
|
| -#if PLATFORM(BLACKBERRY)
|
| -#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
|
| -#endif
|
| -
|
| /* On Windows, use QueryPerformanceCounter by default */
|
| #if OS(WINDOWS)
|
| #define WTF_USE_QUERY_PERFORMANCE_COUNTER 1
|
| @@ -789,7 +779,7 @@
|
| #define ENABLE_DFG_JIT 1
|
| #endif
|
| /* Enable the DFG JIT on ARMv7. Only tested on iOS and Qt Linux. */
|
| -#if CPU(ARM_THUMB2) && (PLATFORM(IOS) || PLATFORM(BLACKBERRY) || PLATFORM(QT))
|
| +#if CPU(ARM_THUMB2) && (PLATFORM(IOS) || PLATFORM(QT))
|
| #define ENABLE_DFG_JIT 1
|
| #endif
|
| /* Enable the DFG JIT on ARM. */
|
| @@ -992,7 +982,7 @@
|
|
|
| #define ENABLE_OBJECT_MARK_LOGGING 0
|
|
|
| -#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(BLACKBERRY) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
|
| +#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
|
| #define ENABLE_PARALLEL_GC 1
|
| #elif PLATFORM(QT)
|
| // Parallel GC is temporarily disabled on Qt because of regular crashes, see https://bugs.webkit.org/show_bug.cgi?id=90957 for details
|
| @@ -1019,11 +1009,11 @@
|
| #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
|
| #endif
|
|
|
| -#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !OS(WINCE)) || PLATFORM(BLACKBERRY)
|
| +#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !OS(WINCE))
|
| #define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
|
| #endif
|
|
|
| -#if PLATFORM(MAC) || PLATFORM(BLACKBERRY)
|
| +#if PLATFORM(MAC)
|
| #define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
|
| #endif
|
|
|
|
|