Changeset 161853 in webkit


Ignore:
Timestamp:
Jan 12, 2014 6:42:54 PM (10 years ago)
Author:
Darin Adler
Message:

Add PLATFORM(COCOA) and USE(FOUNDATION)
https://bugs.webkit.org/show_bug.cgi?id=126859

Reviewed by Anders Carlsson.

Source/WebCore:

config.h: Use PLATFORM(COCOA) instead of PLATFORM(MAC)
PLATFORM(IOS)

to set USE(FILE_LOCK). Would be nice to use OS(DARWIN), but that would be
a change in behavior that might be incorrect. Removed bogus comments in
the USE(NEW_THEME) setting code. Removed redundant code to set USE(CA),
which exactly duplicates code that already exists in Platform.h.

Source/WTF:

  • wtf/Platform.h: Added PLATFORM(COCOA), which for now is set at exactly the same

times that PLATFORM(MAC) is. Added USE(FOUNDATION), which is set at the same times
that PLATFORM(COCOA) is. Re-organize the PLATFORM(MAC) and PLATFORM(IOS) settings
in the header so they are a bit easier to read. Put HAVE_LANGINFO_H in with the
rest of the OS(UNIX) settings and put HAVE_READLINE in with the rest of the
OS(DARWIN) settings. Tweak formatting a bit.

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r161852 r161853  
     12014-01-12  Darin Adler  <darin@apple.com>
     2
     3        Add PLATFORM(COCOA) and USE(FOUNDATION)
     4        https://bugs.webkit.org/show_bug.cgi?id=126859
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * wtf/Platform.h: Added PLATFORM(COCOA), which for now is set at exactly the same
     9        times that PLATFORM(MAC) is. Added USE(FOUNDATION), which is set at the same times
     10        that PLATFORM(COCOA) is. Re-organize the PLATFORM(MAC) and PLATFORM(IOS) settings
     11        in the header so they are a bit easier to read. Put HAVE_LANGINFO_H in with the
     12        rest of the OS(UNIX) settings and put HAVE_READLINE in with the rest of the
     13        OS(DARWIN) settings. Tweak formatting a bit.
     14
    1152014-01-12  Anders Carlsson  <andersca@apple.com>
    216
  • trunk/Source/WTF/wtf/Platform.h

    r161672 r161853  
    11/*
    2  * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
     2 * Copyright (C) 2006, 2007, 2008, 2009, 2013, 2014 Apple Inc. All rights reserved.
    33 * Copyright (C) 2007-2009 Torch Mobile, Inc.
    44 * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved.
     
    430430#include "nix/PlatformNix.h"
    431431#elif OS(DARWIN)
     432#define WTF_PLATFORM_COCOA 1
    432433#define WTF_PLATFORM_MAC 1
    433434#elif OS(WINDOWS)
     
    476477#endif
    477478
     479#if PLATFORM(COCOA)
     480
     481#define WTF_USE_CF 1
     482#define WTF_USE_FOUNDATION 1
     483
     484#endif
     485
    478486#if PLATFORM(MAC) && !PLATFORM(IOS)
    479 #if CPU(X86_64)
    480 #define WTF_USE_PLUGIN_HOST_PROCESS 1
    481 #endif
    482 #define WTF_USE_CF 1
    483 #define HAVE_READLINE 1
     487
     488#define WTF_USE_APPKIT 1
    484489#define HAVE_RUNLOOP_TIMER 1
    485490#define HAVE_SEC_IDENTITY 1
    486491#define HAVE_SEC_KEYCHAIN 1
     492
     493#if CPU(X86_64)
     494#define WTF_USE_PLUGIN_HOST_PROCESS 1
     495#endif
     496
    487497#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
    488498#define HAVE_LAYER_HOSTING_IN_WINDOW_SERVER 1
    489499#endif
    490 #define WTF_USE_APPKIT 1
    491500
    492501/* OS X defines a series of platform macros for debugging. */
     
    495504#undef __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES
    496505#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0
     506
    497507#endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
    498 
    499 #if PLATFORM(IOS)
    500 #define DONT_FINALIZE_ON_MAIN_THREAD 1
    501 #endif
    502508
    503509#if OS(DARWIN) && !PLATFORM(GTK)
     
    506512
    507513#if PLATFORM(IOS)
     514
     515#define DONT_FINALIZE_ON_MAIN_THREAD 1
    508516#define HAVE_READLINE 1
    509 #define WTF_USE_APPKIT 0
    510 #define WTF_USE_CF 1
    511517#define WTF_USE_CFNETWORK 1
    512518#define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
     
    516522#define ENABLE_JIT_CONSTANT_BLINDING 0
    517523#endif
     524
    518525#endif /* PLATFORM(IOS) */
    519526
     
    538545#if OS(UNIX)
    539546#define HAVE_ERRNO_H 1
    540 #define HAVE_MMAP 1   
     547#define HAVE_LANGINFO_H 1
     548#define HAVE_MMAP 1
    541549#define HAVE_SIGNAL_H 1
    542550#define HAVE_STRINGS_H 1
     
    546554#endif /* OS(UNIX) */
    547555
    548 #if OS(UNIX)
    549 #define HAVE_LANGINFO_H 1
    550 #endif
    551 
    552556#if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__)
    553557#define HAVE_PTHREAD_NP_H 1
     
    579583#define HAVE_MERGESORT 1
    580584#define HAVE_PTHREAD_SETNAME_NP 1
     585#define HAVE_READLINE 1
    581586#define HAVE_SYS_TIMEB_H 1
    582587#define WTF_USE_ACCELERATE 1
     
    584589#if !PLATFORM(IOS)
    585590#define HAVE_HOSTED_CORE_ANIMATION 1
    586 #endif /* !PLATFORM(IOS) */
     591#endif
    587592
    588593#endif /* OS(DARWIN) */
    589594
    590595#if OS(WINDOWS) && !OS(WINCE)
     596
    591597#define HAVE_SYS_TIMEB_H 1
    592598#define HAVE_ALIGNED_MALLOC 1
  • trunk/Source/WebCore/ChangeLog

    r161851 r161853  
     12014-01-12  Darin Adler  <darin@apple.com>
     2
     3        Add PLATFORM(COCOA) and USE(FOUNDATION)
     4        https://bugs.webkit.org/show_bug.cgi?id=126859
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * config.h: Use PLATFORM(COCOA) instead of PLATFORM(MAC) || PLATFORM(IOS)
     9        to set USE(FILE_LOCK). Would be nice to use OS(DARWIN), but that would be
     10        a change in behavior that might be incorrect. Removed bogus comments in
     11        the USE(NEW_THEME) setting code. Removed redundant code to set USE(CA),
     12        which exactly duplicates code that already exists in Platform.h.
     13
    1142014-01-12  Darin Adler  <darin@apple.com>
    215
  • trunk/Source/WebCore/config.h

    r161638 r161853  
    11/*
    2  * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc.
     2 * Copyright (C) 2004, 2005, 2006, 2013, 2014 Apple Inc. All rights reserved.
    33 * Copyright (C) 2009 Google Inc. All rights reserved.
    44 *
     
    3030#include <wtf/Platform.h>
    3131
    32 #if PLATFORM(MAC) || PLATFORM(IOS)
     32#if PLATFORM(COCOA)
    3333#define WTF_USE_FILE_LOCK 1
    3434#endif
     
    102102
    103103#if PLATFORM(MAC) && !PLATFORM(IOS)
    104 // New theme
    105104#define WTF_USE_NEW_THEME 1
    106 #endif // PLATFORM(MAC)
     105#endif
    107106
    108107#if USE(CG)
     
    119118#if PLATFORM(WIN) && USE(CG)
    120119#define WTF_USE_SAFARI_THEME 1
    121 #endif
    122 
    123 // CoreAnimation is available to IOS, Mac and Windows if using CG
    124 #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))
    125 #define WTF_USE_CA 1
    126120#endif
    127121
Note: See TracChangeset for help on using the changeset viewer.