Diff
Modified: trunk/ChangeLog (183696 => 183697)
--- trunk/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,18 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * Source/cmake/OptionsAppleWin.cmake: Replace all occurrences WTF_USE with USE.
+ * Source/cmake/OptionsEfl.cmake: Ditto.
+ * Source/cmake/OptionsGTK.cmake: Ditto.
+ * Source/cmake/OptionsMac.cmake: Ditto.
+ * Source/cmake/OptionsWinCairo.cmake: Ditto.
+ * Source/cmake/WebKitFeatures.cmake: No longer expose WTF_USE when encountering
+ USE variables.
+
2015-04-30 Martin Robinson <[email protected]>
[CMake] Automatically expose WTF_USE_FOO to the build when USE_FOO is exposed
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (183696 => 183697)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2015-05-01 23:38:18 UTC (rev 183697)
@@ -627,7 +627,7 @@
${ICU_I18N_LIBRARIES}
)
-if (WTF_USE_UDIS86)
+if (USE_UDIS86)
set(UDIS_GEN_DEP
disassembler/udis86/ud_opcode.py
disassembler/udis86/ud_optable.py
Modified: trunk/Source/_javascript_Core/ChangeLog (183696 => 183697)
--- trunk/Source/_javascript_Core/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,12 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * CMakeLists.txt: Replace all occurrences WTF_USE with USE.
+
2015-05-01 Jordan Harband <[email protected]>
String#startsWith/endsWith/includes don't handle Infinity position/endPosition args correctly
Modified: trunk/Source/WTF/ChangeLog (183696 => 183697)
--- trunk/Source/WTF/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WTF/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,15 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * wtf/Assertions.cpp: Replace all occurrences WTF_USE with USE.
+ * wtf/Platform.h: Replace all occurrences WTF_USE with USE. Modify the USE
+ macro to look for unprefixed variables.
+ * wtf/WTFThreadData.h: Replace all occurrences WTF_USE with USE.
+
2015-05-01 Joseph Pecoraro <[email protected]>
Enable ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX by default on all ports (Windows was missed)
Modified: trunk/Source/WTF/wtf/Assertions.cpp (183696 => 183697)
--- trunk/Source/WTF/wtf/Assertions.cpp 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WTF/wtf/Assertions.cpp 2015-05-01 23:38:18 UTC (rev 183697)
@@ -50,7 +50,7 @@
#if USE(CF)
#include <CoreFoundation/CFString.h>
#if PLATFORM(COCOA)
-#define WTF_USE_APPLE_SYSTEM_LOG 1
+#define USE_APPLE_SYSTEM_LOG 1
#include <asl.h>
#endif
#endif // USE(CF)
@@ -262,10 +262,10 @@
#if OS(DARWIN) || OS(LINUX)
# if PLATFORM(GTK)
# if defined(__GLIBC__) && !defined(__UCLIBC__)
-# define WTF_USE_BACKTRACE_SYMBOLS 1
+# define USE_BACKTRACE_SYMBOLS 1
# endif
# else
-# define WTF_USE_DLADDR 1
+# define USE_DLADDR 1
# endif
#endif
@@ -302,8 +302,8 @@
#endif
}
-#undef WTF_USE_BACKTRACE_SYMBOLS
-#undef WTF_USE_DLADDR
+#undef USE_BACKTRACE_SYMBOLS
+#undef USE_DLADDR
static WTFCrashHookFunction globalHook = 0;
Modified: trunk/Source/WTF/wtf/Platform.h (183696 => 183697)
--- trunk/Source/WTF/wtf/Platform.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WTF/wtf/Platform.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -51,7 +51,7 @@
/* ==== Policy decision macros: these define policy choices for a particular port. ==== */
/* USE() - use a particular third-party library or optional OS service */
-#define USE(WTF_FEATURE) (defined WTF_USE_##WTF_FEATURE && WTF_USE_##WTF_FEATURE)
+#define USE(WTF_FEATURE) (defined USE_##WTF_FEATURE && USE_##WTF_FEATURE)
/* ENABLE() - turn on a specific feature of WebKit */
#define ENABLE(WTF_FEATURE) (defined ENABLE_##WTF_FEATURE && ENABLE_##WTF_FEATURE)
@@ -100,7 +100,7 @@
#define WTF_MIPS_DOUBLE_FLOAT (defined __mips_hard_float && !defined __mips_single_float)
#define WTF_MIPS_FP64 (defined __mips_fpr && __mips_fpr == 64)
/* MIPS requires allocators to use aligned memory */
-#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
+#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
#endif /* MIPS */
/* CPU(PPC) - PowerPC 32-bit */
@@ -213,7 +213,7 @@
|| defined(__ARM_ARCH_5TEJ__)
#define WTF_ARM_ARCH_VERSION 5
/*ARMv5TE requires allocators to use aligned memory*/
-#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
+#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
#elif defined(__ARM_ARCH_6__) \
|| defined(__ARM_ARCH_6J__) \
@@ -245,7 +245,7 @@
|| defined(__TARGET_ARCH_5TE) \
|| defined(__TARGET_ARCH_5TEJ)
/*ARMv5TE requires allocators to use aligned memory*/
-#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
+#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
#endif
#else
@@ -455,7 +455,7 @@
#if PLATFORM(COCOA)
#if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
-#define WTF_USE_APPLE_INTERNAL_SDK 1
+#define USE_APPLE_INTERNAL_SDK 1
#endif
#endif
@@ -473,19 +473,19 @@
/* USE(CG) and PLATFORM(CI) */
#if PLATFORM(COCOA) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
-#define WTF_USE_CG 1
+#define USE_CG 1
#endif
#if PLATFORM(COCOA) || (PLATFORM(WIN) && USE(CG))
-#define WTF_USE_CA 1
+#define USE_CA 1
#endif
#if PLATFORM(GTK) || PLATFORM(EFL)
-#define WTF_USE_CAIRO 1
-#define WTF_USE_GLIB 1
-#define WTF_USE_FREETYPE 1
-#define WTF_USE_HARFBUZZ 1
-#define WTF_USE_SOUP 1
-#define WTF_USE_WEBP 1
+#define USE_CAIRO 1
+#define USE_GLIB 1
+#define USE_FREETYPE 1
+#define USE_HARFBUZZ 1
+#define USE_SOUP 1
+#define USE_WEBP 1
#endif
#if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)
@@ -494,14 +494,14 @@
/* On Windows, use QueryPerformanceCounter by default */
#if OS(WINDOWS)
-#define WTF_USE_QUERY_PERFORMANCE_COUNTER 1
+#define USE_QUERY_PERFORMANCE_COUNTER 1
#endif
#if PLATFORM(COCOA)
-#define WTF_USE_CF 1
-#define WTF_USE_FOUNDATION 1
-#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
+#define USE_CF 1
+#define USE_FOUNDATION 1
+#define USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
#define ENABLE_USER_MESSAGE_HANDLERS 1
#define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
#define HAVE_DTRACE 1
@@ -518,13 +518,13 @@
#if PLATFORM(MAC)
-#define WTF_USE_APPKIT 1
+#define USE_APPKIT 1
#define HAVE_RUNLOOP_TIMER 1
#define HAVE_SEC_IDENTITY 1
#define HAVE_SEC_KEYCHAIN 1
#if CPU(X86_64)
-#define WTF_USE_PLUGIN_HOST_PROCESS 1
+#define USE_PLUGIN_HOST_PROCESS 1
#endif
/* OS X defines a series of platform macros for debugging. */
@@ -539,11 +539,11 @@
#define HAVE_READLINE 1
#if USE(APPLE_INTERNAL_SDK)
-#define WTF_USE_CFNETWORK 1
+#define USE_CFNETWORK 1
#endif
-#define WTF_USE_UIKIT_EDITING 1
-#define WTF_USE_WEB_THREAD 1
-#define WTF_USE_QUICK_LOOK 1
+#define USE_UIKIT_EDITING 1
+#define USE_WEB_THREAD 1
+#define USE_QUICK_LOOK 1
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
#define HAVE_APP_LINKS 1
@@ -561,15 +561,15 @@
#endif /* PLATFORM(IOS) */
#if PLATFORM(WIN) && !USE(WINGDI)
-#define WTF_USE_CF 1
+#define USE_CF 1
#endif
#if PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO)
-#define WTF_USE_CFNETWORK 1
+#define USE_CFNETWORK 1
#endif
#if USE(CFNETWORK) || PLATFORM(COCOA)
-#define WTF_USE_CFURLCACHE 1
+#define USE_CFURLCACHE 1
#endif
#if !defined(HAVE_ACCESSIBILITY)
@@ -586,7 +586,7 @@
#define HAVE_STRINGS_H 1
#define HAVE_SYS_PARAM_H 1
#define HAVE_SYS_TIME_H 1
-#define WTF_USE_PTHREADS 1
+#define USE_PTHREADS 1
#endif /* OS(UNIX) */
#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
@@ -620,7 +620,7 @@
#define HAVE_PTHREAD_SETNAME_NP 1
#define HAVE_READLINE 1
#define HAVE_SYS_TIMEB_H 1
-#define WTF_USE_ACCELERATE 1
+#define USE_ACCELERATE 1
#if !PLATFORM(IOS)
#define HAVE_HOSTED_CORE_ANIMATION 1
@@ -666,7 +666,7 @@
#define ENABLE_SAMPLING_THREAD 1
#endif
-#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64)
+#if !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64)
#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
|| (CPU(IA64) && !CPU(IA64_32)) \
|| CPU(ALPHA) \
@@ -675,11 +675,11 @@
|| CPU(MIPS64) \
|| CPU(PPC64) \
|| CPU(PPC64LE)
-#define WTF_USE_JSVALUE64 1
+#define USE_JSVALUE64 1
#else
-#define WTF_USE_JSVALUE32_64 1
+#define USE_JSVALUE32_64 1
#endif
-#endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
+#endif /* !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64) */
/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */
#if !defined(ENABLE_JIT) \
@@ -711,28 +711,28 @@
/* If possible, try to enable the LLVM disassembler. This is optional and we can
fall back on UDis86 if necessary. */
-#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))
-#define WTF_USE_LLVM_DISASSEMBLER 1
+#if !defined(USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))
+#define USE_LLVM_DISASSEMBLER 1
#endif
/* If possible, try to enable a disassembler. This is optional. We proceed in two
steps: first we try to find some disassembler that we can use, and then we
decide if the high-level disassembler API can be enabled. */
-#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (OS(LINUX) && (PLATFORM(EFL) || PLATFORM(GTK)))) \
+#if !defined(USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (OS(LINUX) && (PLATFORM(EFL) || PLATFORM(GTK)))) \
&& (CPU(X86) || CPU(X86_64))
-#define WTF_USE_UDIS86 1
+#define USE_UDIS86 1
#endif
#if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(LLVM_DISASSEMBLER))
#define ENABLE_DISASSEMBLER 1
#endif
-#if !defined(WTF_USE_ARM64_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM64) && !USE(LLVM_DISASSEMBLER)
-#define WTF_USE_ARM64_DISASSEMBLER 1
+#if !defined(USE_ARM64_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM64) && !USE(LLVM_DISASSEMBLER)
+#define USE_ARM64_DISASSEMBLER 1
#endif
-#if !defined(WTF_USE_ARMV7_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM_THUMB2)
-#define WTF_USE_ARMV7_DISASSEMBLER 1
+#if !defined(USE_ARMV7_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM_THUMB2)
+#define USE_ARMV7_DISASSEMBLER 1
#endif
#if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER) || USE(ARM64_DISASSEMBLER))
@@ -893,43 +893,43 @@
#endif
#if ENABLE(WEBGL) && PLATFORM(WIN)
-#define WTF_USE_OPENGL 1
-#define WTF_USE_OPENGL_ES_2 1
-#define WTF_USE_EGL 1
+#define USE_OPENGL 1
+#define USE_OPENGL_ES_2 1
+#define USE_EGL 1
#endif
#if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
#if ENABLE(GSTREAMER_WINCAIRO)
-#define WTF_USE_MEDIA_FOUNDATION 0
-#define WTF_USE_GLIB 1
-#define WTF_USE_GSTREAMER 1
+#define USE_MEDIA_FOUNDATION 0
+#define USE_GLIB 1
+#define USE_GSTREAMER 1
#else
-#define WTF_USE_MEDIA_FOUNDATION 1
+#define USE_MEDIA_FOUNDATION 1
#endif
#endif
#if PLATFORM(WIN_CAIRO)
-#define WTF_USE_TEXTURE_MAPPER 1
+#define USE_TEXTURE_MAPPER 1
#endif
-#if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_3D) && !defined(WTF_USE_TEXTURE_MAPPER_GL)
-#define WTF_USE_TEXTURE_MAPPER_GL 1
+#if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_3D) && !defined(USE_TEXTURE_MAPPER_GL)
+#define USE_TEXTURE_MAPPER_GL 1
#endif
/* Compositing on the UI-process in WebKit2 */
#if PLATFORM(COCOA)
-#define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
+#define USE_PROTECTION_SPACE_AUTH_CALLBACK 1
#endif
/* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
#define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
#if PLATFORM(WIN)
-#define WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS 1
+#define USE_CROSS_PLATFORM_CONTEXT_MENUS 1
#endif
#if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
-#define WTF_USE_ACCESSIBILITY_CONTEXT_MENUS 1
+#define USE_ACCESSIBILITY_CONTEXT_MENUS 1
#endif
#if CPU(ARM_THUMB2) || CPU(ARM64)
@@ -956,20 +956,20 @@
since most ports try to support sub-project independence, adding new headers
to WTF causes many ports to break, and so this way we can address the build
breakages one port at a time. */
-#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
-#define WTF_USE_EXPORT_MACROS 1
+#if !defined(USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
+#define USE_EXPORT_MACROS 1
#endif
-#if !defined(WTF_USE_EXPORT_MACROS_FOR_TESTING) && (PLATFORM(GTK) || PLATFORM(WIN))
-#define WTF_USE_EXPORT_MACROS_FOR_TESTING 1
+#if !defined(USE_EXPORT_MACROS_FOR_TESTING) && (PLATFORM(GTK) || PLATFORM(WIN))
+#define USE_EXPORT_MACROS_FOR_TESTING 1
#endif
#if PLATFORM(GTK) || PLATFORM(EFL)
-#define WTF_USE_UNIX_DOMAIN_SOCKETS 1
+#define USE_UNIX_DOMAIN_SOCKETS 1
#endif
-#if !defined(WTF_USE_IMLANG_FONT_LINK2)
-#define WTF_USE_IMLANG_FONT_LINK2 1
+#if !defined(USE_IMLANG_FONT_LINK2)
+#define USE_IMLANG_FONT_LINK2 1
#endif
#if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM64))))
@@ -989,7 +989,7 @@
#endif
#if PLATFORM(COCOA)
-#define WTF_USE_AVFOUNDATION 1
+#define USE_AVFOUNDATION 1
#endif
#if !defined(ENABLE_TREE_DEBUGGING)
@@ -1001,7 +1001,7 @@
#endif
#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
-#define WTF_USE_COREMEDIA 1
+#define USE_COREMEDIA 1
#define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
#endif
@@ -1019,23 +1019,23 @@
#endif
#if PLATFORM(MAC)
-#define WTF_USE_VIDEOTOOLBOX 1
+#define USE_VIDEOTOOLBOX 1
#endif
#if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI))
-#define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
+#define USE_REQUEST_ANIMATION_FRAME_TIMER 1
#endif
#if PLATFORM(COCOA)
-#define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
+#define USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
#endif
#if PLATFORM(MAC)
-#define WTF_USE_COREAUDIO 1
+#define USE_COREAUDIO 1
#endif
-#if !defined(WTF_USE_ZLIB)
-#define WTF_USE_ZLIB 1
+#if !defined(USE_ZLIB)
+#define USE_ZLIB 1
#endif
#ifndef HAVE_QOS_CLASSES
@@ -1050,39 +1050,39 @@
#endif
#endif
-#define WTF_USE_GRAMMAR_CHECKING 1
+#define USE_GRAMMAR_CHECKING 1
#if PLATFORM(COCOA) || PLATFORM(EFL)
-#define WTF_USE_UNIFIED_TEXT_CHECKING 1
+#define USE_UNIFIED_TEXT_CHECKING 1
#endif
#if PLATFORM(MAC)
-#define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
+#define USE_AUTOMATIC_TEXT_REPLACEMENT 1
#endif
#if PLATFORM(MAC)
/* Some platforms provide UI for suggesting autocorrection. */
-#define WTF_USE_AUTOCORRECTION_PANEL 1
+#define USE_AUTOCORRECTION_PANEL 1
#endif
#if PLATFORM(COCOA)
/* Some platforms use spelling and autocorrection markers to provide visual cue. On such platform, if word with marker is edited, we need to remove the marker. */
-#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
+#define USE_MARKER_REMOVAL_UPON_EDITING 1
#endif
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-#define WTF_USE_INSERTION_UNDO_GROUPING 1
+#define USE_INSERTION_UNDO_GROUPING 1
#endif
#if PLATFORM(IOS)
-#define WTF_USE_PLATFORM_TEXT_TRACK_MENU 1
+#define USE_PLATFORM_TEXT_TRACK_MENU 1
#endif
#if PLATFORM(COCOA)
-#define WTF_USE_AUDIO_SESSION 1
+#define USE_AUDIO_SESSION 1
#endif
#if PLATFORM(COCOA) && !PLATFORM(IOS_SIMULATOR)
-#define WTF_USE_IOSURFACE 1
+#define USE_IOSURFACE 1
#endif
#if PLATFORM(GTK) || PLATFORM(EFL)
@@ -1111,7 +1111,7 @@
#endif
#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-#define WTF_USE_ASYNC_NSTEXTINPUTCLIENT 1
+#define USE_ASYNC_NSTEXTINPUTCLIENT 1
#endif
#if (OS(DARWIN) && USE(CG)) || USE(FREETYPE) || (PLATFORM(WIN) && (USE(CG) || USE(CAIRO)))
@@ -1126,7 +1126,7 @@
#endif
#if PLATFORM(COCOA)
-#define WTF_USE_MEDIATOOLBOX 1
+#define USE_MEDIATOOLBOX 1
#endif
#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
Modified: trunk/Source/WTF/wtf/WTFThreadData.h (183696 => 183697)
--- trunk/Source/WTF/wtf/WTFThreadData.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WTF/wtf/WTFThreadData.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -41,7 +41,7 @@
#endif
#if defined(__PTK_FRAMEWORK_JAVASCRIPTCORE_KEY1)
-#define WTF_USE_PTHREAD_GETSPECIFIC_DIRECT 1
+#define USE_PTHREAD_GETSPECIFIC_DIRECT 1
#endif
#if !USE(PTHREAD_GETSPECIFIC_DIRECT)
Modified: trunk/Source/WebCore/ChangeLog (183696 => 183697)
--- trunk/Source/WebCore/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,24 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * DerivedSources.make: Replace all occurrences WTF_USE with USE.
+ * PlatformEfl.cmake: Ditto.
+ * PlatformGTK.cmake: Ditto.
+ * bindings/objc/PublicDOMInterfaces.h: Ditto.
+ * config.h: Ditto.
+ * crypto/mac/SerializedCryptoKeyWrapMac.mm: Ditto.
+ * page/AlternativeTextClient.h: Ditto.
+ * platform/efl/FileSystemEfl.cpp: Ditto.
+ (WebCore::fileSystemRepresentation): Ditto.
+ * platform/graphics/cg/ImageBufferDataCG.h: Ditto.
+ * platform/graphics/cg/PDFDocumentImage.h: Ditto.
+ * platform/ios/wak/WAKAppKitStubs.h: Ditto.
+ * rendering/RenderLayerCompositor.cpp: Ditto.
+
2015-05-01 Myles C. Maxfield <[email protected]>
[OS X] Text dilation parameters are not restored after being set
Modified: trunk/Source/WebCore/DerivedSources.make (183696 => 183697)
--- trunk/Source/WebCore/DerivedSources.make 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/DerivedSources.make 2015-05-01 23:38:18 UTC (rev 183697)
@@ -709,10 +709,10 @@
WTF_PLATFORM_IOS = 0
endif
-ifeq ($(shell $(CC) -std=gnu++11 -x c++ -E -P -dM $(SDK_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep WTF_USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
- WTF_USE_APPLE_INTERNAL_SDK = 1
+ifeq ($(shell $(CC) -std=gnu++11 -x c++ -E -P -dM $(SDK_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
+ USE_APPLE_INTERNAL_SDK = 1
else
- WTF_USE_APPLE_INTERNAL_SDK = 0
+ USE_APPLE_INTERNAL_SDK = 0
endif
ifeq ($(shell $(CC) -std=gnu++11 -x c++ -E -P -dM $(SDK_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
@@ -837,8 +837,8 @@
ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
endif
-ifeq ($(WTF_USE_APPLE_INTERNAL_SDK), 1)
- ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) WTF_USE_APPLE_INTERNAL_SDK
+ifeq ($(USE_APPLE_INTERNAL_SDK), 1)
+ ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK
endif
# --------
Modified: trunk/Source/WebCore/PlatformEfl.cmake (183696 => 183697)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -251,7 +251,7 @@
platform/text/enchant/TextCheckerEnchant.cpp
)
-if (WTF_USE_GEOCLUE2)
+if (USE_GEOCLUE2)
list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
)
@@ -386,14 +386,14 @@
endif ()
endif ()
-if (WTF_USE_EGL)
+if (USE_EGL)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${EGL_INCLUDE_DIR}
"${WEBCORE_DIR}/platform/graphics/surfaces/egl"
)
endif ()
-if (WTF_USE_EGL)
+if (USE_EGL)
list(APPEND WebCore_SOURCES
platform/graphics/surfaces/egl/EGLConfigSelector.cpp
platform/graphics/surfaces/egl/EGLContext.cpp
@@ -408,7 +408,7 @@
)
endif ()
-if (WTF_USE_OPENGL_ES_2)
+if (USE_OPENGL_ES_2)
list(APPEND WebCore_SOURCES
platform/graphics/opengl/Extensions3DOpenGLES.cpp
platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
@@ -422,7 +422,7 @@
)
endif ()
-if (WTF_USE_EGL)
+if (USE_EGL)
list(APPEND WebCore_LIBRARIES
${EGL_LIBRARY}
)
Modified: trunk/Source/WebCore/PlatformGTK.cmake (183696 => 183697)
--- trunk/Source/WebCore/PlatformGTK.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -229,7 +229,7 @@
rendering/RenderThemeGtk.cpp
)
-if (WTF_USE_GEOCLUE2)
+if (USE_GEOCLUE2)
list(APPEND WebCore_SOURCES
${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
)
@@ -331,7 +331,7 @@
${GSTREAMER_VIDEO_LIBRARIES}
)
- if (WTF_USE_GSTREAMER_MPEGTS)
+ if (USE_GSTREAMER_MPEGTS)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${GSTREAMER_MPEGTS_INCLUDE_DIRS}
)
@@ -341,7 +341,7 @@
)
endif ()
- if (WTF_USE_GSTREAMER_GL)
+ if (USE_GSTREAMER_GL)
list(APPEND WebCore_INCLUDE_DIRECTORIES
${GSTREAMER_GL_INCLUDE_DIRS}
)
@@ -372,7 +372,7 @@
)
endif ()
-if (WTF_USE_TEXTURE_MAPPER)
+if (USE_TEXTURE_MAPPER)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/texmap"
)
@@ -413,20 +413,20 @@
)
endif ()
-if (WTF_USE_EGL)
+if (USE_EGL)
list(APPEND WebCore_LIBRARIES
${EGL_LIBRARY}
)
endif ()
-if (WTF_USE_OPENGL_ES_2)
+if (USE_OPENGL_ES_2)
list(APPEND WebCore_SOURCES
platform/graphics/opengl/Extensions3DOpenGLES.cpp
platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
)
endif ()
-if (WTF_USE_OPENGL)
+if (USE_OPENGL)
list(APPEND WebCore_SOURCES
platform/graphics/OpenGLShims.cpp
Modified: trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h (183696 => 183697)
--- trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1247,7 +1247,7 @@
- (NSString *)lookupNamespaceURI:(NSString *)prefix;
@end
-#if defined(WTF_USE_APPLE_INTERNAL_SDK) && WTF_USE_APPLE_INTERNAL_SDK
+#if defined(USE_APPLE_INTERNAL_SDK) && USE_APPLE_INTERNAL_SDK
#if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
#include <WebKitAdditions/PublicDOMInterfacesIOS.h>
#endif
Modified: trunk/Source/WebCore/config.h (183696 => 183697)
--- trunk/Source/WebCore/config.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/config.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -26,7 +26,7 @@
#include <wtf/Platform.h>
#if PLATFORM(COCOA)
-#define WTF_USE_FILE_LOCK 1
+#define USE_FILE_LOCK 1
#endif
#if PLATFORM(WIN) && !USE(WINGDI)
@@ -88,21 +88,21 @@
#if PLATFORM(WIN)
#if PLATFORM(WIN_CAIRO)
-#undef WTF_USE_CG
-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
+#undef USE_CG
+#define USE_CAIRO 1
+#define USE_CURL 1
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
#endif
#elif !USE(WINGDI)
-#define WTF_USE_CG 1
-#undef WTF_USE_CAIRO
-#undef WTF_USE_CURL
+#define USE_CG 1
+#undef USE_CAIRO
+#undef USE_CURL
#endif
#endif
#if PLATFORM(MAC)
-#define WTF_USE_NEW_THEME 1
+#define USE_NEW_THEME 1
#endif
#if USE(CG)
@@ -121,13 +121,13 @@
#define WEBCORE_NAVIGATOR_VENDOR wkGetVendorNameForNavigator();
#endif
-// FIXME: Move this to _javascript_Core/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac.
+// FIXME: Move this to _javascript_Core/wtf/Platform.h, which is where we define USE_AVFOUNDATION on the Mac.
// https://bugs.webkit.org/show_bug.cgi?id=67334
#if PLATFORM(WIN) && USE(CG) && HAVE(AVCF)
-#define WTF_USE_AVFOUNDATION 1
+#define USE_AVFOUNDATION 1
#if HAVE(AVCF_LEGIBLE_OUTPUT)
-#define WTF_USE_AVFOUNDATION 1
+#define USE_AVFOUNDATION 1
#define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
#define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
#define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
Modified: trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm (183696 => 183697)
--- trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm 2015-05-01 23:38:18 UTC (rev 183697)
@@ -37,7 +37,7 @@
#include <wtf/CryptographicUtilities.h>
#include <wtf/RetainPtr.h>
-#define WTF_USE_KEYCHAIN_ACCESS_CONTROL_LISTS (!PLATFORM(IOS))
+#define USE_KEYCHAIN_ACCESS_CONTROL_LISTS (!PLATFORM(IOS))
namespace WebCore {
Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (183696 => 183697)
--- trunk/Source/WebCore/page/AlternativeTextClient.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/page/AlternativeTextClient.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -33,7 +33,7 @@
#if PLATFORM(MAC)
// Some platforms provide UI for suggesting alternative dictation text.
-#define WTF_USE_DICTATION_ALTERNATIVES 1
+#define USE_DICTATION_ALTERNATIVES 1
#endif // PLATFORM(MAC)
namespace WebCore {
Modified: trunk/Source/WebCore/platform/efl/FileSystemEfl.cpp (183696 => 183697)
--- trunk/Source/WebCore/platform/efl/FileSystemEfl.cpp 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/platform/efl/FileSystemEfl.cpp 2015-05-01 23:38:18 UTC (rev 183697)
@@ -53,7 +53,7 @@
{
// WARNING: this is just used by platform/network/soup, thus must be GLIB!!!
// TODO: move this to CString and use it instead in both, being more standard
-#if !PLATFORM(WIN_OS) && defined(WTF_USE_SOUP)
+#if !PLATFORM(WIN_OS) && defined(USE_SOUP)
char* filename = g_uri_unescape_string(path.utf8().data(), 0);
CString cfilename(filename);
g_free(filename);
Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (183696 => 183697)
--- trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -31,7 +31,7 @@
#include <wtf/RetainPtr.h>
#if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
-#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
+#define USE_IOSURFACE_CANVAS_BACKING_STORE 1
#endif
typedef struct CGColorSpace *CGColorSpaceRef;
Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h (183696 => 183697)
--- trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -34,7 +34,7 @@
#if USE(CG)
#if PLATFORM(MAC)
-#define WTF_USE_PDFKIT_FOR_PDFDOCUMENTIMAGE 1
+#define USE_PDFKIT_FOR_PDFDOCUMENTIMAGE 1
#endif
typedef struct CGPDFDocument *CGPDFDocumentRef;
Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h (183696 => 183697)
--- trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -54,7 +54,7 @@
// FIXME: <rdar://problem/6669434> Switch from using NSGeometry methods to CGGeometry methods
//
-// We explicitly use __has_include() instead of the macro define WTF_USE_APPLE_INTERNAL_SDK as
+// We explicitly use __has_include() instead of the macro define USE_APPLE_INTERNAL_SDK as
// the condition for including the header Foundation/NSGeometry.h to support internal Apple
// clients that build without header wtf/Platform.h.
#if __has_include(<Foundation/NSGeometry.h>)
Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (183696 => 183697)
--- trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-05-01 23:38:18 UTC (rev 183697)
@@ -81,7 +81,7 @@
#endif
#if !PLATFORM(MAC) && !PLATFORM(IOS)
-#define WTF_USE_COMPOSITING_FOR_SMALL_CANVASES 1
+#define USE_COMPOSITING_FOR_SMALL_CANVASES 1
#endif
namespace WebCore {
Modified: trunk/Source/WebKit/cf/ChangeLog (183696 => 183697)
--- trunk/Source/WebKit/cf/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit/cf/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,12 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * WebCoreSupport/WebInspectorClientCF.cpp: Replace all occurrences WTF_USE with USE.
+
2015-04-22 Darin Adler <[email protected]>
Remove OwnPtr and PassOwnPtr use from WebKit/cf, WebKit/mac, and WebKit2
Modified: trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp (183696 => 183697)
--- trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp 2015-05-01 23:38:18 UTC (rev 183697)
@@ -25,19 +25,19 @@
// FIXME: On Windows, we require all WebKit source files to include config.h
// before including any other files. Failing to include config.h will leave
-// WTF_USE_CF undefined, causing build failures in this
+// USE_CF undefined, causing build failures in this
// file. But Mac doesn't have a config.h for WebKit, so we can't include the
-// Windows one here. For now we can just define WTF_USE_CF and
-// WTF_USE_CFNETWORK manually, but we need a better long-term solution.
-#ifndef WTF_USE_CF
-#define WTF_USE_CF 1
+// Windows one here. For now we can just define USE_CF and
+// USE_CFNETWORK manually, but we need a better long-term solution.
+#ifndef USE_CF
+#define USE_CF 1
#endif
#include <wtf/Platform.h>
#if PLATFORM(WIN)
-#ifndef WTF_USE_CG
-#define WTF_USE_CG 1
+#ifndef USE_CG
+#define USE_CG 1
#endif
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (183696 => 183697)
--- trunk/Source/WebKit/mac/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,12 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * Misc/WebDownload.h: Replace all occurrences WTF_USE with USE.
+
2015-05-01 Brady Eidson <[email protected]>
Add API to disable meta refreshes.
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (183696 => 183697)
--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -26,7 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// We explicitly use __has_include() instead of the macro define WTF_USE_APPLE_INTERNAL_SDK as
+// We explicitly use __has_include() instead of the macro define USE_APPLE_INTERNAL_SDK as
// the condition for including the header Foundation/NSURLDownload.h to support internal Apple
// clients that build without header wtf/Platform.h. See <rdar://problem/19034131>.
#if __has_include(<Foundation/NSURLDownload.h>)
Modified: trunk/Source/WebKit2/ChangeLog (183696 => 183697)
--- trunk/Source/WebKit2/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,13 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * Shared/API/c/WKBase.h: Replace all occurrences WTF_USE with USE.
+ * WebKit2.xcodeproj/project.pbxproj: Ditto.
+
2015-05-01 Brady Eidson <[email protected]>
Add API to disable meta refreshes.
Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (183696 => 183697)
--- trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit2/Shared/API/c/WKBase.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -34,7 +34,7 @@
#include <WebKit/WKBaseGtk.h>
#endif
-#if defined(WTF_USE_SOUP)
+#if defined(USE_SOUP)
#include <WebKit/WKBaseSoup.h>
#endif
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (183696 => 183697)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-01 23:38:18 UTC (rev 183697)
@@ -9159,7 +9159,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UWTF_USE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
+ shellScript = "WKBASE_H=${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}/WKBase.h\n\nunifdef -B -D__APPLE__ -UBUILDING_GTK__ -UUSE_SOUP -UBUILDING_EFL__ -UBUILDING_QT__ -o ${WKBASE_H}.unifdef ${WKBASE_H}\n\ncase $? in\n0)\n rm ${WKBASE_H}.unifdef\n ;;\n1)\n mv ${WKBASE_H}{.unifdef,}\n ;;\n*)\n exit 1\nesac\n";
};
5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
isa = PBXShellScriptBuildPhase;
Modified: trunk/Source/cmake/OptionsAppleWin.cmake (183696 => 183697)
--- trunk/Source/cmake/OptionsAppleWin.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/cmake/OptionsAppleWin.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,6 +1,6 @@
include(OptionsWindows)
-set(WTF_USE_CG 1)
-set(WTF_USE_CA 1)
-set(WTF_USE_CFNETWORK 1)
-set(WTF_USE_ICU_UNICODE 1)
+set(USE_CG 1)
+set(USE_CA 1)
+set(USE_CFNETWORK 1)
+set(USE_ICU_UNICODE 1)
Modified: trunk/Source/cmake/OptionsEfl.cmake (183696 => 183697)
--- trunk/Source/cmake/OptionsEfl.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -11,8 +11,8 @@
set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR)
endif ()
-set(WTF_USE_SOUP 1)
-set(WTF_USE_UDIS86 1)
+set(USE_SOUP 1)
+set(USE_UDIS86 1)
set(WTF_LIBRARY_TYPE STATIC)
set(WTF_OUTPUT_NAME wtf_efl)
@@ -42,7 +42,7 @@
endif ()
add_definitions(-DBUILDING_EFL__=1)
-add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
+add_definitions(-DUSE_CROSS_PLATFORM_CONTEXT_MENUS=1)
add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
-DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")
add_definitions(-DWEB_INSPECTOR_DIR=\"${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}\")
@@ -174,10 +174,10 @@
list(APPEND GLIB_COMPONENTS gio-unix)
find_package(GeoClue2 2.1.5)
if (GEOCLUE2_FOUND)
- set(WTF_USE_GEOCLUE2 1)
+ set(USE_GEOCLUE2 1)
else ()
find_package(GeoClue)
- set(WTF_USE_GEOCLUE2 0)
+ set(USE_GEOCLUE2 0)
endif ()
endif ()
@@ -192,7 +192,7 @@
if (ENABLE_MEDIA_STREAM)
find_package(OpenWebRTC REQUIRED)
- add_definitions(-DWTF_USE_OPENWEBRTC)
+ add_definitions(-DUSE_OPENWEBRTC)
endif ()
if (ENABLE_NETSCAPE_PLUGIN_API)
@@ -206,8 +206,8 @@
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
set(GSTREAMER_COMPONENTS app mpegts pbutils)
- set(WTF_USE_GSTREAMER 1)
- add_definitions(-DWTF_USE_GSTREAMER=1)
+ set(USE_GSTREAMER 1)
+ add_definitions(-DUSE_GSTREAMER=1)
if (ENABLE_VIDEO)
list(APPEND GSTREAMER_COMPONENTS video tag)
@@ -215,44 +215,44 @@
if (ENABLE_WEB_AUDIO)
list(APPEND GSTREAMER_COMPONENTS audio fft)
- add_definitions(-DWTF_USE_WEBAUDIO_GSTREAMER=1)
+ add_definitions(-DUSE_WEBAUDIO_GSTREAMER=1)
endif ()
find_package(GStreamer 1.0.5 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
if (PC_GSTREAMER_MPEGTS_FOUND)
- add_definitions(-DWTF_USE_GSTREAMER_MPEGTS)
+ add_definitions(-DUSE_GSTREAMER_MPEGTS)
set(USE_GSTREAMER_MPEGTS TRUE)
endif ()
endif ()
-add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
-add_definitions(-DWTF_USE_COORDINATED_GRAPHICS_MULTIPROCESS=1)
-add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
+add_definitions(-DUSE_COORDINATED_GRAPHICS=1)
+add_definitions(-DUSE_COORDINATED_GRAPHICS_MULTIPROCESS=1)
+add_definitions(-DUSE_TEXTURE_MAPPER=1)
set(ENABLE_GRAPHICS_CONTEXT_3D 1)
add_definitions(-DENABLE_GRAPHICS_CONTEXT_3D=1)
-add_definitions(-DWTF_USE_GRAPHICS_SURFACE=1)
+add_definitions(-DUSE_GRAPHICS_SURFACE=1)
option(ENABLE_GLES2 "Enable GLES Support")
if (ENABLE_GLES2)
find_package(GLES REQUIRED)
- set(WTF_USE_OPENGL_ES_2 1)
- add_definitions(-DWTF_USE_OPENGL_ES_2=1)
+ set(USE_OPENGL_ES_2 1)
+ add_definitions(-DUSE_OPENGL_ES_2=1)
else ()
find_package(OpenGL REQUIRED)
- set(WTF_USE_OPENGL 1)
- add_definitions(-DWTF_USE_OPENGL=1)
+ set(USE_OPENGL 1)
+ add_definitions(-DUSE_OPENGL=1)
endif ()
option(ENABLE_EGL "Enable EGL Support")
if (ENABLE_EGL)
find_package(EGL REQUIRED)
- set(WTF_USE_EGL 1)
- add_definitions(-DWTF_USE_EGL=1)
+ set(USE_EGL 1)
+ add_definitions(-DUSE_EGL=1)
else ()
CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
- add_definitions(-DWTF_USE_GLX=1)
+ add_definitions(-DUSE_GLX=1)
endif ()
if (ENABLE_WEBGL AND OPENGLX_FOUND)
Modified: trunk/Source/cmake/OptionsGTK.cmake (183696 => 183697)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -194,7 +194,7 @@
SET_AND_EXPOSE_TO_BUILD(XP_UNIX ${WTF_OS_UNIX})
SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_WAYLAND ${ENABLE_WAYLAND_TARGET})
-set(WTF_USE_UDIS86 ON)
+set(USE_UDIS86 ON)
set(ENABLE_WEBKIT OFF)
set(ENABLE_WEBKIT2 ON)
set(ENABLE_PLUGIN_PROCESS ON)
@@ -255,7 +255,7 @@
if (ENABLE_GEOLOCATION)
find_package(GeoClue2 2.1.5)
if (GEOCLUE2_FOUND)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GEOCLUE2 ${GEOCLUE2_FOUND})
+ SET_AND_EXPOSE_TO_BUILD(USE_GEOCLUE2 ${GEOCLUE2_FOUND})
else ()
find_package(GeoClue)
if (NOT GEOCLUE_FOUND)
@@ -276,15 +276,15 @@
if (NOT OPENWEBRTC_FOUND)
message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM.")
endif ()
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENWEBRTC TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
endif ()
if (ENABLE_OPENGL)
- # ENABLE_OPENGL is true if either WTF_USE_OPENGL or ENABLE_GLES2 is true.
- # But WTF_USE_OPENGL is the opposite of ENABLE_GLES2.
+ # ENABLE_OPENGL is true if either USE_OPENGL or ENABLE_GLES2 is true.
+ # But USE_OPENGL is the opposite of ENABLE_GLES2.
if (ENABLE_GLES2)
find_package(OpenGLES2 REQUIRED)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENGL_ES_2 TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES_2 TRUE)
if (NOT EGL_FOUND)
message(FATAL_ERROR "EGL is needed for ENABLE_GLES2.")
@@ -293,7 +293,7 @@
if (NOT OPENGL_FOUND)
message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_OPENGL.")
endif ()
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENGL TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_OPENGL TRUE)
endif ()
if (NOT EGL_FOUND AND (NOT ENABLE_X11_TARGET OR NOT GLX_FOUND))
@@ -302,17 +302,17 @@
SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER TRUE)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER_GL TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_EGL ${EGL_FOUND})
+ SET_AND_EXPOSE_TO_BUILD(USE_EGL ${EGL_FOUND})
if (ENABLE_X11_TARGET AND GLX_FOUND)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GLX TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
endif ()
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR})
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR})
+ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR})
+ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR})
endif ()
if (ENABLE_PLUGIN_PROCESS_GTK2)
@@ -336,14 +336,14 @@
if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
set(GSTREAMER_COMPONENTS app pbutils)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
if (ENABLE_VIDEO)
list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)
endif ()
if (ENABLE_WEB_AUDIO)
list(APPEND GSTREAMER_COMPONENTS audio fft)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_WEBAUDIO_GSTREAMER TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
endif ()
find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
Modified: trunk/Source/cmake/OptionsMac.cmake (183696 => 183697)
--- trunk/Source/cmake/OptionsMac.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -224,4 +224,4 @@
set(ENABLE_WEBKIT ON)
set(ENABLE_WEBKIT2 ON)
-set(WTF_USE_UDIS86 1)
+set(USE_UDIS86 1)
Modified: trunk/Source/cmake/OptionsWinCairo.cmake (183696 => 183697)
--- trunk/Source/cmake/OptionsWinCairo.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/cmake/OptionsWinCairo.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,9 +1,9 @@
include(OptionsWindows)
set(WTF_PLATFORM_WIN_CAIRO 1)
-set(WTF_USE_CF 1)
-set(WTF_USE_CURL 1)
-set(WTF_USE_ICU_UNICODE 1)
+set(USE_CF 1)
+set(USE_CURL 1)
+set(USE_ICU_UNICODE 1)
set(ENABLE_GRAPHICS_CONTEXT_3D 1)
Modified: trunk/Source/cmake/WebKitFeatures.cmake (183696 => 183697)
--- trunk/Source/cmake/WebKitFeatures.cmake 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-05-01 23:38:18 UTC (rev 183697)
@@ -305,14 +305,6 @@
foreach (_variable_name ${_WEBKIT_CONFIG_FILE_VARIABLES})
_ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} ${_variable_name})
-
- # WebKit looks for WTF_USE_FOO when calling the USE(FOO) macro. Automatically exposing
- # this definition when USE_FOO is exposed, prevents us from having to expose both (or
- # forgetting to do so).
- string(FIND ${_variable_name} "USE_" _use_string_location)
- if (${_use_string_location} EQUAL 0)
- _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} "WTF_${_variable_name}")
- endif ()
endforeach ()
set(_file_contents "${_file_contents}\n#endif /* CMAKECONFIG_H */\n")
Modified: trunk/Tools/ChangeLog (183696 => 183697)
--- trunk/Tools/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Tools/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1,3 +1,14 @@
+2015-05-01 Martin Robinson <[email protected]>
+
+ USE(...) macro should expect unprefixed variables
+ https://bugs.webkit.org/show_bug.cgi?id=144454
+
+ Reviewed by Daniel Bates.
+
+ * DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Replace all occurrences WTF_USE with USE.
+ * DumpRenderTree/config.h: Ditto.
+ * TestWebKitAPI/config.h: Ditto.
+
2015-05-01 Basile Clement <[email protected]>
Unreviewed. Add myself as a commiter in contributors.json.
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (183696 => 183697)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj 2015-05-01 23:38:18 UTC (rev 183697)
@@ -1133,7 +1133,7 @@
buildSettings = {
INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
PRODUCT_NAME = All;
- WTF_USE_EXPORT_MACROS = 0;
+ USE_EXPORT_MACROS = 0;
};
name = Production;
};
@@ -1224,7 +1224,7 @@
"-Wno-four-char-constants",
"-Wno-unknown-pragmas",
);
- WTF_USE_EXPORT_MACROS = 0;
+ USE_EXPORT_MACROS = 0;
};
name = Debug;
};
@@ -1242,7 +1242,7 @@
"-Wno-four-char-constants",
"-Wno-unknown-pragmas",
);
- WTF_USE_EXPORT_MACROS = 0;
+ USE_EXPORT_MACROS = 0;
};
name = Release;
};
Modified: trunk/Tools/DumpRenderTree/config.h (183696 => 183697)
--- trunk/Tools/DumpRenderTree/config.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Tools/DumpRenderTree/config.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -34,17 +34,17 @@
#endif
#if PLATFORM(COCOA)
-#define WTF_USE_CF 1
+#define USE_CF 1
#endif
#if PLATFORM(WIN)
-#define WTF_USE_CF 1
+#define USE_CF 1
#if PLATFORM(WIN_CAIRO)
-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
+#define USE_CAIRO 1
+#define USE_CURL 1
#else
-#define WTF_USE_CG 1
-#define WTF_USE_CFNETWORK 1
+#define USE_CG 1
+#define USE_CFNETWORK 1
#endif
#undef _WIN32_WINNT
Modified: trunk/Tools/TestWebKitAPI/config.h (183696 => 183697)
--- trunk/Tools/TestWebKitAPI/config.h 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Tools/TestWebKitAPI/config.h 2015-05-01 23:38:18 UTC (rev 183697)
@@ -47,16 +47,16 @@
#endif
#if PLATFORM(WIN_CAIRO)
-#undef WTF_USE_CG
-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
+#undef USE_CG
+#define USE_CAIRO 1
+#define USE_CURL 1
#ifndef _WINSOCKAPI_
#define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
#endif
#else
-#define WTF_USE_CG 1
-#undef WTF_USE_CAIRO
-#undef WTF_USE_CURL
+#define USE_CG 1
+#undef USE_CAIRO
+#undef USE_CURL
#endif
#endif // PLATFORM(WIN)
