Changeset 183343 in webkit

Timestamp:

Apr 25, 2015 6:38:31 PM (9 years ago)

Author:

mitz@apple.com

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_INTERNALMAC_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".

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/objc/WebKitAvailability.h (modified) (1 diff)
• WebCore/bindings/scripts/CodeGeneratorObjC.pm (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/mac/MigrateHeadersFromWebKitLegacy.make (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-25  Dan Bernstein  <mitz@apple.com>
+
+        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  <timothy@apple.com>
 

trunk/Source/WebCore/bindings/objc/WebKitAvailability.h

@@ -32 +32 @@
 #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

trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm

@@ -218 +218 @@
 EOF
 
+my $TBDAvailabilityVersion = "9876_5";
+
 # Default constructor
 sub new
@@ -298 +300 @@
     # 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;
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-25  Dan Bernstein  <mitz@apple.com>
+
+        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  <timothy@apple.com>
 

trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make

@@ -203 +203 @@
 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