Modified: tags/Safari-607.1.4.1/Source/_javascript_Core/API/JSValue.h (235639 => 235640)
--- tags/Safari-607.1.4.1/Source/_javascript_Core/API/JSValue.h 2018-09-04 21:25:50 UTC (rev 235639)
+++ tags/Safari-607.1.4.1/Source/_javascript_Core/API/JSValue.h 2018-09-04 21:25:54 UTC (rev 235640)
@@ -30,8 +30,6 @@
#import <CoreGraphics/CGGeometry.h>
-NS_ASSUME_NONNULL_BEGIN
-
@class JSContext;
/*!
@@ -50,9 +48,9 @@
@interface JSValue : NSObject
#if (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < JSC_MAC_VERSION_TBA) || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < JSC_IOS_VERSION_TBA)
-typedef NSString * JSValueProperty;
+typedef NSString *JSValueProperty;
#else
-typedef id _Nullable JSValueProperty;
+typedef id JSValueProperty;
#endif
/*!
@@ -71,7 +69,7 @@
@param value The Objective-C object to be converted.
@result The new JSValue.
*/
-+ (JSValue *)valueWithObject:(nullable id)value inContext:(JSContext *)context;
++ (JSValue *)valueWithObject:(id)value inContext:(JSContext *)context;
/*!
@method
@@ -218,7 +216,7 @@
to the conversion rules specified above.
@result The Objective-C representation of this JSValue.
*/
-- (nullable id)toObject;
+- (id)toObject;
/*!
@method
@@ -227,7 +225,7 @@
If the result is not of the specified Class then <code>nil</code> will be returned.
@result An Objective-C object of the specified Class or <code>nil</code>.
*/
-- (nullable id)toObjectOfClass:(Class)expectedClass;
+- (id)toObjectOfClass:(Class)expectedClass;
/*!
@method
@@ -273,7 +271,7 @@
to the rules specified by the _javascript_ language.
@result The NSNumber result of the conversion.
*/
-- (nullable NSNumber *)toNumber;
+- (NSNumber *)toNumber;
/*!
@method
@@ -282,7 +280,7 @@
by the _javascript_ language.
@result The NSString containing the result of the conversion.
*/
-- (nullable NSString *)toString;
+- (NSString *)toString;
/*!
@method
@@ -291,7 +289,7 @@
since 1970 which is then used to create a new NSDate instance.
@result The NSDate created using the converted time interval.
*/
-- (nullable NSDate *)toDate;
+- (NSDate *)toDate;
/*!
@method
@@ -305,7 +303,7 @@
@result The NSArray containing the recursively converted contents of the
converted _javascript_ array.
*/
-- (nullable NSArray *)toArray;
+- (NSArray *)toArray;
/*!
@method
@@ -317,7 +315,7 @@
@result The NSDictionary containing the recursively converted contents of
the converted _javascript_ object.
*/
-- (nullable NSDictionary *)toDictionary;
+- (NSDictionary *)toDictionary;
/*!
@methodgroup Accessing Properties
@@ -337,7 +335,7 @@
@abstract Set a property on a JSValue.
@discussion Corresponds to the _javascript_ operation <code>object[property] = value</code>. After macOS TBA and iOS TBA, 'property' can be any 'id' and will be converted to a JSValue using the conversion rules of <code>valueWithObject:inContext:</code>. Prior to macOS TBA and iOS TBA, 'property' was expected to be an NSString *.
*/
-- (void)setValue:(nullable id)value forProperty:(JSValueProperty)property;
+- (void)setValue:(id)value forProperty:(JSValueProperty)property;
/*!
@method
@@ -362,7 +360,7 @@
@discussion This method may be used to create a data or accessor property on an object.
This method operates in accordance with the Object.defineProperty method in the _javascript_ language. After macOS TBA and iOS TBA, 'property' can be any 'id' and will be converted to a JSValue using the conversion rules of <code>valueWithObject:inContext:</code>. Prior to macOS TBA and iOS TBA, 'property' was expected to be an NSString *.
*/
-- (void)defineProperty:(JSValueProperty)property descriptor:(nullable id)descriptor;
+- (void)defineProperty:(JSValueProperty)property descriptor:(id)descriptor;
/*!
@method
@@ -378,7 +376,7 @@
@discussion For JSValues that are _javascript_ arrays, indices greater than
UINT_MAX - 1 will not affect the length of the array.
*/
-- (void)setValue:(nullable id)value atIndex:(NSUInteger)index;
+- (void)setValue:(id)value atIndex:(NSUInteger)index;
/*!
@functiongroup Checking _javascript_ Types
@@ -445,13 +443,13 @@
@method
@abstract Compare two JSValues using _javascript_'s <code>===</code> operator.
*/
-- (BOOL)isEqualToObject:(nullable id)value;
+- (BOOL)isEqualToObject:(id)value;
/*!
@method
@abstract Compare two JSValues using _javascript_'s <code>==</code> operator.
*/
-- (BOOL)isEqualWithTypeCoercionToObject:(nullable id)value;
+- (BOOL)isEqualWithTypeCoercionToObject:(id)value;
/*!
@method
@@ -460,7 +458,7 @@
If an object other than a JSValue is passed, it will first be converted according to
the aforementioned rules.
*/
-- (BOOL)isInstanceOf:(nullable id)value;
+- (BOOL)isInstanceOf:(id)value;
/*!
@methodgroup Calling Functions and Constructors
@@ -473,7 +471,7 @@
@param arguments The arguments to pass to the function.
@result The return value of the function call.
*/
-- (JSValue *)callWithArguments:(nullable NSArray *)arguments;
+- (JSValue *)callWithArguments:(NSArray *)arguments;
/*!
@method
@@ -482,7 +480,7 @@
@param arguments The arguments to pass to the constructor.
@result The return value of the constructor call.
*/
-- (JSValue *)constructWithArguments:(nullable NSArray *)arguments;
+- (JSValue *)constructWithArguments:(NSArray *)arguments;
/*!
@method
@@ -494,7 +492,7 @@
@param arguments The arguments to pass to the method.
@result The return value of the method call.
*/
-- (JSValue *)invokeMethod:(NSString *)method withArguments:(nullable NSArray *)arguments;
+- (JSValue *)invokeMethod:(NSString *)method withArguments:(NSArray *)arguments;
@end
@@ -605,8 +603,8 @@
- (JSValue *)objectForKeyedSubscript:(JSValueProperty)key;
- (JSValue *)objectAtIndexedSubscript:(NSUInteger)index;
-- (void)setObject:(nullable id)object forKeyedSubscript:(JSValueProperty)key;
-- (void)setObject:(nullable id)object atIndexedSubscript:(NSUInteger)index;
+- (void)setObject:(id)object forKeyedSubscript:(JSValueProperty)key;
+- (void)setObject:(id)object atIndexedSubscript:(NSUInteger)index;
@end
@@ -693,8 +691,6 @@
} // extern "C"
#endif
-NS_ASSUME_NONNULL_END
-
#endif
#endif // JSValue_h
Modified: tags/Safari-607.1.4.1/Source/_javascript_Core/ChangeLog (235639 => 235640)
--- tags/Safari-607.1.4.1/Source/_javascript_Core/ChangeLog 2018-09-04 21:25:50 UTC (rev 235639)
+++ tags/Safari-607.1.4.1/Source/_javascript_Core/ChangeLog 2018-09-04 21:25:54 UTC (rev 235640)
@@ -1,3 +1,43 @@
+2018-09-04 Babak Shafiei <bshaf...@apple.com>
+
+ Cherry-pick r235465. rdar://problem/43846941
+
+ Unreviewed, rolling out r235432 and r235436.
+ https://bugs.webkit.org/show_bug.cgi?id=189086
+
+ Is a Swift source breaking change. (Requested by keith_miller
+ on #webkit).
+
+ Reverted changesets:
+
+ "Add nullablity attributes to JSValue"
+ https://bugs.webkit.org/show_bug.cgi?id=189047
+ https://trac.webkit.org/changeset/235432
+
+ "Add nullablity attributes to JSValue"
+ https://bugs.webkit.org/show_bug.cgi?id=189047
+ https://trac.webkit.org/changeset/235436
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@235465 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2018-08-29 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r235432 and r235436.
+ https://bugs.webkit.org/show_bug.cgi?id=189086
+
+ Is a Swift source breaking change. (Requested by keith_miller
+ on #webkit).
+
+ Reverted changesets:
+
+ "Add nullablity attributes to JSValue"
+ https://bugs.webkit.org/show_bug.cgi?id=189047
+ https://trac.webkit.org/changeset/235432
+
+ "Add nullablity attributes to JSValue"
+ https://bugs.webkit.org/show_bug.cgi?id=189047
+ https://trac.webkit.org/changeset/235436
+
2018-08-28 Mark Lam <mark....@apple.com>
Fix bit-rotted Interpreter::dumpRegisters() and move it to the VMInspector.
