- Revision
- 163288
- Author
- m...@apple.com
- Date
- 2014-02-02 23:31:40 -0800 (Sun, 02 Feb 2014)
Log Message
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
_javascript_Core or _javascript_Core-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.
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (163287 => 163288)
--- 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)
@@ -1,3 +1,45 @@
+2014-02-02 Dan Bernstein <m...@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
+ _javascript_Core or _javascript_Core-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.
+
2014-01-31 Benjamin Poulain <bpoul...@apple.com>
Remove LEGACY_VIEWPORT_ADAPTION
Modified: trunk/Source/WTF/wtf/AutodrainedPool.h (163287 => 163288)
--- 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)
@@ -31,7 +31,7 @@
#include <wtf/Noncopyable.h>
-#if PLATFORM(MAC) && !defined(__OBJC__)
+#if USE(FOUNDATION) && !defined(__OBJC__)
typedef struct objc_object *id;
#endif
@@ -40,7 +40,7 @@
class AutodrainedPool {
WTF_MAKE_NONCOPYABLE(AutodrainedPool);
public:
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
WTF_EXPORT_PRIVATE AutodrainedPool();
WTF_EXPORT_PRIVATE ~AutodrainedPool();
#else
@@ -49,7 +49,7 @@
#endif
private:
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
id m_pool;
#endif
};
Modified: trunk/Source/WTF/wtf/CurrentTime.cpp (163287 => 163288)
--- 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)
@@ -249,31 +249,31 @@
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(EFL)
double monotonicallyIncreasingTime()
{
- // 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);
+ return ecore_time_get();
}
-#elif PLATFORM(EFL)
+#elif USE(GLIB)
double monotonicallyIncreasingTime()
{
- return ecore_time_get();
+ return static_cast<double>(g_get_monotonic_time() / 1000000.0);
}
-#elif USE(GLIB) && !PLATFORM(EFL)
+#elif OS(DARWIN)
double monotonicallyIncreasingTime()
{
- return static_cast<double>(g_get_monotonic_time() / 1000000.0);
+ // 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);
}
#else
Modified: trunk/Source/WTF/wtf/MainThread.cpp (163287 => 163288)
--- 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)
@@ -65,7 +65,7 @@
typedef Deque<FunctionWithContext> FunctionQueue;
static bool callbacksPaused; // This global variable is only accessed from main thread.
-#if !PLATFORM(MAC)
+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
static ThreadIdentifier mainThreadIdentifier;
#endif
@@ -83,7 +83,7 @@
}
-#if !PLATFORM(MAC)
+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
void initializeMainThread()
{
@@ -230,7 +230,7 @@
scheduleDispatchFunctionsOnMainThread();
}
-#if !PLATFORM(MAC)
+#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
bool isMainThread()
{
return currentThread() == mainThreadIdentifier;
@@ -274,7 +274,7 @@
return isMainThread();
}
-#elif PLATFORM(MAC)
+#elif OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
// This is necessary because _javascript_Core.exp doesn't support preprocessor macros.
bool isMainThreadOrGCThread()
{
Modified: trunk/Source/WTF/wtf/MainThread.h (163287 => 163288)
--- 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)
@@ -69,7 +69,7 @@
#if ENABLE(PARALLEL_GC)
void registerGCThread();
WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
-#elif PLATFORM(MAC) || PLATFORM(IOS)
+#elif OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
#else
inline bool isMainThreadOrGCThread() { return isMainThread(); }
@@ -80,7 +80,7 @@
void scheduleDispatchFunctionsOnMainThread();
void dispatchFunctionsFromMainThread();
-#if PLATFORM(MAC)
+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
#if !USE(WEB_THREAD)
// This version of initializeMainThread sets up the main thread as corresponding
// to the process's main thread, and not necessarily the thread that calls this
Modified: trunk/Source/WTF/wtf/Platform.h (163287 => 163288)
--- 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)
@@ -448,10 +448,10 @@
/* Graphics engines */
/* USE(CG) and PLATFORM(CI) */
-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
+#if PLATFORM(COCOA) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
#define WTF_USE_CG 1
#endif
-#if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
+#if PLATFORM(COCOA) || (PLATFORM(WIN) && USE(CG))
#define WTF_USE_CA 1
#endif
@@ -477,7 +477,7 @@
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if PLATFORM(COCOA)
#define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
#endif
@@ -528,12 +528,12 @@
#define WTF_USE_CFNETWORK 1
#endif
-#if USE(CFNETWORK) || PLATFORM(MAC) || PLATFORM(IOS)
+#if USE(CFNETWORK) || PLATFORM(COCOA)
#define WTF_USE_CFURLCACHE 1
#endif
#if !defined(HAVE_ACCESSIBILITY)
-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
#define HAVE_ACCESSIBILITY 1
#endif
#endif /* !defined(HAVE_ACCESSIBILITY) */
@@ -670,7 +670,7 @@
#endif
/* Do we have LLVM? */
-#if !defined(HAVE_LLVM) && PLATFORM(MAC) && ENABLE(FTL_JIT) && CPU(X86_64)
+#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && CPU(X86_64)
#define HAVE_LLVM 1
#endif
@@ -687,7 +687,7 @@
/* If possible, try to enable a disassembler. This is optional. We proceed in two
steps: first we try to find some disassembler that we can use, and then we
decide if the high-level disassembler API can be enabled. */
-#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && (PLATFORM(MAC) || (PLATFORM(EFL) && OS(LINUX))) \
+#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (PLATFORM(EFL) && OS(LINUX))) \
&& (CPU(X86) || CPU(X86_64))
#define WTF_USE_UDIS86 1
#endif
@@ -709,7 +709,7 @@
#if !defined(ENABLE_LLINT) \
&& ENABLE(JIT) \
&& (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
- && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
+ && ((OS(DARWIN) && !PLATFORM(EFL)) || PLATFORM(GTK)) \
&& (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
#define ENABLE_LLINT 1
#endif
@@ -733,7 +733,7 @@
values get stored to atomically. This is trivially true on 64-bit platforms,
but not true at all on 32-bit platforms where values are composed of two
separate sub-values. */
-#if PLATFORM(MAC) && ENABLE(DFG_JIT) && USE(JSVALUE64)
+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(DFG_JIT) && USE(JSVALUE64)
#define ENABLE_CONCURRENT_JIT 1
#endif
@@ -847,7 +847,7 @@
/* CSS Selector JIT Compiler */
#if !defined(ENABLE_CSS_SELECTOR_JIT)
-#if CPU(X86_64) && ENABLE(JIT) && PLATFORM(MAC)
+#if CPU(X86_64) && ENABLE(JIT) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
#define ENABLE_CSS_SELECTOR_JIT 1
#else
#define ENABLE_CSS_SELECTOR_JIT 0
@@ -879,7 +879,7 @@
#endif
/* Compositing on the UI-process in WebKit2 */
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
#define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
#endif
@@ -890,7 +890,7 @@
#define WTF_USE_CROSS_PLATFORM_CONTEXT_MENUS 1
#endif
-#if PLATFORM(MAC) && HAVE(ACCESSIBILITY)
+#if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
#define WTF_USE_ACCESSIBILITY_CONTEXT_MENUS 1
#endif
@@ -914,7 +914,7 @@
since most ports try to support sub-project independence, adding new headers
to WTF causes many ports to break, and so this way we can address the build
breakages one port at a time. */
-#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(MAC) || PLATFORM(WIN))
+#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
#define WTF_USE_EXPORT_MACROS 1
#endif
@@ -936,7 +936,7 @@
#define ENABLE_OBJECT_MARK_LOGGING 0
-#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
+#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (OS(DARWIN) && !PLATFORM(EFL) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
#define ENABLE_PARALLEL_GC 1
#endif
@@ -948,7 +948,7 @@
#define ENABLE_BINDING_INTEGRITY 1
#endif
-#if PLATFORM(IOS) || PLATFORM(MAC)
+#if PLATFORM(COCOA)
#define WTF_USE_AVFOUNDATION 1
#endif
@@ -974,11 +974,11 @@
#define WTF_USE_VIDEOTOOLBOX 1
#endif
-#if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
+#if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
#define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
#endif
@@ -990,14 +990,14 @@
#define WTF_USE_ZLIB 1
#endif
-#if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
+#if PLATFORM(COCOA)
#define WTF_USE_CONTENT_FILTERING 1
#endif
#define WTF_USE_GRAMMAR_CHECKING 1
-#if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(EFL)
+#if PLATFORM(COCOA) || PLATFORM(EFL)
#define WTF_USE_UNIFIED_TEXT_CHECKING 1
#endif
#if !PLATFORM(IOS) && PLATFORM(MAC)
@@ -1009,7 +1009,7 @@
#define WTF_USE_AUTOCORRECTION_PANEL 1
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
/* Some platforms use spelling and autocorrection markers to provide visual cue. On such platform, if word with marker is edited, we need to remove the marker. */
#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
#endif
@@ -1018,11 +1018,11 @@
#define WTF_USE_PLATFORM_TEXT_TRACK_MENU 1
#endif
-#if PLATFORM(MAC) || PLATFORM(IOS)
+#if PLATFORM(COCOA)
#define WTF_USE_AUDIO_SESSION 1
#endif
-#if PLATFORM(MAC) && !PLATFORM(IOS_SIMULATOR)
+#if PLATFORM(COCOA) && !PLATFORM(IOS_SIMULATOR)
#define WTF_USE_IOSURFACE 1
#endif
@@ -1031,7 +1031,7 @@
#define ENABLE_OPENTYPE_VERTICAL 1
#endif
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
#define ENABLE_CSS3_TEXT_DECORATION_SKIP_INK 1
#endif
Modified: trunk/Source/WTF/wtf/RunLoop.h (163287 => 163288)
--- 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)
@@ -63,7 +63,7 @@
WTF_EXPORT_PRIVATE void stop();
WTF_EXPORT_PRIVATE void wakeUp();
-#if PLATFORM(MAC)
+#if PLATFORM(COCOA)
WTF_EXPORT_PRIVATE void runForDuration(double duration);
#endif
@@ -90,7 +90,7 @@
static void timerFired(RunLoop*, uint64_t ID);
uint64_t m_ID;
bool m_isRepeating;
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
static void timerFired(CFRunLoopTimerRef, void*);
RetainPtr<CFRunLoopTimerRef> m_timer;
#elif PLATFORM(EFL)
@@ -143,7 +143,7 @@
typedef HashMap<uint64_t, TimerBase*> TimerMap;
TimerMap m_activeTimers;
-#elif PLATFORM(MAC)
+#elif PLATFORM(COCOA)
static void performWork(void*);
RetainPtr<CFRunLoopRef> m_runLoop;
RetainPtr<CFRunLoopSourceRef> m_runLoopSource;
Modified: trunk/Source/WTF/wtf/RunLoopTimerCF.cpp (163287 => 163288)
--- 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)
@@ -28,7 +28,7 @@
#include "config.h"
-#if PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
+#if PLATFORM(COCOA) && HAVE(RUNLOOP_TIMER)
#include "RunLoopTimer.h"
@@ -89,4 +89,4 @@
} // namespace WTF
-#endif // PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
+#endif // PLATFORM(COCOA) && HAVE(RUNLOOP_TIMER)
Modified: trunk/Source/WTF/wtf/SchedulePair.h (163287 => 163288)
--- 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)
@@ -35,7 +35,7 @@
#include <wtf/text/StringHash.h>
#include <wtf/text/WTFString.h>
-#if PLATFORM(MAC)
+#if USE(FOUNDATION)
OBJC_CLASS NSRunLoop;
#endif
@@ -45,7 +45,7 @@
public:
static PassRefPtr<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
-#if PLATFORM(MAC) && !USE(CFNETWORK)
+#if USE(FOUNDATION) && !USE(CFNETWORK)
static PassRefPtr<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
#endif
@@ -63,7 +63,7 @@
m_mode = adoptCF(CFStringCreateCopy(0, mode));
}
-#if PLATFORM(MAC) && !USE(CFNETWORK)
+#if USE(FOUNDATION) && !USE(CFNETWORK)
WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef);
RetainPtr<NSRunLoop*> m_nsRunLoop;
#endif
Modified: trunk/Source/WTF/wtf/Threading.cpp (163287 => 163288)
--- 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)
@@ -86,7 +86,7 @@
return createThreadInternal(threadEntryPoint, context, name);
}
-#if PLATFORM(MAC) || PLATFORM(WIN)
+#if PLATFORM(MAC) && !PLATFORM(IOS) || PLATFORM(WIN)
// For ABI compatibility with Safari on Mac / Windows: Safari uses the private
// createThread() and waitForThreadCompletion() functions directly and we need
