<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183343] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183343">183343</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2015-04-25 18:38:31 -0700 (Sat, 25 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>
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".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsobjcWebKitAvailabilityh">trunk/Source/WebCore/bindings/objc/WebKitAvailability.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2macMigrateHeadersFromWebKitLegacymake">trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183342 => 183343)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+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.
+
</ins><span class="cx"> 2015-04-25 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Update localized strings.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsobjcWebKitAvailabilityh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/objc/WebKitAvailability.h (183342 => 183343)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,13 +31,15 @@
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><ins>+#ifndef __NSi_9876_5
+#define __NSi_9876_5 introduced=9876.5
+#endif
+
</ins><span class="cx"> #define WEBKIT_AVAILABLE_MAC(introduced) NS_AVAILABLE_MAC(introduced)
</span><span class="cx"> #define WEBKIT_CLASS_AVAILABLE_MAC(introduced) NS_CLASS_AVAILABLE_MAC(introduced)
</span><span class="cx"> #define WEBKIT_ENUM_AVAILABLE_MAC(introduced) NS_ENUM_AVAILABLE_MAC(introduced)
</span><span class="cx"> #define WEBKIT_DEPRECATED_MAC(introduced, deprecated) NS_DEPRECATED_MAC(introduced, deprecated)
</span><span class="cx">
</span><del>-#define __AVAILABILITY_INTERNAL__MAC_TBD __attribute__((availability(macosx,introduced=9876.5)))
-
</del><span class="cx"> #ifndef AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER_BUT_DEPRECATED_IN_MAC_OS_X_VERSION_10_0
</span><span class="cx"> #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
</span><span class="cx"> #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
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorObjCpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorObjC.pm (183342 => 183343)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -217,6 +217,8 @@
</span><span class="cx"> */
</span><span class="cx"> EOF
</span><span class="cx">
</span><ins>+my $TBDAvailabilityVersion = "9876_5";
+
</ins><span class="cx"> # Default constructor
</span><span class="cx"> sub new
</span><span class="cx"> {
</span><span class="lines">@@ -297,7 +299,7 @@
</span><span class="cx">
</span><span class="cx"> # If this class was not found in PublicDOMInterfaces.h then it should be considered as an entirely new public class.
</span><span class="cx"> $newPublicClass = !$found;
</span><del>- $interfaceAvailabilityVersion = "TBD" if $newPublicClass;
</del><ins>+ $interfaceAvailabilityVersion = $TBDAvailabilityVersion if $newPublicClass;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub AddMethodsConstantsAndAttributesFromParentInterfaces
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183342 => 183343)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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".
+
</ins><span class="cx"> 2015-04-24 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Remove native window dock controls
</span></span></pre></div>
<a id="trunkSourceWebKit2macMigrateHeadersFromWebKitLegacymake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/MigrateHeadersFromWebKitLegacy.make (183342 => 183343)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> WEBKIT_LEGACY_HEADER_REPLACE_RULES = -e s/\<WebKitLegacy/\<WebKit/
</span><span class="cx"> WEBKIT_LEGACY_HEADER_MIGRATE_CMD = sed $(WEBKIT_LEGACY_HEADER_REPLACE_RULES) $< > $@
</span><span class="cx">
</span><del>-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
</del><ins>+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
</ins><span class="cx">
</span><span class="cx"> $(PUBLIC_HEADERS_DIR)/% : $(WEBKIT_LEGACY_PRIVATE_HEADERS_DIR)/% MigrateHeadersFromWebKitLegacy.make
</span><span class="cx"> $(PUBLIC_HEADER_CHECK_CMD)
</span></span></pre>
</div>
</div>
</body>
</html>