Title: [183343] trunk/Source
- Revision
- 183343
- Author
- [email protected]
- Date
- 2015-04-25 18:38:31 -0700 (Sat, 25 Apr 2015)
Log Message
Source/WebCore:
WebCore part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
https://bugs.webkit.org/show_bug.cgi?id=144201
Reviewed by Darin Adler.
Instead of TBD, use the high version number to which it corresponds in CFAvailability.h,
9876.5.
* bindings/objc/WebKitAvailability.h: Added a definition of __NSi_9876_5, so that we can
use 9876_5 in availability macros. Removed the definition of
__AVAILABILITY_INTERNAL__MAC_TBD, which will no longer be used.
* bindings/scripts/CodeGeneratorObjC.pm:
(ReadPublicInterfaces): Use 9876_5 instead of TBD.
Source/WebKit2:
WebKit2 part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
https://bugs.webkit.org/show_bug.cgi?id=144201
Reviewed by Darin Adler.
Instead of TBD, we use the high version number to which it corresponds in CFAvailability.h,
9876.5.
* mac/MigrateHeadersFromWebKitLegacy.make: To detect not-yet-available declarations in
headers, look for "9876_5" rather than "TBA".
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (183342 => 183343)
--- trunk/Source/WebCore/ChangeLog 2015-04-26 01:28:51 UTC (rev 183342)
+++ trunk/Source/WebCore/ChangeLog 2015-04-26 01:38:31 UTC (rev 183343)
@@ -1,3 +1,20 @@
+2015-04-25 Dan Bernstein <[email protected]>
+
+ WebCore part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
+ https://bugs.webkit.org/show_bug.cgi?id=144201
+
+ Reviewed by Darin Adler.
+
+ Instead of TBD, use the high version number to which it corresponds in CFAvailability.h,
+ 9876.5.
+
+ * bindings/objc/WebKitAvailability.h: Added a definition of __NSi_9876_5, so that we can
+ use 9876_5 in availability macros. Removed the definition of
+ __AVAILABILITY_INTERNAL__MAC_TBD, which will no longer be used.
+
+ * bindings/scripts/CodeGeneratorObjC.pm:
+ (ReadPublicInterfaces): Use 9876_5 instead of TBD.
+
2015-04-25 Timothy Hatcher <[email protected]>
Update localized strings.
Modified: trunk/Source/WebCore/bindings/objc/WebKitAvailability.h (183342 => 183343)
--- trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2015-04-26 01:28:51 UTC (rev 183342)
+++ trunk/Source/WebCore/bindings/objc/WebKitAvailability.h 2015-04-26 01:38:31 UTC (rev 183343)
@@ -31,13 +31,15 @@
#if !TARGET_OS_IPHONE
#import <Foundation/Foundation.h>
+#ifndef __NSi_9876_5
+#define __NSi_9876_5 introduced=9876.5
+#endif
+
#define WEBKIT_AVAILABLE_MAC(introduced) NS_AVAILABLE_MAC(introduced)
#define WEBKIT_CLASS_AVAILABLE_MAC(introduced) NS_CLASS_AVAILABLE_MAC(introduced)
#define WEBKIT_ENUM_AVAILABLE_MAC(introduced) NS_ENUM_AVAILABLE_MAC(introduced)
#define WEBKIT_DEPRECATED_MAC(introduced, deprecated) NS_DEPRECATED_MAC(introduced, deprecated)
-#define __AVAILABILITY_INTERNAL__MAC_TBD __attribute__((availability(macosx,introduced=9876.5)))
-
#ifndef AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0
#define AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0 DEPRECATED_IN_MAC_OS_X_VERSION_10_0_AND_LATER
#define AVAILABLE_MAC_OS_X_VERSION_10_1_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_1 DEPRECATED_IN_MAC_OS_X_VERSION_10_1_AND_LATER
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (183342 => 183343)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-04-26 01:28:51 UTC (rev 183342)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm 2015-04-26 01:38:31 UTC (rev 183343)
@@ -217,6 +217,8 @@
*/
EOF
+my $TBDAvailabilityVersion = "9876_5";
+
# Default constructor
sub new
{
@@ -297,7 +299,7 @@
# If this class was not found in PublicDOMInterfaces.h then it should be considered as an entirely new public class.
$newPublicClass = !$found;
- $interfaceAvailabilityVersion = "TBD" if $newPublicClass;
+ $interfaceAvailabilityVersion = $TBDAvailabilityVersion if $newPublicClass;
}
sub AddMethodsConstantsAndAttributesFromParentInterfaces
Modified: trunk/Source/WebKit2/ChangeLog (183342 => 183343)
--- trunk/Source/WebKit2/ChangeLog 2015-04-26 01:28:51 UTC (rev 183342)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-26 01:38:31 UTC (rev 183343)
@@ -1,3 +1,16 @@
+2015-04-25 Dan Bernstein <[email protected]>
+
+ WebKit2 part of <rdar://problem/20697966> Avoid using TBD as an argument to NS_AVAILABLE
+ https://bugs.webkit.org/show_bug.cgi?id=144201
+
+ Reviewed by Darin Adler.
+
+ Instead of TBD, we use the high version number to which it corresponds in CFAvailability.h,
+ 9876.5.
+
+ * mac/MigrateHeadersFromWebKitLegacy.make: To detect not-yet-available declarations in
+ headers, look for "9876_5" rather than "TBA".
+
2015-04-24 Timothy Hatcher <[email protected]>
Web Inspector: Remove native window dock controls
Modified: trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make (183342 => 183343)
--- trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make 2015-04-26 01:28:51 UTC (rev 183342)
+++ trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make 2015-04-26 01:38:31 UTC (rev 183343)
@@ -202,7 +202,7 @@
WEBKIT_LEGACY_HEADER_REPLACE_RULES = -e s/\<WebKitLegacy/\<WebKit/
WEBKIT_LEGACY_HEADER_MIGRATE_CMD = sed $(WEBKIT_LEGACY_HEADER_REPLACE_RULES) $< > $@
-PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*TBD" "$<"; then line=$$(awk "/AVAILABLE.*TBD/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
+PUBLIC_HEADER_CHECK_CMD = @if grep -q "AVAILABLE.*9876_5" "$<"; then line=$$(awk "/AVAILABLE.*9876_5/ { print FNR; exit }" "$<" ); echo "$<:$$line: error: A class within a public header has unspecified availability."; false; fi
$(PUBLIC_HEADERS_DIR)/% : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/% MigrateHeadersFromWebKitLegacy.make
$(PUBLIC_HEADER_CHECK_CMD)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
