Diff
Modified: trunk/Source/WebKit2/ChangeLog (202757 => 202758)
--- trunk/Source/WebKit2/ChangeLog 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-01 21:43:04 UTC (rev 202758)
@@ -1,3 +1,61 @@
+2016-07-01 Dan Bernstein <[email protected]>
+
+ [Mac] Get rid of support for old SDKs
+ https://bugs.webkit.org/show_bug.cgi?id=159369
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKFoundation.h: Removed the WK_ARRAY, WK_DICTIONARY, and WK_SET macros,
+ which were only needed for pre-10.11 SDKs.
+
+ * Shared/mac/WebEventFactory.mm:
+ (WebKit::mouseButtonForEvent): Removed checking for pre-10.10.3 SDKs.
+ (WebKit::globalPointForEvent): Ditto.
+ (WebKit::pointForEvent): Ditto.
+ (WebKit::WebEventFactory::createWebMouseEvent): Ditto.
+
+ * UIProcess/API/Cocoa/WKBackForwardList.h: Replaced WK_ARRAY(...) with NSArray<...>.
+
+ * UIProcess/API/Cocoa/WKPreferences.mm: Ditto.
+ (-[WKPreferences _setFixedPitchFontFamily:]):
+ (+[WKPreferences _experimentalFeatures]):
+ * UIProcess/API/Cocoa/WKPreferencesPrivate.h: Ditto.
+
+ * UIProcess/API/Cocoa/WKUIDelegate.h: Ditto.
+ * UIProcess/API/Cocoa/WKUIDelegatePrivate.h: Ditto.
+
+ * UIProcess/API/Cocoa/WKUserContentController.h: Ditto.
+ * UIProcess/API/Cocoa/WKUserContentControllerPrivate.h: Ditto.
+
+ * UIProcess/API/Cocoa/WKUserScriptPrivate.h: Ditto.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.h: Replaced WK_SET(...) with NSSet<...>.
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h: Ditto.
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm: Ditto.
+ (-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
+ (-[WKWebsiteDataStore _fetchDataRecordsOfTypes:withOptions:completionHandler:]):
+
+ * UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h: Ditto.
+
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h: Replaced WK_ARRAY(...) with NSArray<...>.
+
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.h: Ditto.
+ * UIProcess/API/Cocoa/_WKUserStyleSheet.mm: Ditto.
+ (-[_WKUserStyleSheet initWithSource:forMainFrameOnly:]):
+ (-[_WKUserStyleSheet initWithSource:forMainFrameOnly:legacyWhitelist:legacyBlacklist:userContentWorld:]):
+ (-[_WKUserStyleSheet initWithSource:forMainFrameOnly:legacyWhitelist:legacyBlacklist:baseURL:userContentWorld:]):
+
+ * UIProcess/API/Cocoa/_WKWebsiteDataSize.h: Replaced WK_SET(...) with NSSet<...>.
+
+ * UIProcess/Cocoa/WebViewImpl.mm:
+ (WebKit::WebViewImpl::pressureChangeWithEvent): Removed checking for pre-10.10.3 SDKs.
+
+ * WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h: Replaced WK_ARRAY(...) with
+ NSArray<...>.
+
+ * mac/postprocess-framework-headers.sh: Removed sed rules for WK_ARRAY, WK_DICTIONARY and
+ WK_SET.
+
2016-07-01 Chris Dumez <[email protected]>
[iOS] Possible null Range dereference under computeAutocorrectionContext()
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (202757 => 202758)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -50,19 +50,4 @@
#define WK_ENUM_AVAILABLE_IOS(_ios)
#define WK_ENUM_DEPRECATED(_macIntro, _macDep, _iosIntro, _iosDep, ...) __attribute__((deprecated(__VA_ARGS__)))
-#if __has_feature(objc_generics) && (!defined(__MAC_OS_X_VERSION_MAX_ALLOWED) || __MAC_OS_X_VERSION_MAX_ALLOWED >= 101100)
-
-#define WK_ARRAY(_objectType) NSArray<_objectType>
-#define WK_DICTIONARY(_keyType, _valueType) NSDictionary<_keyType, _valueType>
-#define WK_SET(_objectType) NSSet<_objectType>
-
-#else
-
-#define WK_ARRAY(...) NSArray
-#define WK_DICTIONARY(...) NSDictionary
-#define WK_SET(...) NSSet
-
#endif
-
-#endif
-
Modified: trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm (202757 => 202758)
--- trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/Shared/mac/WebEventFactory.mm 2016-07-01 21:43:04 UTC (rev 202758)
@@ -78,7 +78,7 @@
case NSOtherMouseUp:
case NSOtherMouseDragged:
return WebMouseEvent::MiddleButton;
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
case NSEventTypePressure:
#endif
case NSMouseEntered:
@@ -140,7 +140,7 @@
static NSPoint globalPointForEvent(NSEvent *event)
{
switch ([event type]) {
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
case NSEventTypePressure:
#endif
#pragma clang diagnostic push
@@ -168,7 +168,7 @@
static NSPoint pointForEvent(NSEvent *event, NSView *windowView)
{
switch ([event type]) {
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
case NSEventTypePressure:
#endif
#pragma clang diagnostic push
@@ -375,7 +375,7 @@
NSPoint globalPosition = globalPointForEvent(event);
WebEvent::Type type = mouseEventTypeForEvent(event);
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
if ([event type] == NSEventTypePressure) {
// Since AppKit doesn't send mouse events for force down or force up, we have to use the current pressure
// event and lastPressureEvent to detect if this is MouseForceDown, MouseForceUp, or just MouseForceChanged.
@@ -399,7 +399,7 @@
int menuTypeForEvent = typeForEvent(event);
double force = 0;
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
int stage = [event type] == NSEventTypePressure ? event.stage : lastPressureEvent.stage;
double pressure = [event type] == NSEventTypePressure ? event.pressure : lastPressureEvent.pressure;
force = pressure + stage;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -65,13 +65,13 @@
@discussion The items are in the order in which they were originally
visited.
*/
-@property (nonatomic, readonly, copy) WK_ARRAY(WKBackForwardListItem *) *backList;
+@property (nonatomic, readonly, copy) NSArray<WKBackForwardListItem *> *backList;
/*! @abstract The portion of the list following the current item.
@discussion The items are in the order in which they were originally
visited.
*/
-@property (nonatomic, readonly, copy) WK_ARRAY(WKBackForwardListItem *) *forwardList;
+@property (nonatomic, readonly, copy) NSArray<WKBackForwardListItem *> *forwardList;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-07-01 21:43:04 UTC (rev 202758)
@@ -433,7 +433,7 @@
_preferences->setFixedFontFamily(fixedPitchFontFamily);
}
-+ (WK_ARRAY(_WKExperimentalFeature *) *)_experimentalFeatures
++ (NSArray<_WKExperimentalFeature *> *)_experimentalFeatures
{
auto features = WebKit::WebPreferences::experimentalFeatures();
return [wrapper(API::Array::create(WTFMove(features)).leakRef()) autorelease];
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferencesPrivate.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -88,7 +88,7 @@
@property (nonatomic, setter=_setOfflineApplicationCacheIsEnabled:) BOOL _offlineApplicationCacheIsEnabled;
@property (nonatomic, setter=_setFullScreenEnabled:) BOOL _fullScreenEnabled WK_AVAILABLE(10_11, 9_0);
-+ (WK_ARRAY(_WKExperimentalFeature *) *)_experimentalFeatures WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
++ (NSArray<_WKExperimentalFeature *> *)_experimentalFeatures WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (BOOL)_isEnabledForFeature:(_WKExperimentalFeature *)feature WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_setEnabled:(BOOL)value forFeature:(_WKExperimentalFeature *)feature WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -164,7 +164,7 @@
If you do not implement this method, the web view will behave as if the user selected the Cancel button.
*/
-- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(WK_ARRAY(NSURL *) * _Nullable URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
+- (void)webView:(WKWebView *)webView runOpenPanelWithParameters:(WKOpenPanelParameters *)parameters initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(NSArray<NSURL *> * _Nullable URLs))completionHandler WK_AVAILABLE(WK_MAC_TBA, NA);
#endif
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -60,7 +60,7 @@
- (NSDictionary *)_dataDetectionContextForWebView:(WKWebView *)webView WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
#if TARGET_OS_IPHONE
- (BOOL)_webView:(WKWebView *)webView shouldIncludeAppLinkActionsForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, 9_0);
-- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(WK_ARRAY(_WKElementAction *) *)defaultActions;
+- (NSArray *)_webView:(WKWebView *)webView actionsForElement:(_WKActivatedElementInfo *)element defaultActions:(NSArray<_WKElementAction *> *)defaultActions;
- (void)_webView:(WKWebView *)webView didNotHandleTapAsClickAtPoint:(CGPoint)point;
- (BOOL)_webView:(WKWebView *)webView shouldRequestGeolocationAuthorizationForURL:(NSURL *)url isMainFrame:(BOOL)isMainFrame mainFrameURL:(NSURL *)mainFrameURL;
- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url WK_AVAILABLE(NA, 9_0);
@@ -74,8 +74,8 @@
- (NSArray *)_attachmentListForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA);
- (NSUInteger)_webView:(WKWebView *)webView indexIntoAttachmentListForElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA);
- (UIEdgeInsets)_webView:(WKWebView *)webView finalObscuredInsetsForScrollView:(UIScrollView *)scrollView withVelocity:(CGPoint)velocity targetContentOffset:(inout CGPoint *)targetContentOffset WK_AVAILABLE(NA, 9_0);
-- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(WK_ARRAY(_WKElementAction *) *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_AVAILABLE(NA, 9_0);
-- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(WK_ARRAY(_WKElementAction *) *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_AVAILABLE(NA, 9_0);
+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo WK_AVAILABLE(NA, 9_0);
+- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray<_WKElementAction *> *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_AVAILABLE(NA, 9_0);
- (UIViewController *)_presentingViewControllerForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA);
#else
- (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element WK_AVAILABLE(WK_MAC_TBA, NA);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -45,7 +45,7 @@
/*! @abstract The user scripts associated with this user content
controller.
*/
-@property (nonatomic, readonly, copy) WK_ARRAY(WKUserScript *) *userScripts;
+@property (nonatomic, readonly, copy) NSArray<WKUserScript *> *userScripts;
/*! @abstract Adds a user script.
@param userScript The user script to add.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentControllerPrivate.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -41,7 +41,7 @@
- (void)_removeUserContentFilter:(NSString *)userContentFilterName WK_AVAILABLE(10_11, 9_0);
- (void)_removeAllUserContentFilters WK_AVAILABLE(10_11, 9_0);
-@property (nonatomic, readonly, copy) WK_ARRAY(_WKUserStyleSheet *) *_userStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, readonly, copy) NSArray<_WKUserStyleSheet *> *_userStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_addUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_removeUserStyleSheet:(_WKUserStyleSheet *)userStyleSheet WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (void)_removeAllUserStyleSheets WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserScriptPrivate.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -33,8 +33,8 @@
@interface WKUserScript (WKPrivate)
-- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist associatedURL:(NSURL *)associatedURL userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (instancetype)_initWithSource:(NSString *)source injectionTime:(WKUserScriptInjectionTime)injectionTime forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist associatedURL:(NSURL *)associatedURL userContentWorld:(_WKUserContentWorld *)userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic, readonly) _WKUserContentWorld *_userContentWorld WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -63,7 +63,7 @@
@property (nonatomic, readonly, copy) NSString *displayName;
/*! @abstract The various types of website data that exist for this data record. */
-@property (nonatomic, readonly, copy) WK_SET(NSString *) *dataTypes;
+@property (nonatomic, readonly, copy) NSSet<NSString *> *dataTypes;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -53,13 +53,13 @@
@property (nonatomic, readonly, getter=isPersistent) BOOL persistent;
/*! @abstract Returns a set of all available website data types. */
-+ (WK_SET(NSString *) *)allWebsiteDataTypes;
++ (NSSet<NSString *> *)allWebsiteDataTypes;
/*! @abstract Fetches data records containing the given website data types.
@param dataTypes The website data types to fetch records for.
@param completionHandler A block to invoke when the data records have been fetched.
*/
-- (void)fetchDataRecordsOfTypes:(WK_SET(NSString *) *)dataTypes completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler;
+- (void)fetchDataRecordsOfTypes:(NSSet<NSString *> *)dataTypes completionHandler:(void (^)(NSArray<WKWebsiteDataRecord *> *))completionHandler;
/*! @abstract Removes website data of the given types for the given data records.
@param dataTypes The website data types that should be removed.
@@ -66,7 +66,7 @@
@param dataRecords The website data records to delete website data for.
@param completionHandler A block to invoke when the website data for the records has been removed.
*/
-- (void)removeDataOfTypes:(WK_SET(NSString *) *)dataTypes forDataRecords:(WK_ARRAY(WKWebsiteDataRecord *) *)dataRecords completionHandler:(void (^)(void))completionHandler;
+- (void)removeDataOfTypes:(NSSet<NSString *> *)dataTypes forDataRecords:(NSArray<WKWebsiteDataRecord *> *)dataRecords completionHandler:(void (^)(void))completionHandler;
/*! @abstract Removes all website data of the given types that has been modified since the given date.
@param dataTypes The website data types that should be removed.
@@ -73,7 +73,7 @@
@param date A date. All website data modified after this date will be removed.
@param completionHandler A block to invoke when the website data has been removed.
*/
-- (void)removeDataOfTypes:(WK_SET(NSString *) *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
+- (void)removeDataOfTypes:(NSSet<NSString *> *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2016-07-01 21:43:04 UTC (rev 202758)
@@ -102,7 +102,7 @@
return system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date.timeIntervalSince1970)));
}
-- (void)fetchDataRecordsOfTypes:(NSSet *)dataTypes completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler
+- (void)fetchDataRecordsOfTypes:(NSSet *)dataTypes completionHandler:(void (^)(NSArray<WKWebsiteDataRecord *> *))completionHandler
{
[self _fetchDataRecordsOfTypes:dataTypes withOptions:0 completionHandler:completionHandler];
}
@@ -145,7 +145,7 @@
@implementation WKWebsiteDataStore (WKPrivate)
-- (void)_fetchDataRecordsOfTypes:(WK_SET(NSString *) *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler
+- (void)_fetchDataRecordsOfTypes:(NSSet<NSString *> *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(NSArray<WKWebsiteDataRecord *> *))completionHandler
{
auto completionHandlerCopy = makeBlockPtr(completionHandler);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStorePrivate.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -35,7 +35,7 @@
@interface WKWebsiteDataStore (WKPrivate)
-- (void)_fetchDataRecordsOfTypes:(WK_SET(NSString *) *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler;
+- (void)_fetchDataRecordsOfTypes:(NSSet<NSString *> *)dataTypes withOptions:(_WKWebsiteDataStoreFetchOptions)options completionHandler:(void (^)(NSArray<WKWebsiteDataRecord *> *))completionHandler;
@property (nonatomic, setter=_setResourceLoadStatisticsEnabled:) BOOL _resourceLoadStatisticsEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -35,7 +35,7 @@
@property (nonatomic) NSUInteger maximumProcessCount;
@property (nonatomic) NSInteger diskCacheSizeOverride WK_AVAILABLE(10_11, 9_0);
@property (nonatomic, copy) NSArray *cachePartitionedURLSchemes;
-@property (nonatomic, copy) WK_ARRAY(NSString *) *alwaysRevalidatedURLSchemes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, copy) NSArray<NSString *> *alwaysRevalidatedURLSchemes WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@property (nonatomic) BOOL diskCacheSpeculativeValidationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -43,8 +43,8 @@
@property (nonatomic, readonly, getter=isForMainFrameOnly) BOOL forMainFrameOnly;
- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly;
-- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld;
-- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist baseURL:(NSURL *)baseURL userContentWorld:(_WKUserContentWorld *)userContentWorld;
+- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld;
+- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist baseURL:(NSURL *)baseURL userContentWorld:(_WKUserContentWorld *)userContentWorld;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKUserStyleSheet.mm 2016-07-01 21:43:04 UTC (rev 202758)
@@ -49,7 +49,7 @@
return self;
}
-- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
+- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist userContentWorld:(_WKUserContentWorld *)userContentWorld
{
if (!(self = [super init]))
return nil;
@@ -62,7 +62,7 @@
return self;
}
-- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(WK_ARRAY(NSString *) *)legacyWhitelist legacyBlacklist:(WK_ARRAY(NSString *) *)legacyBlacklist baseURL:(NSURL *)baseURL userContentWorld:(_WKUserContentWorld *)userContentWorld
+- (instancetype)initWithSource:(NSString *)source forMainFrameOnly:(BOOL)forMainFrameOnly legacyWhitelist:(NSArray<NSString *> *)legacyWhitelist legacyBlacklist:(NSArray<NSString *> *)legacyBlacklist baseURL:(NSURL *)baseURL userContentWorld:(_WKUserContentWorld *)userContentWorld
{
if (!(self = [super init]))
return nil;
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataSize.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -36,7 +36,7 @@
@property (nonatomic, readonly) unsigned long long totalSize;
-- (unsigned long long)sizeOfDataTypes:(WK_SET(NSString *) *)dataTypes;
+- (unsigned long long)sizeOfDataTypes:(NSSet<NSString *> *)dataTypes;
@end
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm (202757 => 202758)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebViewImpl.mm 2016-07-01 21:43:04 UTC (rev 202758)
@@ -1579,7 +1579,7 @@
void WebViewImpl::pressureChangeWithEvent(NSEvent *event)
{
-#if defined(__LP64__) && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101003
+#if defined(__LP64__)
if (event == m_lastPressureEvent)
return;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h (202757 => 202758)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/Cocoa/WKWebProcessPlugInFrame.h 2016-07-01 21:43:04 UTC (rev 202758)
@@ -47,8 +47,8 @@
// Returns URLs ordered by resolution in descending order.
// FIXME: These should be tagged nonnull.
-@property (nonatomic, readonly) WK_ARRAY(NSURL *) *appleTouchIconURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-@property (nonatomic, readonly) WK_ARRAY(NSURL *) *faviconURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, readonly) NSArray<NSURL *> *appleTouchIconURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+@property (nonatomic, readonly) NSArray<NSURL *> *faviconURLs WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
- (JSContext *)jsContextForWorld:(WKWebProcessPlugInScriptWorld *)world;
- (WKWebProcessPlugInHitTestResult *)hitTest:(CGPoint)point;
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (202757 => 202758)
--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-07-01 20:59:08 UTC (rev 202757)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-07-01 21:43:04 UTC (rev 202758)
@@ -58,9 +58,6 @@
fi
SED_OPTIONS=(
- -e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g'
- -e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
- -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
)
if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
