<!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>[195963] 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/195963">195963</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-02-01 09:53:37 -0800 (Mon, 01 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Get rid of WK_ macros for initializers
https://bugs.webkit.org/show_bug.cgi?id=153744
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_DESIGNATED_INITIALIZER and
WK_UNAVAILABLE.
* mac/postprocess-framework-headers.sh: Removed rules for rewriting the above macros. Also
removed Foundation import that became unnecessary, and definitions that were only needed
before iOS 8.
Replaced instances of the above macros with their expansions.
* UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
* UIProcess/API/Cocoa/WKSecurityOrigin.h:
* UIProcess/API/Cocoa/WKWebView.h:
* UIProcess/API/Cocoa/WKWebsiteDataStore.h:</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="#trunkSourceWebKit2UIProcessAPICocoaWKSecurityOriginh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2macpostprocessframeworkheaderssh">trunk/Source/WebKit2/mac/postprocess-framework-headers.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-02-01 Dan Bernstein <mitz@apple.com>
+
+ [Cocoa] Get rid of WK_ macros for initializers
+ https://bugs.webkit.org/show_bug.cgi?id=153744
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKFoundation.h: Removed definitions of WK_DESIGNATED_INITIALIZER and
+ WK_UNAVAILABLE.
+
+ * mac/postprocess-framework-headers.sh: Removed rules for rewriting the above macros. Also
+ removed Foundation import that became unnecessary, and definitions that were only needed
+ before iOS 8.
+
+ Replaced instances of the above macros with their expansions.
+
+ * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
+ * UIProcess/API/Cocoa/WKSecurityOrigin.h:
+ * UIProcess/API/Cocoa/WKWebView.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
+
</ins><span class="cx"> 2016-02-01 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> One more unreviewed speculative buildfix after r195755.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKFoundationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -63,27 +63,8 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef __NSi_8_3
-#define __NSi_8_3 introduced=8.3
-#endif
-
</del><span class="cx"> #ifdef __OBJC__
</span><del>-#import <Foundation/Foundation.h>
-
-#ifdef NS_DESIGNATED_INITIALIZER
-#define WK_DESIGNATED_INITIALIZER NS_DESIGNATED_INITIALIZER
-#else
-#define WK_DESIGNATED_INITIALIZER
-#endif
-
-#ifdef NS_UNAVAILABLE
-#define WK_UNAVAILABLE NS_UNAVAILABLE
-#else
-#define WK_UNAVAILABLE
-#endif
-
</del><span class="cx"> #define WK_NULLABLE_SPECIFIER __nullable
</span><del>-
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> @protocol _WKDownloadDelegate;
</span><span class="cx">
</span><span class="cx"> @interface WKProcessPool ()
</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))) NS_DESIGNATED_INITIALIZER;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WKProcessPool (WKPrivate)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKSecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKSecurityOrigin.h 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> WK_CLASS_AVAILABLE(10_11, 9_0)
</span><span class="cx"> @interface WKSecurityOrigin : NSObject
</span><span class="cx">
</span><del>-- (instancetype)init WK_UNAVAILABLE;
</del><ins>+- (instancetype)init NS_UNAVAILABLE;
</ins><span class="cx">
</span><span class="cx"> /*! @abstract The security origin's protocol.
</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 (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx"> mutating the configuration after invoking the initializer has no effect
</span><span class="cx"> on the web view.
</span><span class="cx"> */
</span><del>-- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration WK_DESIGNATED_INITIALIZER;
</del><ins>+- (instancetype)initWithFrame:(CGRect)frame configuration:(WKWebViewConfiguration *)configuration NS_DESIGNATED_INITIALIZER;
</ins><span class="cx">
</span><del>-- (instancetype)initWithCoder:(NSCoder *)coder WK_UNAVAILABLE;
</del><ins>+- (instancetype)initWithCoder:(NSCoder *)coder NS_UNAVAILABLE;
</ins><span class="cx">
</span><span class="cx"> /*! @abstract Navigates to a requested URL.
</span><span class="cx"> @param request The request specifying the URL to which to navigate.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> */
</span><span class="cx"> + (WKWebsiteDataStore *)nonPersistentDataStore;
</span><span class="cx">
</span><del>-- (instancetype)init WK_UNAVAILABLE;
</del><ins>+- (instancetype)init NS_UNAVAILABLE;
</ins><span class="cx">
</span><span class="cx"> /*! @abstract Whether the data store is persistent or not. */
</span><span class="cx"> @property (nonatomic, readonly, getter=isPersistent) BOOL persistent;
</span></span></pre></div>
<a id="trunkSourceWebKit2macpostprocessframeworkheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/mac/postprocess-framework-headers.sh (195962 => 195963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-02-01 17:02:38 UTC (rev 195962)
+++ trunk/Source/WebKit2/mac/postprocess-framework-headers.sh 2016-02-01 17:53:37 UTC (rev 195963)
</span><span class="lines">@@ -61,9 +61,7 @@
</span><span class="cx"> -e 's/WK_ARRAY\(([^\)]+)\)/NSArray<\1>/g'
</span><span class="cx"> -e 's/WK_DICTIONARY\(([^\)]+)\)/NSDictionary<\1>/g'
</span><span class="cx"> -e 's/WK_SET\(([^\)]+)\)/NSSet<\1>/g'
</span><del>- -e s/WK_DESIGNATED_INITIALIZER/NS_DESIGNATED_INITIALIZER/
</del><span class="cx"> -e s/WK_NULLABLE_SPECIFIER/_Nullable/g
</span><del>- -e s/WK_UNAVAILABLE/NS_UNAVAILABLE/
</del><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> if [[ -n "$OSX_VERSION" && -n "$IOS_VERSION" ]]; then
</span></span></pre>
</div>
</div>
</body>
</html>