Changeset 185803 in webkit

Timestamp:

Jun 20, 2015, 8:27:20 PM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Actually use Objective-C lightweight generics when the compiler supports them
​https://bugs.webkit.org/show_bug.cgi?id=146183

Reviewed by Sam Weinig.

• Shared/API/Cocoa/WKFoundation.h: When the compiler supports Objective-C generics, define

WK_ARRAY and WK_SET to use them. Also added a definition of WK_DICTIONARY.

• UIProcess/API/Cocoa/WKWebViewPrivate.h: Use WK_DICTIONARY for the options dictionary of

-_loadRequest:withOptions:.

• UIProcess/API/Cocoa/WKWebsiteDataStore.mm:

(-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]): Made the completion
halder type match the declaration, now that NSArray and WK_ARRAY(WKWebsiteDataRecord *) are
not the same.

• mac/postprocess-framework-headers.sh: Also rewrite WK_DICTIONARY.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKFoundation.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebsiteDataStore.mm (modified) (1 diff)
• mac/postprocess-framework-headers.sh (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-20  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Actually use Objective-C lightweight generics when the compiler supports them
+        https://bugs.webkit.org/show_bug.cgi?id=146183
+
+        Reviewed by Sam Weinig.
+
+        * Shared/API/Cocoa/WKFoundation.h: When the compiler supports Objective-C generics, define
+        WK_ARRAY and WK_SET to use them. Also added a definition of WK_DICTIONARY.
+
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h: Use WK_DICTIONARY for the options dictionary of
+        -_loadRequest:withOptions:.
+
+        * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+        (-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]): Made the completion
+        halder type match the declaration, now that NSArray and WK_ARRAY(WKWebsiteDataRecord *) are
+        not the same.
+
+        * mac/postprocess-framework-headers.sh: Also rewrite WK_DICTIONARY.
+
 2015-06-20  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

@@ -50 +50 @@
 #define WK_ENUM_AVAILABLE_IOS(_ios)
 
+#if __has_feature(objc_generics)
+
+#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
 
 #ifndef __NSi_8_3

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -206 +206 @@
 @property (nonatomic, readonly) NSArray *_scrollPerformanceData WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
-- (WKNavigation *)_loadRequest:(NSURLRequest *)request withOptions:(NSDictionary *)loadOptions WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+- (WKNavigation *)_loadRequest:(NSURLRequest *)request withOptions:(WK_DICTIONARY(NSString *, id) *)loadOptions WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
 
 @end

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm

@@ -75 +75 @@
 }
 
-- (void)fetchDataRecordsOfTypes:(NSSet *)dataTypes completionHandler:(void (^)(NSArray *))completionHandler
+- (void)fetchDataRecordsOfTypes:(NSSet *)dataTypes completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler
 {
     auto completionHandlerCopy = Block_copy(completionHandler);

trunk/Source/WebKit2/mac/postprocess-framework-headers.sh

@@ -60 +60 @@
     SED_OPTIONS=(
         -e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g'
+        -e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
         -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
         -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/