Title: [183249] tags/Safari-601.1.28.2/Source/WebKit2
- Revision
- 183249
- Author
- [email protected]
- Date
- 2015-04-23 22:56:18 -0700 (Thu, 23 Apr 2015)
Log Message
Merged r183245. rdar://problem/20680694
Modified Paths
Diff
Modified: tags/Safari-601.1.28.2/Source/WebKit2/ChangeLog (183248 => 183249)
--- tags/Safari-601.1.28.2/Source/WebKit2/ChangeLog 2015-04-24 05:51:58 UTC (rev 183248)
+++ tags/Safari-601.1.28.2/Source/WebKit2/ChangeLog 2015-04-24 05:56:18 UTC (rev 183249)
@@ -1,3 +1,15 @@
+2015-04-23 Babak Shafiei <[email protected]>
+
+ Merge r183245.
+
+ 2015-04-23 Dan Bernstein <[email protected]>
+
+ Fixed a bug where framework header postprocessing wasn’t removing WK_DEPRECATED macros when it should have.
+
+ Reviewed by Andy Estes.
+
+ * mac/postprocess-framework-headers.sh:
+
2015-04-21 Eric Carlson <[email protected]>
[Mac] Use one playback target for all web processes
Modified: tags/Safari-601.1.28.2/Source/WebKit2/mac/postprocess-framework-headers.sh (183248 => 183249)
--- tags/Safari-601.1.28.2/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-04-24 05:51:58 UTC (rev 183248)
+++ tags/Safari-601.1.28.2/Source/WebKit2/mac/postprocess-framework-headers.sh 2015-04-24 05:56:18 UTC (rev 183249)
@@ -63,7 +63,7 @@
if [[ -n "$OSX_VERSION" ]] && [[ -n "$IOS_VERSION" ]]; then
sed -i .tmp -e s/WK_MAC_TBA/${OSX_VERSION}/g -e s/WK_IOS_TBA/${IOS_VERSION}/g ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_
else
- 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 $_
+ 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 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 $_
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
