<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183697] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183697">183697</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-01 16:38:18 -0700 (Fri, 01 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
Source/JavaScriptCore:
* CMakeLists.txt: Replace all occurrences WTF_USE with USE.
Source/WebCore:
* 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.
Source/WebKit/cf:
* WebCoreSupport/WebInspectorClientCF.cpp: Replace all occurrences WTF_USE with USE.
Source/WebKit/mac:
* Misc/WebDownload.h: Replace all occurrences WTF_USE with USE.
Source/WebKit2:
* Shared/API/c/WKBase.h: Replace all occurrences WTF_USE with USE.
* WebKit2.xcodeproj/project.pbxproj: Ditto.
Source/WTF:
* 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.
Tools:
* DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj: Replace all occurrences WTF_USE with USE.
* DumpRenderTree/config.h: Ditto.
* TestWebKitAPI/config.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAssertionscpp">trunk/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfWTFThreadDatah">trunk/Source/WTF/wtf/WTFThreadData.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcPublicDOMInterfacesh">trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h</a></li>
<li><a href="#trunkSourceWebCoreconfigh">trunk/Source/WebCore/config.h</a></li>
<li><a href="#trunkSourceWebCorecryptomacSerializedCryptoKeyWrapMacmm">trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm</a></li>
<li><a href="#trunkSourceWebCorepageAlternativeTextClienth">trunk/Source/WebCore/page/AlternativeTextClient.h</a></li>
<li><a href="#trunkSourceWebCoreplatformeflFileSystemEflcpp">trunk/Source/WebCore/platform/efl/FileSystemEfl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh">trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh">trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h</a></li>
<li><a href="#trunkSourceWebCoreplatformioswakWAKAppKitStubsh">trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerCompositorcpp">trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#trunkSourceWebKitcfChangeLog">trunk/Source/WebKit/cf/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitcfWebCoreSupportWebInspectorClientCFcpp">trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadh">trunk/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKBaseh">trunk/Source/WebKit2/Shared/API/c/WKBase.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourcecmakeOptionsAppleWincmake">trunk/Source/cmake/OptionsAppleWin.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsWinCairocmake">trunk/Source/cmake/OptionsWinCairo.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj">trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsDumpRenderTreeconfigh">trunk/Tools/DumpRenderTree/config.h</a></li>
<li><a href="#trunkToolsTestWebKitAPIconfigh">trunk/Tools/TestWebKitAPI/config.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-04-30 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Automatically expose WTF_USE_FOO to the build when USE_FOO is exposed
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-05-01 23:38:18 UTC (rev 183697)
</span><span class="lines">@@ -627,7 +627,7 @@
</span><span class="cx"> ${ICU_I18N_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (WTF_USE_UDIS86)
</del><ins>+if (USE_UDIS86)
</ins><span class="cx"> set(UDIS_GEN_DEP
</span><span class="cx"> disassembler/udis86/ud_opcode.py
</span><span class="cx"> disassembler/udis86/ud_optable.py
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-01 Jordan Harband <ljharb@gmail.com>
</span><span class="cx">
</span><span class="cx"> String#startsWith/endsWith/includes don't handle Infinity position/endPosition args correctly
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-01 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX by default on all ports (Windows was missed)
</span></span></pre></div>
<a id="trunkSourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Assertions.cpp (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> #include <CoreFoundation/CFString.h>
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_APPLE_SYSTEM_LOG 1
</del><ins>+#define USE_APPLE_SYSTEM_LOG 1
</ins><span class="cx"> #include <asl.h>
</span><span class="cx"> #endif
</span><span class="cx"> #endif // USE(CF)
</span><span class="lines">@@ -262,10 +262,10 @@
</span><span class="cx"> #if OS(DARWIN) || OS(LINUX)
</span><span class="cx"> # if PLATFORM(GTK)
</span><span class="cx"> # if defined(__GLIBC__) && !defined(__UCLIBC__)
</span><del>-# define WTF_USE_BACKTRACE_SYMBOLS 1
</del><ins>+# define USE_BACKTRACE_SYMBOLS 1
</ins><span class="cx"> # endif
</span><span class="cx"> # else
</span><del>-# define WTF_USE_DLADDR 1
</del><ins>+# define USE_DLADDR 1
</ins><span class="cx"> # endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -302,8 +302,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#undef WTF_USE_BACKTRACE_SYMBOLS
-#undef WTF_USE_DLADDR
</del><ins>+#undef USE_BACKTRACE_SYMBOLS
+#undef USE_DLADDR
</ins><span class="cx">
</span><span class="cx"> static WTFCrashHookFunction globalHook = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> /* ==== Policy decision macros: these define policy choices for a particular port. ==== */
</span><span class="cx">
</span><span class="cx"> /* USE() - use a particular third-party library or optional OS service */
</span><del>-#define USE(WTF_FEATURE) (defined WTF_USE_##WTF_FEATURE && WTF_USE_##WTF_FEATURE)
</del><ins>+#define USE(WTF_FEATURE) (defined USE_##WTF_FEATURE && USE_##WTF_FEATURE)
</ins><span class="cx"> /* ENABLE() - turn on a specific feature of WebKit */
</span><span class="cx"> #define ENABLE(WTF_FEATURE) (defined ENABLE_##WTF_FEATURE && ENABLE_##WTF_FEATURE)
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> #define WTF_MIPS_DOUBLE_FLOAT (defined __mips_hard_float && !defined __mips_single_float)
</span><span class="cx"> #define WTF_MIPS_FP64 (defined __mips_fpr && __mips_fpr == 64)
</span><span class="cx"> /* MIPS requires allocators to use aligned memory */
</span><del>-#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
</del><ins>+#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
</ins><span class="cx"> #endif /* MIPS */
</span><span class="cx">
</span><span class="cx"> /* CPU(PPC) - PowerPC 32-bit */
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> || defined(__ARM_ARCH_5TEJ__)
</span><span class="cx"> #define WTF_ARM_ARCH_VERSION 5
</span><span class="cx"> /*ARMv5TE requires allocators to use aligned memory*/
</span><del>-#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
</del><ins>+#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
</ins><span class="cx">
</span><span class="cx"> #elif defined(__ARM_ARCH_6__) \
</span><span class="cx"> || defined(__ARM_ARCH_6J__) \
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> || defined(__TARGET_ARCH_5TE) \
</span><span class="cx"> || defined(__TARGET_ARCH_5TEJ)
</span><span class="cx"> /*ARMv5TE requires allocators to use aligned memory*/
</span><del>-#define WTF_USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
</del><ins>+#define USE_ARENA_ALLOC_ALIGNMENT_INTEGER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #else
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #if defined __has_include && __has_include(<CoreFoundation/CFPriv.h>)
</span><del>-#define WTF_USE_APPLE_INTERNAL_SDK 1
</del><ins>+#define USE_APPLE_INTERNAL_SDK 1
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -473,19 +473,19 @@
</span><span class="cx">
</span><span class="cx"> /* USE(CG) and PLATFORM(CI) */
</span><span class="cx"> #if PLATFORM(COCOA) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
</span><del>-#define WTF_USE_CG 1
</del><ins>+#define USE_CG 1
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(COCOA) || (PLATFORM(WIN) && USE(CG))
</span><del>-#define WTF_USE_CA 1
</del><ins>+#define USE_CA 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>-#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
</del><ins>+#define USE_CAIRO 1
+#define USE_GLIB 1
+#define USE_FREETYPE 1
+#define USE_HARFBUZZ 1
+#define USE_SOUP 1
+#define USE_WEBP 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) && !defined(GTK_API_VERSION_2)
</span><span class="lines">@@ -494,14 +494,14 @@
</span><span class="cx">
</span><span class="cx"> /* On Windows, use QueryPerformanceCounter by default */
</span><span class="cx"> #if OS(WINDOWS)
</span><del>-#define WTF_USE_QUERY_PERFORMANCE_COUNTER 1
</del><ins>+#define USE_QUERY_PERFORMANCE_COUNTER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">
</span><del>-#define WTF_USE_CF 1
-#define WTF_USE_FOUNDATION 1
-#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
</del><ins>+#define USE_CF 1
+#define USE_FOUNDATION 1
+#define USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
</ins><span class="cx"> #define ENABLE_USER_MESSAGE_HANDLERS 1
</span><span class="cx"> #define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
</span><span class="cx"> #define HAVE_DTRACE 1
</span><span class="lines">@@ -518,13 +518,13 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><del>-#define WTF_USE_APPKIT 1
</del><ins>+#define USE_APPKIT 1
</ins><span class="cx"> #define HAVE_RUNLOOP_TIMER 1
</span><span class="cx"> #define HAVE_SEC_IDENTITY 1
</span><span class="cx"> #define HAVE_SEC_KEYCHAIN 1
</span><span class="cx">
</span><span class="cx"> #if CPU(X86_64)
</span><del>-#define WTF_USE_PLUGIN_HOST_PROCESS 1
</del><ins>+#define USE_PLUGIN_HOST_PROCESS 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* OS X defines a series of platform macros for debugging. */
</span><span class="lines">@@ -539,11 +539,11 @@
</span><span class="cx">
</span><span class="cx"> #define HAVE_READLINE 1
</span><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><del>-#define WTF_USE_CFNETWORK 1
</del><ins>+#define USE_CFNETWORK 1
</ins><span class="cx"> #endif
</span><del>-#define WTF_USE_UIKIT_EDITING 1
-#define WTF_USE_WEB_THREAD 1
-#define WTF_USE_QUICK_LOOK 1
</del><ins>+#define USE_UIKIT_EDITING 1
+#define USE_WEB_THREAD 1
+#define USE_QUICK_LOOK 1
</ins><span class="cx">
</span><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</span><span class="cx"> #define HAVE_APP_LINKS 1
</span><span class="lines">@@ -561,15 +561,15 @@
</span><span class="cx"> #endif /* PLATFORM(IOS) */
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && !USE(WINGDI)
</span><del>-#define WTF_USE_CF 1
</del><ins>+#define USE_CF 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO)
</span><del>-#define WTF_USE_CFNETWORK 1
</del><ins>+#define USE_CFNETWORK 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK) || PLATFORM(COCOA)
</span><del>-#define WTF_USE_CFURLCACHE 1
</del><ins>+#define USE_CFURLCACHE 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(HAVE_ACCESSIBILITY)
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> #define HAVE_STRINGS_H 1
</span><span class="cx"> #define HAVE_SYS_PARAM_H 1
</span><span class="cx"> #define HAVE_SYS_TIME_H 1
</span><del>-#define WTF_USE_PTHREADS 1
</del><ins>+#define USE_PTHREADS 1
</ins><span class="cx"> #endif /* OS(UNIX) */
</span><span class="cx">
</span><span class="cx"> #if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> #define HAVE_PTHREAD_SETNAME_NP 1
</span><span class="cx"> #define HAVE_READLINE 1
</span><span class="cx"> #define HAVE_SYS_TIMEB_H 1
</span><del>-#define WTF_USE_ACCELERATE 1
</del><ins>+#define USE_ACCELERATE 1
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> #define HAVE_HOSTED_CORE_ANIMATION 1
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> #define ENABLE_SAMPLING_THREAD 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64)
</del><ins>+#if !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64)
</ins><span class="cx"> #if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS))) \
</span><span class="cx"> || (CPU(IA64) && !CPU(IA64_32)) \
</span><span class="cx"> || CPU(ALPHA) \
</span><span class="lines">@@ -675,11 +675,11 @@
</span><span class="cx"> || CPU(MIPS64) \
</span><span class="cx"> || CPU(PPC64) \
</span><span class="cx"> || CPU(PPC64LE)
</span><del>-#define WTF_USE_JSVALUE64 1
</del><ins>+#define USE_JSVALUE64 1
</ins><span class="cx"> #else
</span><del>-#define WTF_USE_JSVALUE32_64 1
</del><ins>+#define USE_JSVALUE32_64 1
</ins><span class="cx"> #endif
</span><del>-#endif /* !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32_64) */
</del><ins>+#endif /* !defined(USE_JSVALUE64) && !defined(USE_JSVALUE32_64) */
</ins><span class="cx">
</span><span class="cx"> /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except ARMv7k. */
</span><span class="cx"> #if !defined(ENABLE_JIT) \
</span><span class="lines">@@ -711,28 +711,28 @@
</span><span class="cx">
</span><span class="cx"> /* If possible, try to enable the LLVM disassembler. This is optional and we can
</span><span class="cx"> fall back on UDis86 if necessary. */
</span><del>-#if !defined(WTF_USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))
-#define WTF_USE_LLVM_DISASSEMBLER 1
</del><ins>+#if !defined(USE_LLVM_DISASSEMBLER) && HAVE(LLVM) && (CPU(X86_64) || CPU(X86) || CPU(ARM64))
+#define USE_LLVM_DISASSEMBLER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* If possible, try to enable a disassembler. This is optional. We proceed in two
</span><span class="cx"> steps: first we try to find some disassembler that we can use, and then we
</span><span class="cx"> decide if the high-level disassembler API can be enabled. */
</span><del>-#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (OS(LINUX) && (PLATFORM(EFL) || PLATFORM(GTK)))) \
</del><ins>+#if !defined(USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (OS(LINUX) && (PLATFORM(EFL) || PLATFORM(GTK)))) \
</ins><span class="cx"> && (CPU(X86) || CPU(X86_64))
</span><del>-#define WTF_USE_UDIS86 1
</del><ins>+#define USE_UDIS86 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(LLVM_DISASSEMBLER))
</span><span class="cx"> #define ENABLE_DISASSEMBLER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_ARM64_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM64) && !USE(LLVM_DISASSEMBLER)
-#define WTF_USE_ARM64_DISASSEMBLER 1
</del><ins>+#if !defined(USE_ARM64_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM64) && !USE(LLVM_DISASSEMBLER)
+#define USE_ARM64_DISASSEMBLER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_ARMV7_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM_THUMB2)
-#define WTF_USE_ARMV7_DISASSEMBLER 1
</del><ins>+#if !defined(USE_ARMV7_DISASSEMBLER) && ENABLE(JIT) && CPU(ARM_THUMB2)
+#define USE_ARMV7_DISASSEMBLER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER) || USE(ARM64_DISASSEMBLER))
</span><span class="lines">@@ -893,43 +893,43 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBGL) && PLATFORM(WIN)
</span><del>-#define WTF_USE_OPENGL 1
-#define WTF_USE_OPENGL_ES_2 1
-#define WTF_USE_EGL 1
</del><ins>+#define USE_OPENGL 1
+#define USE_OPENGL_ES_2 1
+#define USE_EGL 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
</span><span class="cx"> #if ENABLE(GSTREAMER_WINCAIRO)
</span><del>-#define WTF_USE_MEDIA_FOUNDATION 0
-#define WTF_USE_GLIB 1
-#define WTF_USE_GSTREAMER 1
</del><ins>+#define USE_MEDIA_FOUNDATION 0
+#define USE_GLIB 1
+#define USE_GSTREAMER 1
</ins><span class="cx"> #else
</span><del>-#define WTF_USE_MEDIA_FOUNDATION 1
</del><ins>+#define USE_MEDIA_FOUNDATION 1
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN_CAIRO)
</span><del>-#define WTF_USE_TEXTURE_MAPPER 1
</del><ins>+#define USE_TEXTURE_MAPPER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_3D) && !defined(WTF_USE_TEXTURE_MAPPER_GL)
-#define WTF_USE_TEXTURE_MAPPER_GL 1
</del><ins>+#if USE(TEXTURE_MAPPER) && ENABLE(GRAPHICS_CONTEXT_3D) && !defined(USE_TEXTURE_MAPPER_GL)
+#define USE_TEXTURE_MAPPER_GL 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Compositing on the UI-process in WebKit2 */
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
</del><ins>+#define USE_PROTECTION_SPACE_AUTH_CALLBACK 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
</span><span class="cx"> #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#define WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS 1
</del><ins>+#define USE_CROSS_PLATFORM_CONTEXT_MENUS 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
</span><del>-#define WTF_USE_ACCESSIBILITY_CONTEXT_MENUS 1
</del><ins>+#define USE_ACCESSIBILITY_CONTEXT_MENUS 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if CPU(ARM_THUMB2) || CPU(ARM64)
</span><span class="lines">@@ -956,20 +956,20 @@
</span><span class="cx"> since most ports try to support sub-project independence, adding new headers
</span><span class="cx"> to WTF causes many ports to break, and so this way we can address the build
</span><span class="cx"> breakages one port at a time. */
</span><del>-#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
-#define WTF_USE_EXPORT_MACROS 1
</del><ins>+#if !defined(USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
+#define USE_EXPORT_MACROS 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_EXPORT_MACROS_FOR_TESTING) && (PLATFORM(GTK) || PLATFORM(WIN))
-#define WTF_USE_EXPORT_MACROS_FOR_TESTING 1
</del><ins>+#if !defined(USE_EXPORT_MACROS_FOR_TESTING) && (PLATFORM(GTK) || PLATFORM(WIN))
+#define USE_EXPORT_MACROS_FOR_TESTING 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><del>-#define WTF_USE_UNIX_DOMAIN_SOCKETS 1
</del><ins>+#define USE_UNIX_DOMAIN_SOCKETS 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_IMLANG_FONT_LINK2)
-#define WTF_USE_IMLANG_FONT_LINK2 1
</del><ins>+#if !defined(USE_IMLANG_FONT_LINK2)
+#define USE_IMLANG_FONT_LINK2 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_COMPARE_AND_SWAP) && (OS(WINDOWS) || (COMPILER(GCC) && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM64))))
</span><span class="lines">@@ -989,7 +989,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_AVFOUNDATION 1
</del><ins>+#define USE_AVFOUNDATION 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(ENABLE_TREE_DEBUGGING)
</span><span class="lines">@@ -1001,7 +1001,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 60000) || PLATFORM(MAC)
</span><del>-#define WTF_USE_COREMEDIA 1
</del><ins>+#define USE_COREMEDIA 1
</ins><span class="cx"> #define HAVE_AVFOUNDATION_VIDEO_OUTPUT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1019,23 +1019,23 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#define WTF_USE_VIDEOTOOLBOX 1
</del><ins>+#define USE_VIDEOTOOLBOX 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI))
</span><del>-#define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
</del><ins>+#define USE_REQUEST_ANIMATION_FRAME_TIMER 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
</del><ins>+#define USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#define WTF_USE_COREAUDIO 1
</del><ins>+#define USE_COREAUDIO 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if !defined(WTF_USE_ZLIB)
-#define WTF_USE_ZLIB 1
</del><ins>+#if !defined(USE_ZLIB)
+#define USE_ZLIB 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef HAVE_QOS_CLASSES
</span><span class="lines">@@ -1050,39 +1050,39 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#define WTF_USE_GRAMMAR_CHECKING 1
</del><ins>+#define USE_GRAMMAR_CHECKING 1
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) || PLATFORM(EFL)
</span><del>-#define WTF_USE_UNIFIED_TEXT_CHECKING 1
</del><ins>+#define USE_UNIFIED_TEXT_CHECKING 1
</ins><span class="cx"> #endif
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#define WTF_USE_AUTOMATIC_TEXT_REPLACEMENT 1
</del><ins>+#define USE_AUTOMATIC_TEXT_REPLACEMENT 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> /* Some platforms provide UI for suggesting autocorrection. */
</span><del>-#define WTF_USE_AUTOCORRECTION_PANEL 1
</del><ins>+#define USE_AUTOCORRECTION_PANEL 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> /* 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. */
</span><del>-#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
</del><ins>+#define USE_MARKER_REMOVAL_UPON_EDITING 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>-#define WTF_USE_INSERTION_UNDO_GROUPING 1
</del><ins>+#define USE_INSERTION_UNDO_GROUPING 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>-#define WTF_USE_PLATFORM_TEXT_TRACK_MENU 1
</del><ins>+#define USE_PLATFORM_TEXT_TRACK_MENU 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_AUDIO_SESSION 1
</del><ins>+#define USE_AUDIO_SESSION 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && !PLATFORM(IOS_SIMULATOR)
</span><del>-#define WTF_USE_IOSURFACE 1
</del><ins>+#define USE_IOSURFACE 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
</span><del>-#define WTF_USE_ASYNC_NSTEXTINPUTCLIENT 1
</del><ins>+#define USE_ASYNC_NSTEXTINPUTCLIENT 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if (OS(DARWIN) && USE(CG)) || USE(FREETYPE) || (PLATFORM(WIN) && (USE(CG) || USE(CAIRO)))
</span><span class="lines">@@ -1126,7 +1126,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_MEDIATOOLBOX 1
</del><ins>+#define USE_MEDIATOOLBOX 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 90000
</span></span></pre></div>
<a id="trunkSourceWTFwtfWTFThreadDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WTFThreadData.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if defined(__PTK_FRAMEWORK_JAVASCRIPTCORE_KEY1)
</span><del>-#define WTF_USE_PTHREAD_GETSPECIFIC_DIRECT 1
</del><ins>+#define USE_PTHREAD_GETSPECIFIC_DIRECT 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !USE(PTHREAD_GETSPECIFIC_DIRECT)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-01 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [OS X] Text dilation parameters are not restored after being set
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -709,10 +709,10 @@
</span><span class="cx"> WTF_PLATFORM_IOS = 0
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx"> else
</span><del>- WTF_USE_APPLE_INTERNAL_SDK = 0
</del><ins>+ USE_APPLE_INTERNAL_SDK = 0
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> 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)
</span><span class="lines">@@ -837,8 +837,8 @@
</span><span class="cx"> ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
</span><span class="cx"> endif
</span><span class="cx">
</span><del>-ifeq ($(WTF_USE_APPLE_INTERNAL_SDK), 1)
- ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) WTF_USE_APPLE_INTERNAL_SDK
</del><ins>+ifeq ($(USE_APPLE_INTERNAL_SDK), 1)
+ ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK
</ins><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> # --------
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> platform/text/enchant/TextCheckerEnchant.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (WTF_USE_GEOCLUE2)
</del><ins>+if (USE_GEOCLUE2)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
</span><span class="cx"> )
</span><span class="lines">@@ -386,14 +386,14 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_EGL)
</del><ins>+if (USE_EGL)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${EGL_INCLUDE_DIR}
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/surfaces/egl"
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_EGL)
</del><ins>+if (USE_EGL)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> platform/graphics/surfaces/egl/EGLConfigSelector.cpp
</span><span class="cx"> platform/graphics/surfaces/egl/EGLContext.cpp
</span><span class="lines">@@ -408,7 +408,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_OPENGL_ES_2)
</del><ins>+if (USE_OPENGL_ES_2)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> platform/graphics/opengl/Extensions3DOpenGLES.cpp
</span><span class="cx"> platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_EGL)
</del><ins>+if (USE_EGL)
</ins><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${EGL_LIBRARY}
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> rendering/RenderThemeGtk.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-if (WTF_USE_GEOCLUE2)
</del><ins>+if (USE_GEOCLUE2)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c
</span><span class="cx"> )
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> ${GSTREAMER_VIDEO_LIBRARIES}
</span><span class="cx"> )
</span><span class="cx">
</span><del>- if (WTF_USE_GSTREAMER_MPEGTS)
</del><ins>+ if (USE_GSTREAMER_MPEGTS)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GSTREAMER_MPEGTS_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>- if (WTF_USE_GSTREAMER_GL)
</del><ins>+ if (USE_GSTREAMER_GL)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${GSTREAMER_GL_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_TEXTURE_MAPPER)
</del><ins>+if (USE_TEXTURE_MAPPER)
</ins><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/texmap"
</span><span class="cx"> )
</span><span class="lines">@@ -413,20 +413,20 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_EGL)
</del><ins>+if (USE_EGL)
</ins><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${EGL_LIBRARY}
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_OPENGL_ES_2)
</del><ins>+if (USE_OPENGL_ES_2)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> platform/graphics/opengl/Extensions3DOpenGLES.cpp
</span><span class="cx"> platform/graphics/opengl/GraphicsContext3DOpenGLES.cpp
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WTF_USE_OPENGL)
</del><ins>+if (USE_OPENGL)
</ins><span class="cx"> list(APPEND WebCore_SOURCES
</span><span class="cx"> platform/graphics/OpenGLShims.cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcPublicDOMInterfacesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/PublicDOMInterfaces.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1247,7 +1247,7 @@
</span><span class="cx"> - (NSString *)lookupNamespaceURI:(NSString *)prefix;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if defined(WTF_USE_APPLE_INTERNAL_SDK) && WTF_USE_APPLE_INTERNAL_SDK
</del><ins>+#if defined(USE_APPLE_INTERNAL_SDK) && USE_APPLE_INTERNAL_SDK
</ins><span class="cx"> #if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE
</span><span class="cx"> #include <WebKitAdditions/PublicDOMInterfacesIOS.h>
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/config.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_FILE_LOCK 1
</del><ins>+#define USE_FILE_LOCK 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN) && !USE(WINGDI)
</span><span class="lines">@@ -88,21 +88,21 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><span class="cx"> #if PLATFORM(WIN_CAIRO)
</span><del>-#undef WTF_USE_CG
-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
</del><ins>+#undef USE_CG
+#define USE_CAIRO 1
+#define USE_CURL 1
</ins><span class="cx"> #ifndef _WINSOCKAPI_
</span><span class="cx"> #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
</span><span class="cx"> #endif
</span><span class="cx"> #elif !USE(WINGDI)
</span><del>-#define WTF_USE_CG 1
-#undef WTF_USE_CAIRO
-#undef WTF_USE_CURL
</del><ins>+#define USE_CG 1
+#undef USE_CAIRO
+#undef USE_CURL
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#define WTF_USE_NEW_THEME 1
</del><ins>+#define USE_NEW_THEME 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="lines">@@ -121,13 +121,13 @@
</span><span class="cx"> #define WEBCORE_NAVIGATOR_VENDOR wkGetVendorNameForNavigator();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// FIXME: Move this to JavaScriptCore/wtf/Platform.h, which is where we define WTF_USE_AVFOUNDATION on the Mac.
</del><ins>+// FIXME: Move this to JavaScriptCore/wtf/Platform.h, which is where we define USE_AVFOUNDATION on the Mac.
</ins><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=67334
</span><span class="cx"> #if PLATFORM(WIN) && USE(CG) && HAVE(AVCF)
</span><del>-#define WTF_USE_AVFOUNDATION 1
</del><ins>+#define USE_AVFOUNDATION 1
</ins><span class="cx">
</span><span class="cx"> #if HAVE(AVCF_LEGIBLE_OUTPUT)
</span><del>-#define WTF_USE_AVFOUNDATION 1
</del><ins>+#define USE_AVFOUNDATION 1
</ins><span class="cx"> #define HAVE_AVFOUNDATION_MEDIA_SELECTION_GROUP 1
</span><span class="cx"> #define HAVE_AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT 1
</span><span class="cx"> #define HAVE_MEDIA_ACCESSIBILITY_FRAMEWORK 1
</span></span></pre></div>
<a id="trunkSourceWebCorecryptomacSerializedCryptoKeyWrapMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/crypto/mac/SerializedCryptoKeyWrapMac.mm (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> #include <wtf/CryptographicUtilities.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><del>-#define WTF_USE_KEYCHAIN_ACCESS_CONTROL_LISTS (!PLATFORM(IOS))
</del><ins>+#define USE_KEYCHAIN_ACCESS_CONTROL_LISTS (!PLATFORM(IOS))
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageAlternativeTextClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/AlternativeTextClient.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> // Some platforms provide UI for suggesting alternative dictation text.
</span><del>-#define WTF_USE_DICTATION_ALTERNATIVES 1
</del><ins>+#define USE_DICTATION_ALTERNATIVES 1
</ins><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformeflFileSystemEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/efl/FileSystemEfl.cpp (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> {
</span><span class="cx"> // WARNING: this is just used by platform/network/soup, thus must be GLIB!!!
</span><span class="cx"> // TODO: move this to CString and use it instead in both, being more standard
</span><del>-#if !PLATFORM(WIN_OS) && defined(WTF_USE_SOUP)
</del><ins>+#if !PLATFORM(WIN_OS) && defined(USE_SOUP)
</ins><span class="cx"> char* filename = g_uri_unescape_string(path.utf8().data(), 0);
</span><span class="cx"> CString cfilename(filename);
</span><span class="cx"> g_free(filename);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgImageBufferDataCGh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/ImageBufferDataCG.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA) && USE(CA) && !PLATFORM(IOS_SIMULATOR)
</span><del>-#define WTF_USE_IOSURFACE_CANVAS_BACKING_STORE 1
</del><ins>+#define USE_IOSURFACE_CANVAS_BACKING_STORE 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef struct CGColorSpace *CGColorSpaceRef;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscgPDFDocumentImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cg/PDFDocumentImage.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #if USE(CG)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><del>-#define WTF_USE_PDFKIT_FOR_PDFDOCUMENTIMAGE 1
</del><ins>+#define USE_PDFKIT_FOR_PDFDOCUMENTIMAGE 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> typedef struct CGPDFDocument *CGPDFDocumentRef;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformioswakWAKAppKitStubsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ios/wak/WAKAppKitStubs.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: <rdar://problem/6669434> Switch from using NSGeometry methods to CGGeometry methods
</span><span class="cx"> //
</span><del>-// We explicitly use __has_include() instead of the macro define WTF_USE_APPLE_INTERNAL_SDK as
</del><ins>+// We explicitly use __has_include() instead of the macro define USE_APPLE_INTERNAL_SDK as
</ins><span class="cx"> // the condition for including the header Foundation/NSGeometry.h to support internal Apple
</span><span class="cx"> // clients that build without header wtf/Platform.h.
</span><span class="cx"> #if __has_include(<Foundation/NSGeometry.h>)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(MAC) && !PLATFORM(IOS)
</span><del>-#define WTF_USE_COMPOSITING_FOR_SMALL_CANVASES 1
</del><ins>+#define USE_COMPOSITING_FOR_SMALL_CANVASES 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKitcfChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/cf/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-04-22 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove OwnPtr and PassOwnPtr use from WebKit/cf, WebKit/mac, and WebKit2
</span></span></pre></div>
<a id="trunkSourceWebKitcfWebCoreSupportWebInspectorClientCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/cf/WebCoreSupport/WebInspectorClientCF.cpp (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,19 +25,19 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: On Windows, we require all WebKit source files to include config.h
</span><span class="cx"> // before including any other files. Failing to include config.h will leave
</span><del>-// WTF_USE_CF undefined, causing build failures in this
</del><ins>+// USE_CF undefined, causing build failures in this
</ins><span class="cx"> // file. But Mac doesn't have a config.h for WebKit, so we can't include the
</span><del>-// 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
</del><ins>+// 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
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #include <wtf/Platform.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#ifndef WTF_USE_CG
-#define WTF_USE_CG 1
</del><ins>+#ifndef USE_CG
+#define USE_CG 1
</ins><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add API to disable meta refreshes.
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-// We explicitly use __has_include() instead of the macro define WTF_USE_APPLE_INTERNAL_SDK as
</del><ins>+// We explicitly use __has_include() instead of the macro define USE_APPLE_INTERNAL_SDK as
</ins><span class="cx"> // the condition for including the header Foundation/NSURLDownload.h to support internal Apple
</span><span class="cx"> // clients that build without header wtf/Platform.h. See <rdar://problem/19034131>.
</span><span class="cx"> #if __has_include(<Foundation/NSURLDownload.h>)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Add API to disable meta refreshes.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKBase.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #include <WebKit/WKBaseGtk.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if defined(WTF_USE_SOUP)
</del><ins>+#if defined(USE_SOUP)
</ins><span class="cx"> #include <WebKit/WKBaseSoup.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -9159,7 +9159,7 @@
</span><span class="cx"> );
</span><span class="cx"> runOnlyForDeploymentPostprocessing = 0;
</span><span class="cx"> shellPath = /bin/sh;
</span><del>- 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";
</del><ins>+ 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";
</ins><span class="cx"> };
</span><span class="cx"> 5DF408C5131DD46700130071 /* Check For Weak VTables and Externals */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsAppleWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsAppleWin.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> include(OptionsWindows)
</span><span class="cx">
</span><del>-set(WTF_USE_CG 1)
-set(WTF_USE_CA 1)
-set(WTF_USE_CFNETWORK 1)
-set(WTF_USE_ICU_UNICODE 1)
</del><ins>+set(USE_CG 1)
+set(USE_CA 1)
+set(USE_CFNETWORK 1)
+set(USE_ICU_UNICODE 1)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,8 +11,8 @@
</span><span class="cx"> set(ADDITIONAL_COMPILER_FLAGS ENABLE_WERROR)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-set(WTF_USE_SOUP 1)
-set(WTF_USE_UDIS86 1)
</del><ins>+set(USE_SOUP 1)
+set(USE_UDIS86 1)
</ins><span class="cx">
</span><span class="cx"> set(WTF_LIBRARY_TYPE STATIC)
</span><span class="cx"> set(WTF_OUTPUT_NAME wtf_efl)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> add_definitions(-DBUILDING_EFL__=1)
</span><del>-add_definitions(-DWTF_USE_CROSS_PLATFORM_CONTEXT_MENUS=1)
</del><ins>+add_definitions(-DUSE_CROSS_PLATFORM_CONTEXT_MENUS=1)
</ins><span class="cx"> add_definitions(-DDATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}"
</span><span class="cx"> -DDEFAULT_THEME_DIR="${THEME_BINARY_DIR}")
</span><span class="cx"> add_definitions(-DWEB_INSPECTOR_DIR=\"${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}\")
</span><span class="lines">@@ -174,10 +174,10 @@
</span><span class="cx"> list(APPEND GLIB_COMPONENTS gio-unix)
</span><span class="cx"> find_package(GeoClue2 2.1.5)
</span><span class="cx"> if (GEOCLUE2_FOUND)
</span><del>- set(WTF_USE_GEOCLUE2 1)
</del><ins>+ set(USE_GEOCLUE2 1)
</ins><span class="cx"> else ()
</span><span class="cx"> find_package(GeoClue)
</span><del>- set(WTF_USE_GEOCLUE2 0)
</del><ins>+ set(USE_GEOCLUE2 0)
</ins><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_MEDIA_STREAM)
</span><span class="cx"> find_package(OpenWebRTC REQUIRED)
</span><del>- add_definitions(-DWTF_USE_OPENWEBRTC)
</del><ins>+ add_definitions(-DUSE_OPENWEBRTC)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -206,8 +206,8 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span><span class="cx"> set(GSTREAMER_COMPONENTS app mpegts pbutils)
</span><del>- set(WTF_USE_GSTREAMER 1)
- add_definitions(-DWTF_USE_GSTREAMER=1)
</del><ins>+ set(USE_GSTREAMER 1)
+ add_definitions(-DUSE_GSTREAMER=1)
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_VIDEO)
</span><span class="cx"> list(APPEND GSTREAMER_COMPONENTS video tag)
</span><span class="lines">@@ -215,44 +215,44 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEB_AUDIO)
</span><span class="cx"> list(APPEND GSTREAMER_COMPONENTS audio fft)
</span><del>- add_definitions(-DWTF_USE_WEBAUDIO_GSTREAMER=1)
</del><ins>+ add_definitions(-DUSE_WEBAUDIO_GSTREAMER=1)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> find_package(GStreamer 1.0.5 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
</span><span class="cx">
</span><span class="cx"> if (PC_GSTREAMER_MPEGTS_FOUND)
</span><del>- add_definitions(-DWTF_USE_GSTREAMER_MPEGTS)
</del><ins>+ add_definitions(-DUSE_GSTREAMER_MPEGTS)
</ins><span class="cx"> set(USE_GSTREAMER_MPEGTS TRUE)
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
-add_definitions(-DWTF_USE_COORDINATED_GRAPHICS_MULTIPROCESS=1)
-add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
</del><ins>+add_definitions(-DUSE_COORDINATED_GRAPHICS=1)
+add_definitions(-DUSE_COORDINATED_GRAPHICS_MULTIPROCESS=1)
+add_definitions(-DUSE_TEXTURE_MAPPER=1)
</ins><span class="cx">
</span><span class="cx"> set(ENABLE_GRAPHICS_CONTEXT_3D 1)
</span><span class="cx"> add_definitions(-DENABLE_GRAPHICS_CONTEXT_3D=1)
</span><del>-add_definitions(-DWTF_USE_GRAPHICS_SURFACE=1)
</del><ins>+add_definitions(-DUSE_GRAPHICS_SURFACE=1)
</ins><span class="cx">
</span><span class="cx"> option(ENABLE_GLES2 "Enable GLES Support")
</span><span class="cx"> if (ENABLE_GLES2)
</span><span class="cx"> find_package(GLES REQUIRED)
</span><del>- set(WTF_USE_OPENGL_ES_2 1)
- add_definitions(-DWTF_USE_OPENGL_ES_2=1)
</del><ins>+ set(USE_OPENGL_ES_2 1)
+ add_definitions(-DUSE_OPENGL_ES_2=1)
</ins><span class="cx"> else ()
</span><span class="cx"> find_package(OpenGL REQUIRED)
</span><del>- set(WTF_USE_OPENGL 1)
- add_definitions(-DWTF_USE_OPENGL=1)
</del><ins>+ set(USE_OPENGL 1)
+ add_definitions(-DUSE_OPENGL=1)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> option(ENABLE_EGL "Enable EGL Support")
</span><span class="cx"> if (ENABLE_EGL)
</span><span class="cx"> find_package(EGL REQUIRED)
</span><del>- set(WTF_USE_EGL 1)
- add_definitions(-DWTF_USE_EGL=1)
</del><ins>+ set(USE_EGL 1)
+ add_definitions(-DUSE_EGL=1)
</ins><span class="cx"> else ()
</span><span class="cx"> CHECK_INCLUDE_FILES("GL/glx.h" OPENGLX_FOUND)
</span><del>- add_definitions(-DWTF_USE_GLX=1)
</del><ins>+ add_definitions(-DUSE_GLX=1)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBGL AND OPENGLX_FOUND)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -194,7 +194,7 @@
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(XP_UNIX ${WTF_OS_UNIX})
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(WTF_PLATFORM_WAYLAND ${ENABLE_WAYLAND_TARGET})
</span><span class="cx">
</span><del>-set(WTF_USE_UDIS86 ON)
</del><ins>+set(USE_UDIS86 ON)
</ins><span class="cx"> set(ENABLE_WEBKIT OFF)
</span><span class="cx"> set(ENABLE_WEBKIT2 ON)
</span><span class="cx"> set(ENABLE_PLUGIN_PROCESS ON)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx"> if (ENABLE_GEOLOCATION)
</span><span class="cx"> find_package(GeoClue2 2.1.5)
</span><span class="cx"> if (GEOCLUE2_FOUND)
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GEOCLUE2 ${GEOCLUE2_FOUND})
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_GEOCLUE2 ${GEOCLUE2_FOUND})
</ins><span class="cx"> else ()
</span><span class="cx"> find_package(GeoClue)
</span><span class="cx"> if (NOT GEOCLUE_FOUND)
</span><span class="lines">@@ -276,15 +276,15 @@
</span><span class="cx"> if (NOT OPENWEBRTC_FOUND)
</span><span class="cx"> message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM.")
</span><span class="cx"> endif ()
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENWEBRTC TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_OPENGL)
</span><del>- # ENABLE_OPENGL is true if either WTF_USE_OPENGL or ENABLE_GLES2 is true.
- # But WTF_USE_OPENGL is the opposite of ENABLE_GLES2.
</del><ins>+ # ENABLE_OPENGL is true if either USE_OPENGL or ENABLE_GLES2 is true.
+ # But USE_OPENGL is the opposite of ENABLE_GLES2.
</ins><span class="cx"> if (ENABLE_GLES2)
</span><span class="cx"> find_package(OpenGLES2 REQUIRED)
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENGL_ES_2 TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_OPENGL_ES_2 TRUE)
</ins><span class="cx">
</span><span class="cx"> if (NOT EGL_FOUND)
</span><span class="cx"> message(FATAL_ERROR "EGL is needed for ENABLE_GLES2.")
</span><span class="lines">@@ -293,7 +293,7 @@
</span><span class="cx"> if (NOT OPENGL_FOUND)
</span><span class="cx"> message(FATAL_ERROR "Either OpenGL or OpenGLES2 is needed for ENABLE_OPENGL.")
</span><span class="cx"> endif ()
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_OPENGL TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_OPENGL TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (NOT EGL_FOUND AND (NOT ENABLE_X11_TARGET OR NOT GLX_FOUND))
</span><span class="lines">@@ -302,17 +302,17 @@
</span><span class="cx">
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(ENABLE_GRAPHICS_CONTEXT_3D TRUE)
</span><span class="cx">
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER TRUE)
- SET_AND_EXPOSE_TO_BUILD(WTF_USE_TEXTURE_MAPPER_GL TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER TRUE)
+ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL TRUE)
</ins><span class="cx">
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_EGL ${EGL_FOUND})
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_EGL ${EGL_FOUND})
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_X11_TARGET AND GLX_FOUND)
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GLX TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_GLX TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><del>- 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})
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR})
+ SET_AND_EXPOSE_TO_BUILD(USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_PLUGIN_PROCESS_GTK2)
</span><span class="lines">@@ -336,14 +336,14 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span><span class="cx"> set(GSTREAMER_COMPONENTS app pbutils)
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_GSTREAMER TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_GSTREAMER TRUE)
</ins><span class="cx"> if (ENABLE_VIDEO)
</span><span class="cx"> list(APPEND GSTREAMER_COMPONENTS video mpegts tag gl)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEB_AUDIO)
</span><span class="cx"> list(APPEND GSTREAMER_COMPONENTS audio fft)
</span><del>- SET_AND_EXPOSE_TO_BUILD(WTF_USE_WEBAUDIO_GSTREAMER TRUE)
</del><ins>+ SET_AND_EXPOSE_TO_BUILD(USE_WEBAUDIO_GSTREAMER TRUE)
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> find_package(GStreamer 1.0.3 REQUIRED COMPONENTS ${GSTREAMER_COMPONENTS})
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -224,4 +224,4 @@
</span><span class="cx">
</span><span class="cx"> set(ENABLE_WEBKIT ON)
</span><span class="cx"> set(ENABLE_WEBKIT2 ON)
</span><del>-set(WTF_USE_UDIS86 1)
</del><ins>+set(USE_UDIS86 1)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsWinCairocmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsWinCairo.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> include(OptionsWindows)
</span><span class="cx">
</span><span class="cx"> set(WTF_PLATFORM_WIN_CAIRO 1)
</span><del>-set(WTF_USE_CF 1)
-set(WTF_USE_CURL 1)
-set(WTF_USE_ICU_UNICODE 1)
</del><ins>+set(USE_CF 1)
+set(USE_CURL 1)
+set(USE_ICU_UNICODE 1)
</ins><span class="cx">
</span><span class="cx"> set(ENABLE_GRAPHICS_CONTEXT_3D 1)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -305,14 +305,6 @@
</span><span class="cx">
</span><span class="cx"> foreach (_variable_name ${_WEBKIT_CONFIG_FILE_VARIABLES})
</span><span class="cx"> _ADD_CONFIGURATION_LINE_TO_HEADER_STRING(_file_contents ${_variable_name} ${_variable_name})
</span><del>-
- # 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 ()
</del><span class="cx"> endforeach ()
</span><span class="cx"> set(_file_contents "${_file_contents}\n#endif /* CMAKECONFIG_H */\n")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-01 23:25:41 UTC (rev 183696)
+++ trunk/Tools/ChangeLog 2015-05-01 23:38:18 UTC (rev 183697)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-01 Martin Robinson <mrobinson@igalia.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-01 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Add myself as a commiter in contributors.json.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1133,7 +1133,7 @@
</span><span class="cx"> buildSettings = {
</span><span class="cx"> INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/Frameworks/$(WEBKIT_FRAMEWORK_RESOURCES_PATH)";
</span><span class="cx"> PRODUCT_NAME = All;
</span><del>- WTF_USE_EXPORT_MACROS = 0;
</del><ins>+ USE_EXPORT_MACROS = 0;
</ins><span class="cx"> };
</span><span class="cx"> name = Production;
</span><span class="cx"> };
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx"> "-Wno-four-char-constants",
</span><span class="cx"> "-Wno-unknown-pragmas",
</span><span class="cx"> );
</span><del>- WTF_USE_EXPORT_MACROS = 0;
</del><ins>+ USE_EXPORT_MACROS = 0;
</ins><span class="cx"> };
</span><span class="cx"> name = Debug;
</span><span class="cx"> };
</span><span class="lines">@@ -1242,7 +1242,7 @@
</span><span class="cx"> "-Wno-four-char-constants",
</span><span class="cx"> "-Wno-unknown-pragmas",
</span><span class="cx"> );
</span><del>- WTF_USE_EXPORT_MACROS = 0;
</del><ins>+ USE_EXPORT_MACROS = 0;
</ins><span class="cx"> };
</span><span class="cx"> name = Release;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/config.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,17 +34,17 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-#define WTF_USE_CF 1
</del><ins>+#define USE_CF 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>-#define WTF_USE_CF 1
</del><ins>+#define USE_CF 1
</ins><span class="cx"> #if PLATFORM(WIN_CAIRO)
</span><del>-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
</del><ins>+#define USE_CAIRO 1
+#define USE_CURL 1
</ins><span class="cx"> #else
</span><del>-#define WTF_USE_CG 1
-#define WTF_USE_CFNETWORK 1
</del><ins>+#define USE_CG 1
+#define USE_CFNETWORK 1
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #undef _WIN32_WINNT
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIconfigh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/config.h (183696 => 183697)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -47,16 +47,16 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WIN_CAIRO)
</span><del>-#undef WTF_USE_CG
-#define WTF_USE_CAIRO 1
-#define WTF_USE_CURL 1
</del><ins>+#undef USE_CG
+#define USE_CAIRO 1
+#define USE_CURL 1
</ins><span class="cx"> #ifndef _WINSOCKAPI_
</span><span class="cx"> #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
</span><span class="cx"> #endif
</span><span class="cx"> #else
</span><del>-#define WTF_USE_CG 1
-#undef WTF_USE_CAIRO
-#undef WTF_USE_CURL
</del><ins>+#define USE_CG 1
+#undef USE_CAIRO
+#undef USE_CURL
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(WIN)
</span></span></pre>
</div>
</div>
</body>
</html>