Changeset 163288 in webkit


Ignore:
Timestamp:
Feb 2, 2014 11:31:40 PM (10 years ago)
Author:
mitz@apple.com
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
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.

Location:
trunk/Source/WTF
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WTF/ChangeLog

    r163238 r163288  
     12014-02-02  Dan Bernstein  <mitz@apple.com>
     2
     3        Stop using PLATFORM(MAC) in WTF except where it means “OS X but not iOS”
     4        https://bugs.webkit.org/show_bug.cgi?id=128089
     5
     6        Reviewed by Darin Adler.
     7
     8        Replaced all uses of PLATFORM(MAC) that weren’t accompanied by !PLATFORM(IOS) with
     9        equivalent(*) tests that are more idiomatic and will not change once PLATFORM(MAC) changes to
     10        be false when building for iOS.
     11
     12        * - One exception noted below.
     13
     14        * wtf/AutodrainedPool.h: Changed PLATFORM(MAC) to USE(FOUNDATION), because NSAutoreleasePool
     15        is a Foundation class.
     16
     17        * wtf/CurrentTime.cpp:
     18        (WTF::monotonicallyIncreasingTime): Changed PLATFORM(MAC) to OS(DARWIN), because Mach is
     19        part of the Darwin kernel, but reordered such that the EFL and GLIB implementations continue
     20        to take precedence regardless of the OS.
     21
     22        * wtf/MainThread.cpp: Changed PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
     23        * wtf/MainThread.h: Ditto.
     24
     25        * wtf/Platform.h: Changed USE(CG) and USE(CA) to depend on COCOA, rather than MAC or IOS.
     26        Ditto for USE(CFURLCACHE), HAVE(ACCESSIBILITY), USE(PROTECTION_SPACE_AUTH_CALLBACK),
     27        USE(ACCESSIBILITY_CONTEXT_MENUS), USE(EXPORT_MACROS), USE(AVFOUNDATION),
     28        USE(REQUEST_ANIMATION_FRAME_TIMER), USE(REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR),
     29        USE(CONTENT_FILTERING), USE(UNIFIED_TEXT_CHECKING), USE(MARKER_REMOVAL_UPON_EDITING),
     30        USE(AUDIO_SESSION), USE(IOSURFACE), and ENABLE(CSS3_TEXT_DECORATION_SKIP_INK). Changed
     31        PLATFORM(MAC) to OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) in controlling various
     32        JavaScriptCore or JavaScriptCore-dependent behaviors.
     33
     34        * wtf/RunLoop.h: Changed PLATFORM(MAC) to PLATFORM(COCOA).
     35        * wtf/RunLoopTimerCF.cpp: Ditto.
     36
     37        * wtf/SchedulePair.h: Changed PLATFORM(MAC) to USE(FOUNDATION), since it was used to guard
     38        usage of Foundation API.
     39
     40        * wtf/Threading.cpp: Added an explicit !PLATFORM(IOS) in a guard around something needed
     41        only on OS X and Windows.
     42
    1432014-01-31  Benjamin Poulain  <bpoulain@apple.com>
    244

  • trunk/Source/WTF/wtf/AutodrainedPool.h

    r155087 r163288  
    3232#include <wtf/Noncopyable.h>
    3333
    34 #if PLATFORM(MAC) && !defined(__OBJC__)
     34#if USE(FOUNDATION) && !defined(__OBJC__)
    3535typedef struct objc_object *id;
    3636#endif
    … …  
    4141    WTF_MAKE_NONCOPYABLE(AutodrainedPool);
    4242public:
    43 #if PLATFORM(MAC)
     43#if USE(FOUNDATION)
    4444    WTF_EXPORT_PRIVATE AutodrainedPool();
    4545    WTF_EXPORT_PRIVATE ~AutodrainedPool();
    … …  
    5050   
    5151private:
    52 #if PLATFORM(MAC)
     52#if USE(FOUNDATION)
    5353    id m_pool;
    5454#endif

  • trunk/Source/WTF/wtf/CurrentTime.cpp

    r161601 r163288  
    250250#endif
    251251
    252 #if PLATFORM(MAC)
     252#if PLATFORM(EFL)
     253
     254double monotonicallyIncreasingTime()
     255{
     256    return ecore_time_get();
     257}
     258
     259#elif USE(GLIB)
     260
     261double monotonicallyIncreasingTime()
     262{
     263    return static_cast<double>(g_get_monotonic_time() / 1000000.0);
     264}
     265
     266#elif OS(DARWIN)
    253267
    254268double monotonicallyIncreasingTime()
    … …  
    263277}
    264278
    265 #elif PLATFORM(EFL)
    266 
    267 double monotonicallyIncreasingTime()
    268 {
    269     return ecore_time_get();
    270 }
    271 
    272 #elif USE(GLIB) && !PLATFORM(EFL)
    273 
    274 double monotonicallyIncreasingTime()
    275 {
    276     return static_cast<double>(g_get_monotonic_time() / 1000000.0);
    277 }
    278 
    279279#else
    280280

  • trunk/Source/WTF/wtf/MainThread.cpp

    r162935 r163288  
    6666
    6767static bool callbacksPaused; // This global variable is only accessed from main thread.
    68 #if !PLATFORM(MAC)
     68#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
    6969static ThreadIdentifier mainThreadIdentifier;
    7070#endif
    … …  
    8484
    8585
    86 #if !PLATFORM(MAC)
     86#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
    8787
    8888void initializeMainThread()
    … …  
    231231}
    232232
    233 #if !PLATFORM(MAC)
     233#if !OS(DARWIN) || PLATFORM(EFL) || PLATFORM(GTK)
    234234bool isMainThread()
    235235{
    … …  
    275275    return isMainThread();
    276276}
    277 #elif PLATFORM(MAC)
     277#elif OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
    278278// This is necessary because JavaScriptCore.exp doesn't support preprocessor macros.
    279279bool isMainThreadOrGCThread()

  • trunk/Source/WTF/wtf/MainThread.h

    r162235 r163288  
    7070void registerGCThread();
    7171WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
    72 #elif PLATFORM(MAC) || PLATFORM(IOS)
     72#elif OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
    7373WTF_EXPORT_PRIVATE bool isMainThreadOrGCThread();
    7474#else
    … …  
    8181void dispatchFunctionsFromMainThread();
    8282
    83 #if PLATFORM(MAC)
     83#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
    8484#if !USE(WEB_THREAD)
    8585// This version of initializeMainThread sets up the main thread as corresponding

  • trunk/Source/WTF/wtf/Platform.h

    r163218 r163288  
    449449
    450450/* USE(CG) and PLATFORM(CI) */
    451 #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
     451#if PLATFORM(COCOA) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
    452452#define WTF_USE_CG 1
    453453#endif
    454 #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
     454#if PLATFORM(COCOA) || (PLATFORM(WIN) && USE(CG))
    455455#define WTF_USE_CA 1
    456456#endif
    … …  
    478478#endif
    479479
    480 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
     480#if PLATFORM(COCOA)
    481481#define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
    482482#endif
    … …  
    529529#endif
    530530
    531 #if USE(CFNETWORK) || PLATFORM(MAC) || PLATFORM(IOS)
     531#if USE(CFNETWORK) || PLATFORM(COCOA)
    532532#define WTF_USE_CFURLCACHE 1
    533533#endif
    534534
    535535#if !defined(HAVE_ACCESSIBILITY)
    536 #if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
     536#if PLATFORM(COCOA) || PLATFORM(WIN) || PLATFORM(GTK) || PLATFORM(EFL)
    537537#define HAVE_ACCESSIBILITY 1
    538538#endif
    … …  
    671671
    672672/* Do we have LLVM? */
    673 #if !defined(HAVE_LLVM) && PLATFORM(MAC) && ENABLE(FTL_JIT) && CPU(X86_64)
     673#if !defined(HAVE_LLVM) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(FTL_JIT) && CPU(X86_64)
    674674#define HAVE_LLVM 1
    675675#endif
    … …  
    688688   steps: first we try to find some disassembler that we can use, and then we
    689689   decide if the high-level disassembler API can be enabled. */
    690 #if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && (PLATFORM(MAC) || (PLATFORM(EFL) && OS(LINUX))) \
     690#if !defined(WTF_USE_UDIS86) && ENABLE(JIT) && ((OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)) || (PLATFORM(EFL) && OS(LINUX))) \
    691691    && (CPU(X86) || CPU(X86_64))
    692692#define WTF_USE_UDIS86 1
    … …  
    710710    && ENABLE(JIT) \
    711711    && (OS(DARWIN) || OS(LINUX) || OS(FREEBSD)) \
    712     && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) \
     712    && ((OS(DARWIN) && !PLATFORM(EFL)) || PLATFORM(GTK)) \
    713713    && (CPU(X86) || CPU(X86_64) || CPU(ARM_THUMB2) || CPU(ARM_TRADITIONAL) || CPU(ARM64) || CPU(MIPS) || CPU(SH4))
    714714#define ENABLE_LLINT 1
    … …  
    734734   but not true at all on 32-bit platforms where values are composed of two
    735735   separate sub-values. */
    736 #if PLATFORM(MAC) && ENABLE(DFG_JIT) && USE(JSVALUE64)
     736#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && ENABLE(DFG_JIT) && USE(JSVALUE64)
    737737#define ENABLE_CONCURRENT_JIT 1
    738738#endif
    … …  
    848848/* CSS Selector JIT Compiler */
    849849#if !defined(ENABLE_CSS_SELECTOR_JIT)
    850 #if CPU(X86_64) && ENABLE(JIT) && PLATFORM(MAC)
     850#if CPU(X86_64) && ENABLE(JIT) && OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK)
    851851#define ENABLE_CSS_SELECTOR_JIT 1
    852852#else
    … …  
    880880
    881881/* Compositing on the UI-process in WebKit2 */
    882 #if PLATFORM(MAC) || PLATFORM(IOS)
     882#if PLATFORM(COCOA)
    883883#define WTF_USE_PROTECTION_SPACE_AUTH_CALLBACK 1
    884884#endif
    … …  
    891891#endif
    892892
    893 #if PLATFORM(MAC) && HAVE(ACCESSIBILITY)
     893#if PLATFORM(COCOA) && HAVE(ACCESSIBILITY)
    894894#define WTF_USE_ACCESSIBILITY_CONTEXT_MENUS 1
    895895#endif
    … …  
    915915   to WTF causes many ports to break, and so this way we can address the build
    916916   breakages one port at a time. */
    917 #if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(MAC) || PLATFORM(WIN))
     917#if !defined(WTF_USE_EXPORT_MACROS) && (PLATFORM(COCOA) || PLATFORM(WIN))
    918918#define WTF_USE_EXPORT_MACROS 1
    919919#endif
    … …  
    937937#define ENABLE_OBJECT_MARK_LOGGING 0
    938938
    939 #if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (PLATFORM(MAC) || PLATFORM(IOS) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
     939#if !defined(ENABLE_PARALLEL_GC) && !ENABLE(OBJECT_MARK_LOGGING) && (OS(DARWIN) && !PLATFORM(EFL) || PLATFORM(GTK)) && ENABLE(COMPARE_AND_SWAP)
    940940#define ENABLE_PARALLEL_GC 1
    941941#endif
    … …  
    949949#endif
    950950
    951 #if PLATFORM(IOS) || PLATFORM(MAC)
     951#if PLATFORM(COCOA)
    952952#define WTF_USE_AVFOUNDATION 1
    953953#endif
    … …  
    975975#endif
    976976
    977 #if PLATFORM(MAC) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
     977#if PLATFORM(COCOA) || PLATFORM(GTK) || (PLATFORM(WIN) && !USE(WINGDI) && !PLATFORM(WIN_CAIRO))
    978978#define WTF_USE_REQUEST_ANIMATION_FRAME_TIMER 1
    979979#endif
    980980
    981 #if PLATFORM(MAC)
     981#if PLATFORM(COCOA)
    982982#define WTF_USE_REQUEST_ANIMATION_FRAME_DISPLAY_MONITOR 1
    983983#endif
    … …  
    991991#endif
    992992
    993 #if PLATFORM(IOS) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080)
     993#if PLATFORM(COCOA)
    994994#define WTF_USE_CONTENT_FILTERING 1
    995995#endif
    … …  
    998998#define WTF_USE_GRAMMAR_CHECKING 1
    999999
    1000 #if PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(EFL)
     1000#if PLATFORM(COCOA) || PLATFORM(EFL)
    10011001#define WTF_USE_UNIFIED_TEXT_CHECKING 1
    10021002#endif
    … …  
    10101010#endif
    10111011
    1012 #if PLATFORM(MAC)
     1012#if PLATFORM(COCOA)
    10131013/* 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. */
    10141014#define WTF_USE_MARKER_REMOVAL_UPON_EDITING 1
    … …  
    10191019#endif
    10201020
    1021 #if PLATFORM(MAC) || PLATFORM(IOS)
     1021#if PLATFORM(COCOA)
    10221022#define WTF_USE_AUDIO_SESSION 1
    10231023#endif
    10241024
    1025 #if PLATFORM(MAC) && !PLATFORM(IOS_SIMULATOR)
     1025#if PLATFORM(COCOA) && !PLATFORM(IOS_SIMULATOR)
    10261026#define WTF_USE_IOSURFACE 1
    10271027#endif
    … …  
    10321032#endif
    10331033
    1034 #if PLATFORM(MAC)
     1034#if PLATFORM(COCOA)
    10351035#define ENABLE_CSS3_TEXT_DECORATION_SKIP_INK 1
    10361036#endif

  • trunk/Source/WTF/wtf/RunLoop.h

    r162139 r163288  
    6464    WTF_EXPORT_PRIVATE void wakeUp();
    6565
    66 #if PLATFORM(MAC)
     66#if PLATFORM(COCOA)
    6767    WTF_EXPORT_PRIVATE void runForDuration(double duration);
    6868#endif
    … …  
    9191        uint64_t m_ID;
    9292        bool m_isRepeating;
    93 #elif PLATFORM(MAC)
     93#elif PLATFORM(COCOA)
    9494        static void timerFired(CFRunLoopTimerRef, void*);
    9595        RetainPtr<CFRunLoopTimerRef> m_timer;
    … …  
    144144    typedef HashMap<uint64_t, TimerBase*> TimerMap;
    145145    TimerMap m_activeTimers;
    146 #elif PLATFORM(MAC)
     146#elif PLATFORM(COCOA)
    147147    static void performWork(void*);
    148148    RetainPtr<CFRunLoopRef> m_runLoop;

  • trunk/Source/WTF/wtf/RunLoopTimerCF.cpp

    r149255 r163288  
    2929#include "config.h"
    3030
    31 #if PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
     31#if PLATFORM(COCOA) && HAVE(RUNLOOP_TIMER)
    3232
    3333#include "RunLoopTimer.h"
    … …  
    9090} // namespace WTF
    9191
    92 #endif // PLATFORM(MAC) && HAVE(RUNLOOP_TIMER)
     92#endif // PLATFORM(COCOA) && HAVE(RUNLOOP_TIMER)

  • trunk/Source/WTF/wtf/SchedulePair.h

    r149255 r163288  
    3636#include <wtf/text/WTFString.h>
    3737
    38 #if PLATFORM(MAC)
     38#if USE(FOUNDATION)
    3939OBJC_CLASS NSRunLoop;
    4040#endif
    … …  
    4646    static PassRefPtr<SchedulePair> create(CFRunLoopRef runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
    4747
    48 #if PLATFORM(MAC) && !USE(CFNETWORK)
     48#if USE(FOUNDATION) && !USE(CFNETWORK)
    4949    static PassRefPtr<SchedulePair> create(NSRunLoop* runLoop, CFStringRef mode) { return adoptRef(new SchedulePair(runLoop, mode)); }
    5050    NSRunLoop* nsRunLoop() const { return m_nsRunLoop.get(); }
    … …  
    6464    }
    6565
    66 #if PLATFORM(MAC) && !USE(CFNETWORK)
     66#if USE(FOUNDATION) && !USE(CFNETWORK)
    6767    WTF_EXPORT_PRIVATE SchedulePair(NSRunLoop*, CFStringRef);
    6868    RetainPtr<NSRunLoop*> m_nsRunLoop;

  • trunk/Source/WTF/wtf/Threading.cpp

    r156968 r163288  
    8787}
    8888
    89 #if PLATFORM(MAC) || PLATFORM(WIN)
     89#if PLATFORM(MAC) && !PLATFORM(IOS) || PLATFORM(WIN)
    9090
    9191// For ABI compatibility with Safari on Mac / Windows: Safari uses the private
Note: See TracChangeset for help on using the changeset viewer.