Changeset 183152 in webkit


Ignore:
Timestamp:
Apr 22, 2015 4:19:22 PM (9 years ago)
Author:
andersca@apple.com
Message:

Add WK_ARRAY and WK_SET annotations
https://bugs.webkit.org/show_bug.cgi?id=144075
rdar://problem/19417770

Reviewed by Dan Bernstein.

  • Shared/API/Cocoa/WKFoundation.h:
  • UIProcess/API/Cocoa/WKBackForwardList.h:
  • UIProcess/API/Cocoa/WKUserContentController.h:
  • UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
  • UIProcess/API/Cocoa/WKWebsiteDataStore.h:
  • mac/postprocess-framework-headers.sh:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r183140 r183152  
     12015-04-22  Anders Carlsson  <andersca@apple.com>
     2
     3        Add WK_ARRAY and WK_SET annotations
     4        https://bugs.webkit.org/show_bug.cgi?id=144075
     5        rdar://problem/19417770
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Shared/API/Cocoa/WKFoundation.h:
     10        * UIProcess/API/Cocoa/WKBackForwardList.h:
     11        * UIProcess/API/Cocoa/WKUserContentController.h:
     12        * UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
     13        * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
     14        * mac/postprocess-framework-headers.sh:
     15
    1162015-04-22  Brent Fulgham  <bfulgham@apple.com>
    217
  • trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

    r182930 r183152  
    5454#define WK_ENUM_AVAILABLE(_mac, _ios)
    5555#define WK_ENUM_AVAILABLE_IOS(_ios)
     56
     57#define WK_ARRAY(...) NSArray
     58#define WK_SET(...) NSSet
    5659
    5760#ifndef __NSi_8_3
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h

    r180146 r183152  
    6666 visited.
    6767 */
    68 @property (nonatomic, readonly, copy) NSArray *backList;
     68@property (nonatomic, readonly, copy) WK_ARRAY(WKBackForwardListItem *) *backList;
    6969
    7070/*! @abstract The portion of the list following the current item.
     
    7272 visited.
    7373 */
    74 @property (nonatomic, readonly, copy) NSArray *forwardList;
     74@property (nonatomic, readonly, copy) WK_ARRAY(WKBackForwardListItem *) *forwardList;
    7575
    7676@end
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUserContentController.h

    r180162 r183152  
    4646 controller.
    4747*/
    48 @property (nonatomic, readonly, copy) NSArray *userScripts;
     48@property (nonatomic, readonly, copy) WK_ARRAY(WKUserScript *) *userScripts;
    4949
    5050/*! @abstract Adds a user script.
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h

    r183093 r183152  
    4646@property (nonatomic, readonly, copy) NSString *displayName;
    4747
    48 @property (nonatomic, readonly, copy) NSSet *dataTypes;
     48@property (nonatomic, readonly, copy) WK_SET(NSString *) *dataTypes;
    4949
    5050@end
  • trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h

    r183070 r183152  
    4545@property (readonly, getter=isNonPersistent) BOOL nonPersistent;
    4646
    47 + (NSSet *)allWebsiteDataTypes;
     47+ (WK_SET(NSString *) *)allWebsiteDataTypes;
    4848
    49 - (void)fetchDataRecordsOfTypes:(NSSet *)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
    50 - (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)(void))completionHandler;
    51 - (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
     49- (void)fetchDataRecordsOfTypes:(WK_SET(NSString *) *)websiteDataTypes completionHandler:(void (^)(WK_ARRAY(WKWebsiteDataRecord *) *))completionHandler;
     50- (void)removeDataOfTypes:(WK_SET(NSString *) *)websiteDataTypes forDataRecords:(WK_ARRAY(WKWebsiteDataRecord *) *)dataRecords completionHandler:(void (^)(void))completionHandler;
     51- (void)removeDataOfTypes:(WK_SET(NSString *) *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
    5252
    5353@end
  • trunk/Source/WebKit2/mac/postprocess-framework-headers.sh

    r183080 r183152  
    6767            fi
    6868
    69             sed -i .tmp -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ ${OTHER_SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
     69            sed -i .tmp -E -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/^WK_CLASS_DEPRECATED/NS_CLASS_DEPRECATED/ -e s/WK_DEPRECATED/NS_DEPRECATED/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ -e s/WK_ASSUME_NONNULL_BEGIN/NS_ASSUME_NONNULL_BEGIN/ -e s/WK_ASSUME_NONNULL_END/NS_ASSUME_NONNULL_END/ -e s/WK_NULLABLE_PROPERTY/nullable,/ -e s/WK_NULLABLE_SPECIFIER/__nullable/g -e s/WK_NULLABLE/nullable/g -e s/WK_NULL_UNSPECIFIED/null_unspecified/ ${OTHER_SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
    7070            mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
    7171        fi
     
    7474
    7575DEFINITIONS_PATH=usr/local/include/WebKitAdditions/Scripts/postprocess-framework-headers-definitions
     76
     77# FIXME: Remove this.
     78OTHER_SED_OPTIONS=(-e 's/WK_SET\([^\)]+\)/NSSet/g' -e 's/WK_ARRAY\([^\)]+\)/NSArray/g')
     79
    7680process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_definitions "${SDKROOT}/${DEFINITIONS_PATH}"
    7781
Note: See TracChangeset for help on using the changeset viewer.