Title: [185347] trunk/Source/WebKit2
- Revision
- 185347
- Author
- [email protected]
- Date
- 2015-06-08 19:31:27 -0700 (Mon, 08 Jun 2015)
Log Message
[Cocoa] Use generics in framework headers
https://bugs.webkit.org/show_bug.cgi?id=145781
Reviewed by Sam Weinig.
* mac/postprocess-framework-headers.sh: Use the parameter to WK_ARRAY and WK_SET.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (185346 => 185347)
--- trunk/Source/WebKit2/ChangeLog 2015-06-09 02:17:48 UTC (rev 185346)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 02:31:27 UTC (rev 185347)
@@ -1,3 +1,12 @@
+2015-06-08 Dan Bernstein <[email protected]>
+
+ [Cocoa] Use generics in framework headers
+ https://bugs.webkit.org/show_bug.cgi?id=145781
+
+ Reviewed by Sam Weinig.
+
+ * mac/postprocess-framework-headers.sh: Use the parameter to WK_ARRAY and WK_SET.
+
2015-06-08 Chris Dumez <[email protected]>
Access GCController instance via GCController::singleton() instead of a free function
Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (185346 => 185347)
--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-06-09 02:17:48 UTC (rev 185346)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-06-09 02:31:27 UTC (rev 185347)
@@ -66,7 +66,7 @@
sed -i .tmp -E -e 's/WK_(CLASS_|ENUM_)?AVAILABLE(_IOS|_MAC)?\(.+\)//g' -e 's/WK_(CLASS_)?DEPRECATED\(.+\)//g' ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
fi
- 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 $_
+ 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/ -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g' -e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g' ${OTHER_SED_OPTIONS[*]} ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH
fi
done
@@ -74,9 +74,6 @@
DEFINITIONS_PATH=usr/local/include/WebKitAdditions/Scripts/postprocess-framework-headers-definitions
-# FIXME: Remove this.
-OTHER_SED_OPTIONS=(-e 's/WK_SET\([^\)]+\)/NSSet/g' -e 's/WK_ARRAY\([^\)]+\)/NSArray/g')
-
process_definitions "${BUILT_PRODUCTS_DIR}/${DEFINITIONS_PATH}" || process_definitions "${SDKROOT}/${DEFINITIONS_PATH}"
rewrite_headers ${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
