<!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>[163288] trunk/Source/WTF</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/163288">163288</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 23:31:40 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using PLATFORM(MAC) in WTF except where it means “OS X but not iOS”
https://bugs.webkit.org/show_bug.cgi?id=128089
Reviewed by Darin Adler.
Replaced all uses of PLATFORM(MAC) that weren’t accompanied by !PLATFORM(IOS) with
equivalent(*) tests that are more idiomatic and will not change once PLATFORM(MAC) changes to
be false when building for iOS.
* - One exception noted below.
* wtf/AutodrainedPool.h: Changed PLATFORM(MAC) to USE(FOUNDATION), because NSAutoreleasePool
is a Foundation class.
* wtf/CurrentTime.cpp:
(WTF::monotonicallyIncreasingTime): Changed PLATFORM(MAC) to OS(DARWIN), because Mach is
part of the Darwin kernel, but reordered such that the EFL and GLIB implementations continue
to take precedence regardless of the OS.
* wtf/MainThread.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
* wtf/MainThread.h: Ditto.
* wtf/Platform.h: Changed USE(CG) and USE(CA) to depend on COCOA, rather than MAC or IOS.
Ditto for USE(CFURLCACHE), HAVE(ACCESSIBILITY), USE(PROTECTION_SPACE_AUTH_CALLBACK),
USE(ACCESSIBILITY_CONTEXT_MENUS), USE(EXPORT_MACROS), USE(AVFOUNDATION),
USE(REQUEST_ANIMATION_FRAME_TIMER), USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR),
USE(CONTENT_FILTERING), USE(UNIFIED_TEXT_CHECKING), USE(MARKER_REMOVAL_UPON_EDITING),
USE(AUDIO_SESSION), USE(IOSURFACE), and ENABLE(CSS3_TEXT_DECORATION_SKIP_INK). Changed
PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) in controlling various
JavaScriptCore or JavaScriptCore-dependent behaviors.
* wtf/RunLoop.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
* wtf/RunLoopTimerCF.cpp: Ditto.
* wtf/SchedulePair.h: Changed PLATFORM(MAC) to USE(FOUNDATION), since it was used to guard
usage of Foundation API.
* wtf/Threading.cpp: Added an explicit !PLATFORM(IOS) in a guard around something needed
only on OS X and Windows.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfAutodrainedPoolh">trunk/Source/WTF/wtf/AutodrainedPool.h</a></li>
<li><a href="#trunkSourceWTFwtfCurrentTimecpp">trunk/Source/WTF/wtf/CurrentTime.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadcpp">trunk/Source/WTF/wtf/MainThread.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadh">trunk/Source/WTF/wtf/MainThread.h</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfRunLooph">trunk/Source/WTF/wtf/RunLoop.h</a></li>
<li><a href="#trunkSourceWTFwtfRunLoopTimerCFcpp">trunk/Source/WTF/wtf/RunLoopTimerCF.cpp</a></li>
<li><a href="#trunkSourceWTFwtfSchedulePairh">trunk/Source/WTF/wtf/SchedulePair.h</a></li>
<li><a href="#trunkSourceWTFwtfThreadingcpp">trunk/Source/WTF/wtf/Threading.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/ChangeLog 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2014-02-02 Dan Bernstein <mitz@apple.com>
+
+ Stop using PLATFORM(MAC) in WTF except where it means “OS X but not iOS”
+ https://bugs.webkit.org/show_bug.cgi?id=128089
+
+ Reviewed by Darin Adler.
+
+ Replaced all uses of PLATFORM(MAC) that weren’t accompanied by !PLATFORM(IOS) with
+ equivalent(*) tests that are more idiomatic and will not change once PLATFORM(MAC) changes to
+ be false when building for iOS.
+
+ * - One exception noted below.
+
+ * wtf/AutodrainedPool.h: Changed PLATFORM(MAC) to USE(FOUNDATION), because NSAutoreleasePool
+ is a Foundation class.
+
+ * wtf/CurrentTime.cpp:
+ (WTF::monotonicallyIncreasingTime): Changed PLATFORM(MAC) to OS(DARWIN), because Mach is
+ part of the Darwin kernel, but reordered such that the EFL and GLIB implementations continue
+ to take precedence regardless of the OS.
+
+ * wtf/MainThread.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
+ * wtf/MainThread.h: Ditto.
+
+ * wtf/Platform.h: Changed USE(CG) and USE(CA) to depend on COCOA, rather than MAC or IOS.
+ Ditto for USE(CFURLCACHE), HAVE(ACCESSIBILITY), USE(PROTECTION_SPACE_AUTH_CALLBACK),
+ USE(ACCESSIBILITY_CONTEXT_MENUS), USE(EXPORT_MACROS), USE(AVFOUNDATION),
+ USE(REQUEST_ANIMATION_FRAME_TIMER), USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR),
+ USE(CONTENT_FILTERING), USE(UNIFIED_TEXT_CHECKING), USE(MARKER_REMOVAL_UPON_EDITING),
+ USE(AUDIO_SESSION), USE(IOSURFACE), and ENABLE(CSS3_TEXT_DECORATION_SKIP_INK). Changed
+ PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) in controlling various
+ JavaScriptCore or JavaScriptCore-dependent behaviors.
+
+ * wtf/RunLoop.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
+ * wtf/RunLoopTimerCF.cpp: Ditto.
+
+ * wtf/SchedulePair.h: Changed PLATFORM(MAC) to USE(FOUNDATION), since it was used to guard
+ usage of Foundation API.
+
+ * wtf/Threading.cpp: Added an explicit !PLATFORM(IOS) in a guard around something needed
+ only on OS X and Windows.
+
</ins><span class="cx"> 2014-01-31 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove LEGACY_VIEWPORT_ADAPTION
</span></span></pre></div>
<a id="trunkSourceWTFwtfAutodrainedPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/AutodrainedPool.h (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/AutodrainedPool.h 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/AutodrainedPool.h 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !defined(__OBJC__)
</del><ins>+#if USE(FOUNDATION) && !defined(__OBJC__)
</ins><span class="cx"> typedef struct objc_object *id;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> class AutodrainedPool {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(AutodrainedPool);
</span><span class="cx"> public:
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> WTF_EXPORT_PRIVATE AutodrainedPool();
</span><span class="cx"> WTF_EXPORT_PRIVATE ~AutodrainedPool();
</span><span class="cx"> #else
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> id m_pool;
</span><span class="cx"> #endif
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWTFwtfCurrentTimecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CurrentTime.cpp 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/CurrentTime.cpp 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -249,31 +249,31 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(EFL)
</ins><span class="cx">
</span><span class="cx"> double monotonicallyIncreasingTime()
</span><span class="cx"> {
</span><del>- // Based on listing #2 from Apple QA 1398.
- static mach_timebase_info_data_t timebaseInfo;
- if (!timebaseInfo.denom) {
- kern_return_t kr = mach_timebase_info(&timebaseInfo);
- ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
- }
- return (mach_absolute_time() * timebaseInfo.numer) / (1.0e9 * timebaseInfo.denom);
</del><ins>+ return ecore_time_get();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#elif PLATFORM(EFL)
</del><ins>+#elif USE(GLIB)
</ins><span class="cx">
</span><span class="cx"> double monotonicallyIncreasingTime()
</span><span class="cx"> {
</span><del>- return ecore_time_get();
</del><ins>+ return static_cast<double>(g_get_monotonic_time() / 1000000.0);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#elif USE(GLIB) && !PLATFORM(EFL)
</del><ins>+#elif OS(DARWIN)
</ins><span class="cx">
</span><span class="cx"> double monotonicallyIncreasingTime()
</span><span class="cx"> {
</span><del>- return static_cast<double>(g_get_monotonic_time() / 1000000.0);
</del><ins>+ // Based on listing #2 from Apple QA 1398.
+ static mach_timebase_info_data_t timebaseInfo;
+ if (!timebaseInfo.denom) {
+ kern_return_t kr = mach_timebase_info(&timebaseInfo);
+ ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
+ }
+ return (mach_absolute_time() * timebaseInfo.numer) / (1.0e9 * timebaseInfo.denom);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.cpp (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.cpp 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> typedef Deque<FunctionWithContext> FunctionQueue;
</span><span class="cx">
</span><span class="cx"> static bool callbacksPaused; // This global variable is only accessed from main thread.
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx"> static ThreadIdentifier mainThreadIdentifier;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx">
</span><span class="cx"> void initializeMainThread()
</span><span class="cx"> {
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> scheduleDispatchFunctionsOnMainThread();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(MAC)
</del><ins>+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
</ins><span class="cx"> bool isMainThread()
</span><span class="cx"> {
</span><span class="cx"> return currentThread() == mainThreadIdentifier;
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx">
</span><span class="cx"> return isMainThread();
</span><span class="cx"> }
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> // This is necessary because JavaScriptCore.exp doesn't support preprocessor macros.
</span><span class="cx"> bool isMainThreadOrGCThread()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.h (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.h 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/MainThread.h 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> #if ENABLE(PARALLEL_GC)
</span><span class="cx"> void registerGCThread();
</span><span class="cx"> WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
</span><del>-#elif PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#elif OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
</span><span class="cx"> #else
</span><span class="cx"> inline bool isMainThreadOrGCThread() { return isMainThread(); }
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> void scheduleDispatchFunctionsOnMainThread();
</span><span class="cx"> void dispatchFunctionsFromMainThread();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> #if !USE(WEB_THREAD)
</span><span class="cx"> // This version of initializeMainThread sets up the main thread as corresponding
</span><span class="cx"> // to the process's main thread, and not necessarily the thread that calls this
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/Platform.h 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -448,10 +448,10 @@
</span><span class="cx"> /* Graphics engines */
</span><span class="cx">
</span><span class="cx"> /* USE(CG) and PLATFORM(CI) */
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
</del><ins>+#if PLATFORM(COCOA) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
</ins><span class="cx"> #define WTF_USE_CG 1
</span><span class="cx"> #endif
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
</del><ins>+#if PLATFORM(COCOA) || (PLATFORM(WIN) && USE(CG))
</ins><span class="cx"> #define WTF_USE_CA 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -477,7 +477,7 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -528,12 +528,12 @@
</span><span class="cx"> #define WTF_USE_CFNETWORK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(CFNETWORK) || PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if USE(CFNETWORK) || PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_CFURLCACHE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !defined(HAVE_ACCESSIBILITY)
</span><del>-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
</ins><span class="cx"> #define HAVE_ACCESSIBILITY 1
</span><span class="cx"> #endif
</span><span class="cx"> #endif /* !defined(HAVE_ACCESSIBILITY) */
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Do we have LLVM? */
</span><del>-#if !defined(HAVE_LLVM) && PLATFORM(MAC) && ENABLE(FTL_JIT) && CPU(X86_64)
</del><ins>+#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && CPU(X86_64)
</ins><span class="cx"> #define HAVE_LLVM 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -687,7 +687,7 @@
</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) && (PLATFORM(MAC) || (PLATFORM(EFL) && OS(LINUX))) \
</del><ins>+#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (PLATFORM(EFL) && OS(LINUX))) \
</ins><span class="cx"> && (CPU(X86) || CPU(X86_64))
</span><span class="cx"> #define WTF_USE_UDIS86 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> #if !defined(ENABLE_LLINT) \
</span><span class="cx"> && ENABLE(JIT) \
</span><span class="cx"> && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
</span><del>- && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
</del><ins>+ && ((OS(DARWIN) && !PLATFORM(EFL)) || PLATFORM(GTK)) \
</ins><span class="cx"> && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
</span><span class="cx"> #define ENABLE_LLINT 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -733,7 +733,7 @@
</span><span class="cx"> values get stored to atomically. This is trivially true on 64-bit platforms,
</span><span class="cx"> but not true at all on 32-bit platforms where values are composed of two
</span><span class="cx"> separate sub-values. */
</span><del>-#if PLATFORM(MAC) && ENABLE(DFG_JIT) && USE(JSVALUE64)
</del><ins>+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(DFG_JIT) && USE(JSVALUE64)
</ins><span class="cx"> #define ENABLE_CONCURRENT_JIT 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -847,7 +847,7 @@
</span><span class="cx">
</span><span class="cx"> /* CSS Selector JIT Compiler */
</span><span class="cx"> #if !defined(ENABLE_CSS_SELECTOR_JIT)
</span><del>-#if CPU(X86_64) && ENABLE(JIT) && PLATFORM(MAC)
</del><ins>+#if CPU(X86_64) && ENABLE(JIT) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
</ins><span class="cx"> #define ENABLE_CSS_SELECTOR_JIT 1
</span><span class="cx"> #else
</span><span class="cx"> #define ENABLE_CSS_SELECTOR_JIT 0
</span><span class="lines">@@ -879,7 +879,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> /* Compositing on the UI-process in WebKit2 */
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -890,7 +890,7 @@
</span><span class="cx"> #define WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && HAVE(ACCESSIBILITY)
</del><ins>+#if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
</ins><span class="cx"> #define WTF_USE_ACCESSIBILITY_CONTEXT_MENUS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -914,7 +914,7 @@
</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(MAC) || PLATFORM(WIN))
</del><ins>+#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
</ins><span class="cx"> #define WTF_USE_EXPORT_MACROS 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx">
</span><span class="cx"> #define ENABLE_OBJECT_MARK_LOGGING 0
</span><span class="cx">
</span><del>-#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
</del><ins>+#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (OS(DARWIN) && !PLATFORM(EFL) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
</ins><span class="cx"> #define ENABLE_PARALLEL_GC 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -948,7 +948,7 @@
</span><span class="cx"> #define ENABLE_BINDING_INTEGRITY 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_AVFOUNDATION 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -974,11 +974,11 @@
</span><span class="cx"> #define WTF_USE_VIDEOTOOLBOX 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
</ins><span class="cx"> #define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -990,14 +990,14 @@
</span><span class="cx"> #define WTF_USE_ZLIB 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_CONTENT_FILTERING 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> #define WTF_USE_GRAMMAR_CHECKING 1
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(EFL)
</ins><span class="cx"> #define WTF_USE_UNIFIED_TEXT_CHECKING 1
</span><span class="cx"> #endif
</span><span class="cx"> #if !PLATFORM(IOS) && PLATFORM(MAC)
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx"> #define WTF_USE_AUTOCORRECTION_PANEL 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><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><span class="cx"> #define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
</span><span class="cx"> #endif
</span><span class="lines">@@ -1018,11 +1018,11 @@
</span><span class="cx"> #define WTF_USE_PLATFORM_TEXT_TRACK_MENU 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(IOS)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define WTF_USE_AUDIO_SESSION 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !PLATFORM(IOS_SIMULATOR)
</del><ins>+#if PLATFORM(COCOA) && !PLATFORM(IOS_SIMULATOR)
</ins><span class="cx"> #define WTF_USE_IOSURFACE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1031,7 +1031,7 @@
</span><span class="cx"> #define ENABLE_OPENTYPE_VERTICAL 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> #define ENABLE_CSS3_TEXT_DECORATION_SKIP_INK 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLooph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoop.h (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoop.h 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/RunLoop.h 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE void stop();
</span><span class="cx"> WTF_EXPORT_PRIVATE void wakeUp();
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> WTF_EXPORT_PRIVATE void runForDuration(double duration);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> static void timerFired(RunLoop*, uint64_t ID);
</span><span class="cx"> uint64_t m_ID;
</span><span class="cx"> bool m_isRepeating;
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> static void timerFired(CFRunLoopTimerRef, void*);
</span><span class="cx"> RetainPtr<CFRunLoopTimerRef> m_timer;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> typedef HashMap<uint64_t, TimerBase*> TimerMap;
</span><span class="cx"> TimerMap m_activeTimers;
</span><del>-#elif PLATFORM(MAC)
</del><ins>+#elif PLATFORM(COCOA)
</ins><span class="cx"> static void performWork(void*);
</span><span class="cx"> RetainPtr<CFRunLoopRef> m_runLoop;
</span><span class="cx"> RetainPtr<CFRunLoopSourceRef> m_runLoopSource;
</span></span></pre></div>
<a id="trunkSourceWTFwtfRunLoopTimerCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/RunLoopTimerCF.cpp (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/RunLoopTimerCF.cpp 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/RunLoopTimerCF.cpp 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
</del><ins>+#if PLATFORM(COCOA) && HAVE(RUNLOOP_TIMER)
</ins><span class="cx">
</span><span class="cx"> #include "RunLoopTimer.h"
</span><span class="cx">
</span><span class="lines">@@ -89,4 +89,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
</del><ins>+#endif // PLATFORM(COCOA) && HAVE(RUNLOOP_TIMER)
</ins></span></pre></div>
<a id="trunkSourceWTFwtfSchedulePairh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/SchedulePair.h (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/SchedulePair.h 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/SchedulePair.h 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if PLATFORM(MAC)
</del><ins>+#if USE(FOUNDATION)
</ins><span class="cx"> OBJC_CLASS NSRunLoop;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !USE(CFNETWORK)
</del><ins>+#if USE(FOUNDATION) && !USE(CFNETWORK)
</ins><span class="cx"> static PassRefPtr<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
</span><span class="cx"> NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
</span><span class="cx"> #endif
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> m_mode = adoptCF(CFStringCreateCopy(0, mode));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && !USE(CFNETWORK)
</del><ins>+#if USE(FOUNDATION) && !USE(CFNETWORK)
</ins><span class="cx"> WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef);
</span><span class="cx"> RetainPtr<NSRunLoop*> m_nsRunLoop;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfThreadingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Threading.cpp (163287 => 163288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Threading.cpp 2014-02-03 06:19:25 UTC (rev 163287)
+++ trunk/Source/WTF/wtf/Threading.cpp 2014-02-03 07:31:40 UTC (rev 163288)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> return createThreadInternal(threadEntryPoint, context, name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) || PLATFORM(WIN)
</del><ins>+#if PLATFORM(MAC) && !PLATFORM(IOS) || PLATFORM(WIN)
</ins><span class="cx">
</span><span class="cx"> // For ABI compatibility with Safari on Mac / Windows: Safari uses the private
</span><span class="cx"> // createThread() and waitForThreadCompletion() functions directly and we need
</span></span></pre>
</div>
</div>
</body>
</html>