Changeset 56150 in webkit for trunk/JavaScriptCore/API


Ignore:
Timestamp:
Mar 17, 2010, 10:02:58 PM (15 years ago)
Author:
[email protected]
Message:

Update WebKit availability macros for release after 4.0.

Reviewed by Darin Adler and Mark Rowe.

  • API/WebKitAvailability.h:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/API/WebKitAvailability.h

    r41176 r56150  
    11/*
    2  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
     2 * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    4343
    4444#ifdef __APPLE__
    45 #import <AvailabilityMacros.h>
     45#include <AvailabilityMacros.h>
    4646#else
    4747/*
    … …  
    8787        /* WebKit 3.0 is the version that shipped on Mac OS X 10.5. */
    8888        #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_3_0
     89    #elif !defined(MAC_OS_X_VERSION_10_7) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
     90        /* WebKit 4.0 is the version that shipped on Mac OS X 10.6. */
     91        #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_4_0
    8992    #else
    9093        #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_LATEST
    … …  
    646649 * Used on declarations introduced in WebKit 4.0
    647650 */
    648 #if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_LATEST
     651#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_4_0
    649652    #define AVAILABLE_IN_WEBKIT_VERSION_4_0     UNAVAILABLE_ATTRIBUTE
    650 #elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_LATEST
     653#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_4_0
    651654    #define AVAILABLE_IN_WEBKIT_VERSION_4_0     WEAK_IMPORT_ATTRIBUTE
    652655#else
    … …  
    660663 * and deprecated in WebKit 4.0
    661664 */
    662 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     665#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    663666    #define AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED    DEPRECATED_ATTRIBUTE
    664667#else
    … …  
    672675 * but later deprecated in WebKit 4.0
    673676 */
    674 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     677#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    675678    #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    676679#else
    … …  
    684687 * but later deprecated in WebKit 4.0
    685688 */
    686 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     689#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    687690    #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    688691#else
    … …  
    696699 * but later deprecated in WebKit 4.0
    697700 */
    698 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     701#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    699702    #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    700703#else
    … …  
    708711 * but later deprecated in WebKit 4.0
    709712 */
    710 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     713#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    711714    #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    712715#else
    … …  
    720723 * but later deprecated in WebKit 4.0
    721724 */
    722 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     725#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    723726    #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    724727#else
    … …  
    732735 * but later deprecated in WebKit 4.0
    733736 */
    734 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     737#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
    735738    #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    736739#else
    … …  
    744747 * but later deprecated in WebKit 4.0
    745748 */
     749#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
     750    #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     751#else
     752    #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER
     753#endif
     754
     755/*
     756 * DEPRECATED_IN_WEBKIT_VERSION_4_0
     757 *
     758 * Used on types deprecated in WebKit 4.0
     759 */
     760#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_4_0
     761    #define DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     762#else
     763    #define DEPRECATED_IN_WEBKIT_VERSION_4_0
     764#endif
     765
     766
     767
     768
     769
     770
     771/*
     772 * AVAILABLE_AFTER_WEBKIT_VERSION_4_0
     773 *
     774 * Used on declarations introduced after WebKit 4.0
     775 */
     776#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_LATEST
     777    #define AVAILABLE_AFTER_WEBKIT_VERSION_4_0     UNAVAILABLE_ATTRIBUTE
     778#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_LATEST
     779    #define AVAILABLE_AFTER_WEBKIT_VERSION_4_0     WEAK_IMPORT_ATTRIBUTE
     780#else
     781    #define AVAILABLE_AFTER_WEBKIT_VERSION_4_0
     782#endif
     783
     784/*
     785 * AVAILABLE_AFTER_WEBKIT_VERSION_4_0_BUT_DEPRECATED
     786 *
     787 * Used on declarations introduced after WebKit 4.0,
     788 * and deprecated after WebKit 4.0
     789 */
    746790#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    747     #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    748 #else
    749     #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER
    750 #endif
    751 
    752 /*
    753  * DEPRECATED_IN_WEBKIT_VERSION_4_0
    754  *
    755  * Used on types deprecated in WebKit 4.0
     791    #define AVAILABLE_AFTER_WEBKIT_VERSION_4_0_BUT_DEPRECATED    DEPRECATED_ATTRIBUTE
     792#else
     793    #define AVAILABLE_AFTER_WEBKIT_VERSION_4_0_BUT_DEPRECATED    AVAILABLE_AFTER_WEBKIT_VERSION_4_0
     794#endif
     795
     796/*
     797 * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     798 *
     799 * Used on declarations introduced in WebKit 1.0,
     800 * but later deprecated after WebKit 4.0
    756801 */
    757802#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    758     #define DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
    759 #else
    760     #define DEPRECATED_IN_WEBKIT_VERSION_4_0
     803    #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     804#else
     805    #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER
     806#endif
     807
     808/*
     809 * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     810 *
     811 * Used on declarations introduced in WebKit 1.1,
     812 * but later deprecated after WebKit 4.0
     813 */
     814#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     815    #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     816#else
     817    #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER
     818#endif
     819
     820/*
     821 * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     822 *
     823 * Used on declarations introduced in WebKit 1.2,
     824 * but later deprecated after WebKit 4.0
     825 */
     826#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     827    #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     828#else
     829    #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER
     830#endif
     831
     832/*
     833 * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     834 *
     835 * Used on declarations introduced in WebKit 1.3,
     836 * but later deprecated after WebKit 4.0
     837 */
     838#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     839    #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     840#else
     841    #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER
     842#endif
     843
     844/*
     845 * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     846 *
     847 * Used on declarations introduced in WebKit 2.0,
     848 * but later deprecated after WebKit 4.0
     849 */
     850#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     851    #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     852#else
     853    #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER
     854#endif
     855
     856/*
     857 * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     858 *
     859 * Used on declarations introduced in WebKit 3.0,
     860 * but later deprecated after WebKit 4.0
     861 */
     862#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     863    #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     864#else
     865    #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER
     866#endif
     867
     868/*
     869 * AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     870 *
     871 * Used on declarations introduced in WebKit 3.1,
     872 * but later deprecated after WebKit 4.0
     873 */
     874#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     875    #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     876#else
     877    #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER
     878#endif
     879
     880/*
     881 * AVAILABLE_WEBKIT_VERSION_4_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     882 *
     883 * Used on declarations introduced in WebKit 4.0
     884 * but later deprecated after WebKit 4.0
     885 */
     886#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     887    #define AVAILABLE_WEBKIT_VERSION_4_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     888#else
     889    #define AVAILABLE_WEBKIT_VERSION_4_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_4_0_AND_LATER
     890#endif
     891
     892/*
     893 * DEPRECATED_AFTER_WEBKIT_VERSION_4_0
     894 *
     895 * Used on types deprecated after WebKit 4.0
     896 */
     897#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     898    #define DEPRECATED_AFTER_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     899#else
     900    #define DEPRECATED_AFTER_WEBKIT_VERSION_4_0
    761901#endif
    762902
Note: See TracChangeset for help on using the changeset viewer.