diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/config.h')
| -rw-r--r-- | chromium/third_party/WebKit/Source/config.h | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/chromium/third_party/WebKit/Source/config.h b/chromium/third_party/WebKit/Source/config.h index e556d5b95dc..7b058fd72dd 100644 --- a/chromium/third_party/WebKit/Source/config.h +++ b/chromium/third_party/WebKit/Source/config.h @@ -86,7 +86,6 @@ /* Operating environments */ #if OS(ANDROID) -#define WTF_USE_NATIVE_FULLSCREEN_VIDEO 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 @@ -98,28 +97,22 @@ #if OS(MACOSX) #define WTF_USE_CF 1 #define WTF_USE_RUBBER_BANDING 1 - -/* We can't override the global operator new and delete on OS(MACOSX) because - * some object are allocated by WebKit and deallocated by the embedder. */ -#else /* !OS(MACOSX) */ -/* On non-OS(MACOSX), the "system malloc" is actually TCMalloc anyway, so there's - * no need to use WebKit's copy of TCMalloc. */ -#define WTF_USE_SYSTEM_MALLOC 1 #endif /* OS(MACOSX) */ +// On Mac, the system allocator is the real OS X system allocator. +// On Android, the system allocator is the libc system allocator. +// On other platforms, we've overriden the system allocator with tcmalloc. +// PartitionAlloc seems to be faster than all of these, so on all platforms +// we use it for a subset of performance sensitive Blink classes (tagged by +// WTF_MAKE_FAST_ALLOCATED. +#define WTF_USE_SYSTEM_MALLOC 0 + #if OS(POSIX) -#define HAVE_MMAP 1 #define HAVE_SIGNAL_H 1 #define HAVE_SYS_TIME_H 1 #define WTF_USE_PTHREADS 1 #endif /* OS(POSIX) */ -#if !defined(HAVE_VASPRINTF) -#if !COMPILER(MSVC) -#define HAVE_VASPRINTF 1 -#endif -#endif - #if !OS(WIN) && !OS(ANDROID) #define HAVE_TM_GMTOFF 1 #define HAVE_TM_ZONE 1 @@ -127,7 +120,6 @@ #endif #if OS(MACOSX) -#define HAVE_DISPATCH_H 1 #define HAVE_PTHREAD_SETNAME_NP 1 #define WTF_USE_NEW_THEME 1 #endif /* OS(MACOSX) */ @@ -163,10 +155,6 @@ #define SKIP_STATIC_CONSTRUCTORS_ON_GCC 1 #endif -#ifndef __STDC_FORMAT_MACROS -#define __STDC_FORMAT_MACROS 1 -#endif - -#if OS(LINUX) || OS(ANDROID) || ENABLE(HARFBUZZ_ON_WINDOWS) +#if OS(LINUX) || OS(ANDROID) || OS(WIN) #define WTF_USE_HARFBUZZ 1 #endif |