Diff
Modified: trunk/Source/_javascript_Core/API/JSBasePrivate.h (160451 => 160452)
--- trunk/Source/_javascript_Core/API/JSBasePrivate.h 2013-12-11 21:33:08 UTC (rev 160451)
+++ trunk/Source/_javascript_Core/API/JSBasePrivate.h 2013-12-11 22:06:11 UTC (rev 160452)
@@ -43,7 +43,7 @@
garbage collector to collect soon, hoping to reclaim that large non-GC memory
region.
*/
-JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) CF_AVAILABLE(10_6, 7_0);
JS_EXPORT void JSDisableGCTimer(void);
Modified: trunk/Source/_javascript_Core/API/JSContextRef.h (160451 => 160452)
--- trunk/Source/_javascript_Core/API/JSContextRef.h 2013-12-11 21:33:08 UTC (rev 160451)
+++ trunk/Source/_javascript_Core/API/JSContextRef.h 2013-12-11 22:06:11 UTC (rev 160452)
@@ -48,7 +48,7 @@
synchronization is required.
@result The created JSContextGroup.
*/
-JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSContextGroupRef JSContextGroupCreate() CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -56,14 +56,14 @@
@param group The JSContextGroup to retain.
@result A JSContextGroup that is the same as group.
*/
-JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@abstract Releases a _javascript_ context group.
@param group The JSContextGroup to release.
*/
-JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -78,7 +78,7 @@
NULL to use the default object class.
@result A JSGlobalContext with a global object of class globalObjectClass.
*/
-JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER;
+JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) CF_AVAILABLE(10_5, 7_0);
/*!
@function
@@ -92,7 +92,7 @@
@result A JSGlobalContext with a global object of class globalObjectClass and a context
group equal to group.
*/
-JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -123,7 +123,7 @@
@param ctx The JSContext whose group you want to get.
@result ctx's group.
*/
-JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -131,7 +131,7 @@
@param ctx The JSContext whose global context you want to get.
@result ctx's global context.
*/
-JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) CF_AVAILABLE(10_7, 4_0);
+JS_EXPORT JSGlobalContextRef JSContextGetGlobalContext(JSContextRef ctx) CF_AVAILABLE(10_7, 7_0);
/*!
@function
Modified: trunk/Source/_javascript_Core/API/JSContextRefPrivate.h (160451 => 160452)
--- trunk/Source/_javascript_Core/API/JSContextRefPrivate.h 2013-12-11 21:33:08 UTC (rev 160451)
+++ trunk/Source/_javascript_Core/API/JSContextRefPrivate.h 2013-12-11 22:06:11 UTC (rev 160452)
@@ -44,7 +44,7 @@
@param ctx The JSContext whose backtrace you want to get
@result A string containing the backtrace
*/
-JS_EXPORT JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSStringRef JSContextCreateBacktrace(JSContextRef ctx, unsigned maxStackSize) CF_AVAILABLE(10_6, 7_0);
/*!
@@ -85,14 +85,14 @@
need to call JSContextGroupSetExecutionTimeLimit before you start executing
any scripts.
*/
-JS_EXPORT void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef, double limit, JSShouldTerminateCallback, void* context) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT void JSContextGroupSetExecutionTimeLimit(JSContextGroupRef, double limit, JSShouldTerminateCallback, void* context) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@abstract Clears the script execution time limit.
@param group The _javascript_ context group that the time limit is cleared on.
*/
-JS_EXPORT void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT void JSContextGroupClearExecutionTimeLimit(JSContextGroupRef) CF_AVAILABLE(10_6, 7_0);
#ifdef __cplusplus
}
Modified: trunk/Source/_javascript_Core/API/JSObjectRef.h (160451 => 160452)
--- trunk/Source/_javascript_Core/API/JSObjectRef.h 2013-12-11 21:33:08 UTC (rev 160451)
+++ trunk/Source/_javascript_Core/API/JSObjectRef.h 2013-12-11 22:06:11 UTC (rev 160452)
@@ -441,7 +441,7 @@
@discussion The behavior of this function does not exactly match the behavior of the built-in Array constructor. Specifically, if one argument
is supplied, this function returns an array with one element.
*/
-JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -452,7 +452,7 @@
@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
@result A JSObject that is a Date.
*/
-JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -463,7 +463,7 @@
@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
@result A JSObject that is a Error.
*/
-JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
/*!
@function
@@ -474,7 +474,7 @@
@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
@result A JSObject that is a RegExp.
*/
-JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0;
+JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) CF_AVAILABLE(10_6, 7_0);
/*!
@function
Modified: trunk/Source/_javascript_Core/API/JSValueRef.h (160451 => 160452)
--- trunk/Source/_javascript_Core/API/JSValueRef.h 2013-12-11 21:33:08 UTC (rev 160451)
+++ trunk/Source/_javascript_Core/API/JSValueRef.h 2013-12-11 22:06:11 UTC (rev 160452)
@@ -218,7 +218,7 @@
@param string The JSString containing the JSON string to be parsed.
@result A JSValue containing the parsed value, or NULL if the input is invalid.
*/
-JS_EXPORT JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string) AVAILABLE_AFTER_WEBKIT_VERSION_4_0;
+JS_EXPORT JSValueRef JSValueMakeFromJSONString(JSContextRef ctx, JSStringRef string) CF_AVAILABLE(10_7, 7_0);
/*!
@function
@@ -229,7 +229,7 @@
@param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception.
@result A JSString with the result of serialization, or NULL if an exception is thrown.
*/
-JS_EXPORT JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef value, unsigned indent, JSValueRef* exception) AVAILABLE_AFTER_WEBKIT_VERSION_4_0;
+JS_EXPORT JSStringRef JSValueCreateJSONString(JSContextRef ctx, JSValueRef value, unsigned indent, JSValueRef* exception) CF_AVAILABLE(10_7, 7_0);
/* Converting to primitive values */
Modified: trunk/Source/_javascript_Core/ChangeLog (160451 => 160452)
--- trunk/Source/_javascript_Core/ChangeLog 2013-12-11 21:33:08 UTC (rev 160451)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-12-11 22:06:11 UTC (rev 160452)
@@ -1,3 +1,25 @@
+2013-12-11 Mark Rowe <[email protected]>
+
+ <https://webkit.org/b/125559> Move _javascript_Core off the legacy WebKit availability macros
+
+ The legacy WebKit availability macros are verbose, confusing, and provide no benefit over
+ using the system availability macros directly. The original vision was that they'd serve
+ a cross-platform purpose but that never came to be.
+
+ Map from WebKit version to OS X version based on the mapping in WebKitAvailability.h.
+ All iOS versions are specified as 7.0 as that is when the _javascript_Core C API was made
+ public.
+
+ Part of <rdar://problem/15512304>.
+
+ Reviewed by Anders Carlsson.
+
+ * API/JSBasePrivate.h:
+ * API/JSContextRef.h:
+ * API/JSContextRefPrivate.h:
+ * API/JSObjectRef.h:
+ * API/JSValueRef.h:
+
2013-12-10 Filip Pizlo <[email protected]>
Get rid of forward exit on DoubleAsInt32
