Changeset 41176 in webkit for trunk/JavaScriptCore/API


Ignore:
Timestamp:
Feb 24, 2009, 4:35:43 AM (16 years ago)
Author:
[email protected]
Message:

<rdar://problem/6259220> Rename AVAILABLE_AFTER_WEBKIT_VERSION_3_1 (etc.) to match the other macros

Reviewed by Oliver Hunt.

  • API/JSBasePrivate.h:
  • API/JSContextRef.h:
  • API/JSObjectRef.h:
  • API/WebKitAvailability.h:
  • Carbon/CarbonUtils.h:
  • Carbon/HIWebView.h:
  • Plugins/WebPlugin.h:
  • Plugins/WebPluginViewFactory.h:
  • WebView/WebUIDelegate.h:
Location:
trunk/JavaScriptCore/API
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/API/JSBasePrivate.h

    r36863 r41176  
    4444region.
    4545*/
    46 JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     46JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    4747
    4848#ifdef __cplusplus

  • trunk/JavaScriptCore/API/JSContextRef.h

    r39127 r41176  
    4949@result The created JSContextGroup.
    5050*/
    51 JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     51JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_IN_WEBKIT_VERSION_4_0;
    5252
    5353/*!
    … …  
    5757@result A JSContextGroup that is the same as group.
    5858*/
    59 JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     59JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    6060
    6161/*!
    … …  
    6464@param group The JSContextGroup to release.
    6565*/
    66 JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     66JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    6767
    6868/*!
    … …  
    9393 group equal to group.
    9494*/
    95 JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     95JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    9696
    9797/*!
    … …  
    124124@result ctx's group.
    125125*/
    126 JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     126JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    127127
    128128#ifdef __cplusplus

  • trunk/JavaScriptCore/API/JSObjectRef.h

    r37126 r41176  
    442442 is supplied, this function returns an array with one element.
    443443 */
    444 JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     444JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    445445
    446446/*!
    … …  
    453453 @result A JSObject that is a Date.
    454454 */
    455 JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     455JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    456456
    457457/*!
    … …  
    464464 @result A JSObject that is a Error.
    465465 */
    466 JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     466JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    467467
    468468/*!
    … …  
    475475 @result A JSObject that is a RegExp.
    476476 */
    477 JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_AFTER_WEBKIT_VERSION_3_1;
     477JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
    478478
    479479/*!

  • trunk/JavaScriptCore/API/WebKitAvailability.h

    r38817 r41176  
    3939#define WEBKIT_VERSION_3_0    0x0300
    4040#define WEBKIT_VERSION_3_1    0x0310
     41#define WEBKIT_VERSION_4_0    0x0400
    4142#define WEBKIT_VERSION_LATEST 0x9999
    4243
    … …  
    641642
    642643/*
    643  * AVAILABLE_AFTER_WEBKIT_VERSION_3_1
    644  *
    645  * Used on declarations introduced after WebKit 3.1
     644 * AVAILABLE_IN_WEBKIT_VERSION_4_0
     645 *
     646 * Used on declarations introduced in WebKit 4.0
    646647 */
    647648#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_LATEST
    648     #define AVAILABLE_AFTER_WEBKIT_VERSION_3_1     UNAVAILABLE_ATTRIBUTE
     649    #define AVAILABLE_IN_WEBKIT_VERSION_4_0     UNAVAILABLE_ATTRIBUTE
    649650#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_LATEST
    650     #define AVAILABLE_AFTER_WEBKIT_VERSION_3_1     WEAK_IMPORT_ATTRIBUTE
    651 #else
    652     #define AVAILABLE_AFTER_WEBKIT_VERSION_3_1
    653 #endif
    654 
    655 /*
    656  * AVAILABLE_AFTER_WEBKIT_VERSION_3_1_BUT_DEPRECATED
    657  *
    658  * Used on declarations introduced after WebKit 3.1,
    659  * and deprecated after WebKit 3.1
    660  */
    661 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    662     #define AVAILABLE_AFTER_WEBKIT_VERSION_3_1_BUT_DEPRECATED    DEPRECATED_ATTRIBUTE
    663 #else
    664     #define AVAILABLE_AFTER_WEBKIT_VERSION_3_1_BUT_DEPRECATED    AVAILABLE_AFTER_WEBKIT_VERSION_3_1
    665 #endif
    666 
    667 /*
    668  * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     651    #define AVAILABLE_IN_WEBKIT_VERSION_4_0     WEAK_IMPORT_ATTRIBUTE
     652#else
     653    #define AVAILABLE_IN_WEBKIT_VERSION_4_0
     654#endif
     655
     656/*
     657 * AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED
     658 *
     659 * Used on declarations introduced in WebKit 4.0,
     660 * and deprecated in WebKit 4.0
     661 */
     662#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     663    #define AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED    DEPRECATED_ATTRIBUTE
     664#else
     665    #define AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED    AVAILABLE_IN_WEBKIT_VERSION_4_0
     666#endif
     667
     668/*
     669 * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    669670 *
    670671 * Used on declarations introduced in WebKit 1.0,
    671  * but later deprecated after WebKit 3.1
    672  */
    673 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    674     #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    675 #else
    676     #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER
    677 #endif
    678 
    679 /*
    680  * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     672 * but later deprecated in WebKit 4.0
     673 */
     674#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     675    #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     676#else
     677    #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER
     678#endif
     679
     680/*
     681 * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    681682 *
    682683 * Used on declarations introduced in WebKit 1.1,
    683  * but later deprecated after WebKit 3.1
    684  */
    685 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    686     #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    687 #else
    688     #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER
    689 #endif
    690 
    691 /*
    692  * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     684 * but later deprecated in WebKit 4.0
     685 */
     686#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     687    #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     688#else
     689    #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER
     690#endif
     691
     692/*
     693 * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    693694 *
    694695 * Used on declarations introduced in WebKit 1.2,
    695  * but later deprecated after WebKit 3.1
    696  */
    697 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    698     #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    699 #else
    700     #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER
    701 #endif
    702 
    703 /*
    704  * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     696 * but later deprecated in WebKit 4.0
     697 */
     698#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     699    #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     700#else
     701    #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER
     702#endif
     703
     704/*
     705 * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    705706 *
    706707 * Used on declarations introduced in WebKit 1.3,
    707  * but later deprecated after WebKit 3.1
    708  */
    709 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    710     #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    711 #else
    712     #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER
    713 #endif
    714 
    715 /*
    716  * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     708 * but later deprecated in WebKit 4.0
     709 */
     710#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     711    #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     712#else
     713    #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER
     714#endif
     715
     716/*
     717 * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    717718 *
    718719 * Used on declarations introduced in WebKit 2.0,
    719  * but later deprecated after WebKit 3.1
    720  */
    721 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    722     #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    723 #else
    724     #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER
    725 #endif
    726 
    727 /*
    728  * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     720 * but later deprecated in WebKit 4.0
     721 */
     722#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     723    #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     724#else
     725    #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER
     726#endif
     727
     728/*
     729 * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    729730 *
    730731 * Used on declarations introduced in WebKit 3.0,
    731  * but later deprecated after WebKit 3.1
    732  */
    733 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    734     #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    735 #else
    736     #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER
    737 #endif
    738 
    739 /*
    740  * AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     732 * but later deprecated in WebKit 4.0
     733 */
     734#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
     735    #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    DEPRECATED_ATTRIBUTE
     736#else
     737    #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0    AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER
     738#endif
     739
     740/*
     741 * AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0
    741742 *
    742743 * Used on declarations introduced in WebKit 3.1,
    743  * but later deprecated after WebKit 3.1
    744  */
    745 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    746     #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    747 #else
    748     #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_AFTER_WEBKIT_VERSION_3_1    AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER
    749 #endif
    750 
    751 /*
    752  * DEPRECATED_AFTER_WEBKIT_VERSION_3_1
    753  *
    754  * Used on types deprecated after WebKit 3.1
    755  */
    756 #if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST
    757     #define DEPRECATED_AFTER_WEBKIT_VERSION_3_1    DEPRECATED_ATTRIBUTE
    758 #else
    759     #define DEPRECATED_AFTER_WEBKIT_VERSION_3_1
     744 * but later deprecated in WebKit 4.0
     745 */
     746#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
     756 */
     757#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
    760761#endif
    761762
Note: See TracChangeset for help on using the changeset viewer.