Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / config.h

diff --git a/src/third_party/WebKit/Source/config.h b/src/third_party/WebKit/Source/config.h
index 760d280..fb4e252 100644 (file)
--- a/src/third_party/WebKit/Source/config.h
+++ b/src/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,14 @@
 #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 Blink's fast PartitionAlloc allocator. */
-#define WTF_USE_SYSTEM_MALLOC 1
 #endif /* OS(MACOSX) */
 
 #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,8 +112,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) */
 
@@ -147,26 +130,11 @@
 
 #ifdef __cplusplus
 
-// These undefs match up with defines in WebCorePrefixMac.h for Mac OS X.
+// These undefs match up with defines in build/mac/Prefix.h for Mac OS X.
 // Helps us catch if anyone uses new or delete by accident in code and doesn't include "config.h".
 #undef new
 #undef delete
-#include "wtf/FastMalloc.h"
-
 #include <ciso646>
+#include <cstddef>
 
 #endif
-
-#if COMPILER(MSVC)
-#define SKIP_STATIC_CONSTRUCTORS_ON_MSVC 1
-#else
-#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)
-#define WTF_USE_HARFBUZZ 1
-#endif