<!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>[186124] trunk/Source/WebKit/mac</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/186124">186124</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-30 11:26:01 -0700 (Tue, 30 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS ifdefs now that this is always true
https://bugs.webkit.org/show_bug.cgi?id=146462
Reviewed by Dan Bernstein.
* Misc/WebDownload.h:
* WebView/WebFrameLoadDelegate.h:
* WebView/WebPolicyDelegate.h:
* WebView/WebResourceLoadDelegate.h:
* WebView/WebUIDelegate.h:
* WebView/WebView.h:
* postprocess-headers.sh:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadh">trunk/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameLoadDelegateh">trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPolicyDelegateh">trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourceLoadDelegateh">trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebUIDelegateh">trunk/Source/WebKit/mac/WebView/WebUIDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewh">trunk/Source/WebKit/mac/WebView/WebView.h</a></li>
<li><a href="#trunkSourceWebKitmacpostprocessheaderssh">trunk/Source/WebKit/mac/postprocess-headers.sh</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-30 Anders Carlsson <andersca@apple.com>
+
+ Remove the WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS ifdefs now that this is always true
+ https://bugs.webkit.org/show_bug.cgi?id=146462
+
+ Reviewed by Dan Bernstein.
+
+ * Misc/WebDownload.h:
+ * WebView/WebFrameLoadDelegate.h:
+ * WebView/WebPolicyDelegate.h:
+ * WebView/WebResourceLoadDelegate.h:
+ * WebView/WebUIDelegate.h:
+ * WebView/WebView.h:
+ * postprocess-headers.sh:
+
</ins><span class="cx"> 2015-06-29 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of unused WKSI functions
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -69,12 +69,6 @@
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><del>-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebDownloadDelegate)
-#endif
-
</del><span class="cx"> /*!
</span><span class="cx"> @method downloadWindowForAuthenticationSheet:
</span><span class="cx"> @abstract
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebFrameLoadDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -54,12 +54,6 @@
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><del>-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebFrameLoadDelegate)
-#endif
-
</del><span class="cx"> /*!
</span><span class="cx"> @method webView:didStartProvisionalLoadForFrame:
</span><span class="cx"> @abstract Notifies the delegate that the provisional load of a frame has started
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -141,12 +141,6 @@
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><del>-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebPolicyDelegate)
-#endif
-
</del><span class="cx"> /*!
</span><span class="cx"> @method webView:decidePolicyForNavigationAction:request:frame:decisionListener:
</span><span class="cx"> @abstract This method is called to decide what to do with a proposed navigation.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourceLoadDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebResourceLoadDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -47,12 +47,6 @@
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><del>-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebResourceLoadDelegate)
-#endif
-
</del><span class="cx"> /*!
</span><span class="cx"> @method webView:identifierForInitialRequest:fromDataSource:
</span><span class="cx"> @param webView The WebView sending the message.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -164,12 +164,6 @@
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><del>-#ifndef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
-@end
-
-@interface NSObject (WebUIDelegate)
-#endif
-
</del><span class="cx"> /*!
</span><span class="cx"> @method webView:createWebViewWithRequest:
</span><span class="cx"> @abstract Create a new window and begin to load the specified request.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.h (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.h 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -54,13 +54,11 @@
</span><span class="cx"> @class WebScriptObject;
</span><span class="cx"> @class WebViewPrivate;
</span><span class="cx">
</span><del>-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
</del><span class="cx"> @protocol WebDownloadDelegate;
</span><span class="cx"> @protocol WebFrameLoadDelegate;
</span><span class="cx"> @protocol WebPolicyDelegate;
</span><span class="cx"> @protocol WebResourceLoadDelegate;
</span><span class="cx"> @protocol WebUIDelegate;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Element dictionary keys
</span><span class="cx"> extern NSString *WebElementDOMNodeKey; // DOMNode of the element
</span><span class="lines">@@ -230,51 +228,31 @@
</span><span class="cx"> @property UIDelegate
</span><span class="cx"> @abstract The WebView's WebUIDelegate.
</span><span class="cx"> */
</span><del>-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
</del><span class="cx"> @property (nonatomic, assign) id <WebUIDelegate> UIDelegate;
</span><del>-#else
-@property (nonatomic, assign) id UIDelegate;
-#endif
</del><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property resourceLoadDelegate
</span><span class="cx"> @abstract The WebView's WebResourceLoadDelegate.
</span><span class="cx"> */
</span><del>-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
</del><span class="cx"> @property (nonatomic, assign) id <WebResourceLoadDelegate> resourceLoadDelegate;
</span><del>-#else
-@property (nonatomic, assign) id resourceLoadDelegate;
-#endif
</del><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property downloadDelegate
</span><span class="cx"> @abstract The WebView's WebDownloadDelegate.
</span><span class="cx"> */
</span><del>-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
</del><span class="cx"> @property (nonatomic, assign) id <WebDownloadDelegate> downloadDelegate;
</span><del>-#else
-@property (nonatomic, assign) id downloadDelegate;
-#endif
</del><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property frameLoadDelegate
</span><span class="cx"> @abstract The WebView's WebFrameLoadDelegate delegate.
</span><span class="cx"> */
</span><del>-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
</del><span class="cx"> @property (nonatomic, assign) id <WebFrameLoadDelegate> frameLoadDelegate;
</span><del>-#else
-@property (nonatomic, assign) id frameLoadDelegate;
-#endif
</del><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property policyDelegate
</span><span class="cx"> @abstract The WebView's WebPolicyDelegate.
</span><span class="cx"> */
</span><del>-#ifdef WK_ENABLE_FORMAL_DELEGATE_PROTOCOLS
</del><span class="cx"> @property (nonatomic, assign) id <WebPolicyDelegate> policyDelegate;
</span><del>-#else
-@property (nonatomic, assign) id policyDelegate;
-#endif
</del><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @property mainFrame
</span></span></pre></div>
<a id="trunkSourceWebKitmacpostprocessheaderssh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/postprocess-headers.sh (186123 => 186124)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/postprocess-headers.sh 2015-06-30 18:10:55 UTC (rev 186123)
+++ trunk/Source/WebKit/mac/postprocess-headers.sh 2015-06-30 18:26:01 UTC (rev 186124)
</span><span class="lines">@@ -13,11 +13,11 @@
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> if [[ ${PLATFORM_NAME} == macosx ]]; then
</span><del>- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0 -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
</del><ins>+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0";
</ins><span class="cx"> elif [[ ${PLATFORM_NAME} == *simulator* ]]; then
</span><del>- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK} -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
</del><ins>+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
</ins><span class="cx"> else
</span><del>- unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK} -DWK_ENABLE_FORMAL_DELEGATE_PROTOCOLS=1";
</del><ins>+ unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DUSE_APPLE_INTERNAL_SDK=${USE_APPLE_INTERNAL_SDK}";
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> # FIXME: We should consider making this logic general purpose so as to support keeping or removing
</span></span></pre>
</div>
</div>
</body>
</html>