<!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>[169356] trunk/Source/WebKit2</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/169356">169356</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-05-26 11:00:47 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Rewrite WK_DESIGNATED_INITIALIZER in installed headers
https://bugs.webkit.org/show_bug.cgi?id=133290
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKFoundation.h: When WK_API_AVAILABILITY_ENABLED is defined, don’t
provide definitions of WK_DESIGNATED_INITIALIZER and WK_UNAVAILABLE, since those macros will
be rewritten out of the headers. When WK_API_AVAILABILITY_ENABLED isn’t defined, provide
definitions of the other two macros as appropriate for the target OS.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Removed WK_DESIGNATED_INITIALIZER from a
category method declaration.
* UIProcess/API/Cocoa/WKWebView.h: Mark the superclass designated initializer
-initWithCoder: as unavailable.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithCoder:]): Override this designated initializer of the superclass by
returning nil.
* mac/rewrite-availability-macros.sh: Rewrite WK_DESIGNATED_INITIALIZER to
NS_DESIGNATED_INITIALIZER and WK_UNAVAILABLE to NS_UNAVAILABLE. Also make sure to process
all headers if the script has changed since the last time it was run.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKFoundationh">trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2macrewriteavailabilitymacrossh">trunk/Source/WebKit2/mac/rewrite-availability-macros.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169355 => 169356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-26 17:45:08 UTC (rev 169355)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-26 18:00:47 UTC (rev 169356)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-05-26 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Rewrite WK_DESIGNATED_INITIALIZER in installed headers
+ https://bugs.webkit.org/show_bug.cgi?id=133290
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKFoundation.h: When WK_API_AVAILABILITY_ENABLED is defined, don’t
+ provide definitions of WK_DESIGNATED_INITIALIZER and WK_UNAVAILABLE, since those macros will
+ be rewritten out of the headers. When WK_API_AVAILABILITY_ENABLED isn’t defined, provide
+ definitions of the other two macros as appropriate for the target OS.
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h: Removed WK_DESIGNATED_INITIALIZER from a
+ category method declaration.
+ * UIProcess/API/Cocoa/WKWebView.h: Mark the superclass designated initializer
+ -initWithCoder: as unavailable.
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithCoder:]): Override this designated initializer of the superclass by
+ returning nil.
+ * mac/rewrite-availability-macros.sh: Rewrite WK_DESIGNATED_INITIALIZER to
+ NS_DESIGNATED_INITIALIZER and WK_UNAVAILABLE to NS_UNAVAILABLE. Also make sure to process
+ all headers if the script has changed since the last time it was run.
+
</ins><span class="cx"> 2014-05-26 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r169122.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (169355 => 169356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-05-26 17:45:08 UTC (rev 169355)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2014-05-26 18:00:47 UTC (rev 169356)
</span><span class="lines">@@ -47,13 +47,19 @@
</span><span class="cx">
</span><span class="cx"> #if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
</span><span class="cx">
</span><ins>+#define WK_DESIGNATED_INITIALIZER
+#define WK_UNAVAILABLE
+
</ins><span class="cx"> #ifdef __OBJC__
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx"> typedef NSUInteger NSEventModifierFlags;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#else
+
+#define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
+#define WK_UNAVAILABLE NS_UNAVAILABLE
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span><del>-
-#define WK_DESIGNATED_INITIALIZER
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (169355 => 169356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-05-26 17:45:08 UTC (rev 169355)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2014-05-26 18:00:47 UTC (rev 169356)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> @interface WKProcessPool (WKPrivate)
</span><span class="cx">
</span><del>-- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init))) WK_DESIGNATED_INITIALIZER;
</del><ins>+- (instancetype)_initWithConfiguration:(_WKProcessPoolConfiguration *)configuration __attribute__((objc_method_family(init)));
</ins><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly) _WKProcessPoolConfiguration *_configuration;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (169355 => 169356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-05-26 17:45:08 UTC (rev 169355)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-05-26 18:00:47 UTC (rev 169356)
</span><span class="lines">@@ -79,6 +79,8 @@
</span><span class="cx"> */
</span><span class="cx"> - (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
</span><span class="cx">
</span><ins>+- (instancetype)initWithCoder:(NSCoder *)coder WK_UNAVAILABLE;
+
</ins><span class="cx"> /*! @abstract Navigates to the given NSURLRequest.
</span><span class="cx"> @param request The NSURLRequest to navigate to.
</span><span class="cx"> @result A new navigation for the given request.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169355 => 169356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-26 17:45:08 UTC (rev 169355)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-05-26 18:00:47 UTC (rev 169356)
</span><span class="lines">@@ -268,6 +268,12 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (instancetype)initWithCoder:(NSCoder *)coder
+{
+ [self release];
+ return nil;
+}
+
</ins><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><span class="cx"> _page->close();
</span></span></pre></div>
<a id="trunkSourceWebKit2macrewriteavailabilitymacrossh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/rewrite-availability-macros.sh (169355 => 169356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2014-05-26 17:45:08 UTC (rev 169355)
+++ trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2014-05-26 18:00:47 UTC (rev 169356)
</span><span class="lines">@@ -30,10 +30,14 @@
</span><span class="cx">
</span><span class="cx"> TIMESTAMP_PATH=${TARGET_TEMP_DIR}/${0##*/}
</span><span class="cx">
</span><ins>+if [[ $0 -nt $TIMESTAMP_PATH ]]; then
+ rm "${TIMESTAMP_PATH}";
+fi
+
</ins><span class="cx"> function rewrite_headers () {
</span><span class="cx"> for HEADER_PATH in $1/*.h; do
</span><span class="cx"> if [[ $HEADER_PATH -nt $TIMESTAMP_PATH ]]; then
</span><del>- sed -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
</del><ins>+ sed -e s/^WK_CLASS_AVAILABLE/NS_CLASS_AVAILABLE/ -e s/WK_AVAILABLE/NS_AVAILABLE/ -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/ -e s/WK_ENUM_AVAILABLE/NS_ENUM_AVAILABLE/ -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/ ${HEADER_PATH} > ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} || exit $_;
</ins><span class="cx"> mv ${TARGET_TEMP_DIR}/${HEADER_PATH##*/} $HEADER_PATH;
</span><span class="cx"> fi
</span><span class="cx"> done
</span></span></pre>
</div>
</div>
</body>
</html>