Diff
Modified: trunk/Source/_javascript_Core/API/JSBase.h (184905 => 184906)
--- trunk/Source/_javascript_Core/API/JSBase.h 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/API/JSBase.h 2015-05-27 16:52:51 UTC (rev 184906)
@@ -141,11 +141,7 @@
/* Enable the Objective-C API for platforms with a modern runtime. */
#if !defined(JSC_OBJC_API_ENABLED)
-#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
-#else
-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
#endif
-#endif
#endif /* JSBase_h */
Modified: trunk/Source/_javascript_Core/API/JSContext.h (184905 => 184906)
--- trunk/Source/_javascript_Core/API/JSContext.h 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/API/JSContext.h 2015-05-27 16:52:51 UTC (rev 184906)
@@ -44,11 +44,7 @@
that reference a particular JSContext have been deallocated the JSContext
will be deallocated unless it has been previously retained.
*/
-#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
NS_CLASS_AVAILABLE(10_9, 7_0)
-#else
-OBJC_VISIBLE
-#endif
@interface JSContext : NSObject
/*!
Modified: trunk/Source/_javascript_Core/API/JSManagedValue.h (184905 => 184906)
--- trunk/Source/_javascript_Core/API/JSManagedValue.h 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/API/JSManagedValue.h 2015-05-27 16:52:51 UTC (rev 184906)
@@ -50,11 +50,7 @@
Objective-C heap object, as this can very easily create a reference cycle,
keeping the entire JSContext alive.
*/
-#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
NS_CLASS_AVAILABLE(10_9, 7_0)
-#else
-OBJC_VISIBLE
-#endif
@interface JSManagedValue : NSObject
/*!
Modified: trunk/Source/_javascript_Core/API/JSValue.h (184905 => 184906)
--- trunk/Source/_javascript_Core/API/JSValue.h 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/API/JSValue.h 2015-05-27 16:52:51 UTC (rev 184906)
@@ -50,11 +50,7 @@
from a different JSVirtualMachine will result in an Objective-C exception
being raised.
*/
-#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
NS_CLASS_AVAILABLE(10_9, 7_0)
-#else
-OBJC_VISIBLE
-#endif
@interface JSValue : NSObject
/*!
Modified: trunk/Source/_javascript_Core/API/JSVirtualMachine.h (184905 => 184906)
--- trunk/Source/_javascript_Core/API/JSVirtualMachine.h 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/API/JSVirtualMachine.h 2015-05-27 16:52:51 UTC (rev 184906)
@@ -34,11 +34,7 @@
virtual machine, with concurrent _javascript_ execution supported by allocating
separate instances of JSVirtualMachine.
*/
-#ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
NS_CLASS_AVAILABLE(10_9, 7_0)
-#else
-OBJC_VISIBLE
-#endif
@interface JSVirtualMachine : NSObject
/*!
Modified: trunk/Source/_javascript_Core/ChangeLog (184905 => 184906)
--- trunk/Source/_javascript_Core/ChangeLog 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-05-27 16:52:51 UTC (rev 184906)
@@ -1,3 +1,22 @@
+2015-05-27 Dan Bernstein <[email protected]>
+
+ Remove JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
+ https://bugs.webkit.org/show_bug.cgi?id=145403
+
+ Reviewed by Anders Carlsson.
+
+ JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 was used to enable the _javascript_Core Objective-C API
+ for WebKit and Safari projects building with _javascript_Core targeting OS X 10.8. We don’t
+ need it anymore.
+
+ * API/JSBase.h:
+ * API/JSContext.h:
+ * API/JSManagedValue.h:
+ * API/JSValue.h:
+ * API/JSVirtualMachine.h:
+ * Configurations/Base.xcconfig:
+ * postprocess-headers.sh:
+
2015-05-26 Geoffrey Garen <[email protected]>
Photo Booth hangs under JSC::MachineThreads::tryCopyOtherThreadStacks
Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (184905 => 184906)
--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig 2015-05-27 16:52:51 UTC (rev 184906)
@@ -56,7 +56,7 @@
GCC_MODEL_TUNING[sdk=macosx*] = G5;
GCC_OBJC_CALL_CXX_CDTORS = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
-GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_HEADER_DETECTION_H JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080 $(FEATURE_DEFINES) $(inherited);
+GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) HAVE_HEADER_DETECTION_H $(FEATURE_DEFINES) $(inherited);
GCC_STRICT_ALIASING = YES;
GCC_THREADSAFE_STATICS = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
Modified: trunk/Source/_javascript_Core/postprocess-headers.sh (184905 => 184906)
--- trunk/Source/_javascript_Core/postprocess-headers.sh 2015-05-27 16:08:45 UTC (rev 184905)
+++ trunk/Source/_javascript_Core/postprocess-headers.sh 2015-05-27 16:52:51 UTC (rev 184906)
@@ -1,13 +1,7 @@
cd "${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}"
-if [[ ${TARGET_MAC_OS_X_VERSION_MAJOR} == "1080" ]]; then
- UNIFDEF_OPTIONS="-DJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080";
-else
- UNIFDEF_OPTIONS="-UJSC_OBJC_API_AVAILABLE_MAC_OS_X_1080";
-fi
+UNIFDEF_OPTIONS="-D__MAC_OS_X_VERSION_MIN_REQUIRED=${TARGET_MAC_OS_X_VERSION_MAJOR}"
-UNIFDEF_OPTIONS+=" -D__MAC_OS_X_VERSION_MIN_REQUIRED=${TARGET_MAC_OS_X_VERSION_MAJOR}"
-
for ((i = 0; i < ${SCRIPT_INPUT_FILE_COUNT}; ++i)); do
eval HEADER=\${SCRIPT_INPUT_FILE_${i}};
unifdef -B ${UNIFDEF_OPTIONS} -o ${HEADER}.unifdef ${HEADER}
@@ -22,4 +16,3 @@
exit 1
esac
done
-
