<!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>[177484] 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/177484">177484</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-17 18:09:50 -0800 (Wed, 17 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of an ugly #define hack in WebFrameLoaderClient
https://bugs.webkit.org/show_bug.cgi?id=139761
Reviewed by Dan Bernstein.
Also replace @private with @package in all public headers, for consistency.
* History/WebBackForwardList.h:
* History/WebHistory.h:
* Misc/WebDownload.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
* WebView/WebArchive.h:
* WebView/WebDataSource.h:
* WebView/WebFrame.h:
* WebView/WebFrameView.h:
* WebView/WebPreferences.h:
* WebView/WebResource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebBackForwardListh">trunk/Source/WebKit/mac/History/WebBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryh">trunk/Source/WebKit/mac/History/WebHistory.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebDownloadh">trunk/Source/WebKit/mac/Misc/WebDownload.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebArchiveh">trunk/Source/WebKit/mac/WebView/WebArchive.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourceh">trunk/Source/WebKit/mac/WebView/WebDataSource.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameh">trunk/Source/WebKit/mac/WebView/WebFrame.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewh">trunk/Source/WebKit/mac/WebView/WebFrameView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesh">trunk/Source/WebKit/mac/WebView/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourceh">trunk/Source/WebKit/mac/WebView/WebResource.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-12-17 Anders Carlsson <andersca@apple.com>
+
+ Get rid of an ugly #define hack in WebFrameLoaderClient
+ https://bugs.webkit.org/show_bug.cgi?id=139761
+
+ Reviewed by Dan Bernstein.
+
+ Also replace @private with @package in all public headers, for consistency.
+
+ * History/WebBackForwardList.h:
+ * History/WebHistory.h:
+ * Misc/WebDownload.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ * WebView/WebArchive.h:
+ * WebView/WebDataSource.h:
+ * WebView/WebFrame.h:
+ * WebView/WebFrameView.h:
+ * WebView/WebPreferences.h:
+ * WebView/WebResource.h:
+
</ins><span class="cx"> 2014-12-17 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> <rdar://problem/19282508> WebKitLegacy is unusable due to bad dylib identifier
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> structure.
</span><span class="cx"> */
</span><span class="cx"> @interface WebBackForwardList : NSObject {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebBackForwardListPrivate *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> by WebKit.
</span><span class="cx"> */
</span><span class="cx"> @interface WebHistory : NSObject {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebHistoryPrivate *_historyPrivate;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebDownloadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebDownload.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> @interface WebDownload : NSURLDownload
</span><span class="cx"> {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebDownloadInternal *_webInternal;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebFrameLoaderClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -28,11 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #import "WebFrameLoaderClient.h"
</span><span class="cx">
</span><del>-// Terrible hack; lets us get at the WebFrame private structure.
-#define private public
-#import "WebFrame.h"
-#undef private
-
</del><span class="cx"> #import "DOMElementInternal.h"
</span><span class="cx"> #import "DOMHTMLFormElementInternal.h"
</span><span class="cx"> #import "WebBackForwardList.h"
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebArchive.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebArchive.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebView/WebArchive.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> */
</span><span class="cx"> @interface WebArchive : NSObject <NSCoding, NSCopying>
</span><span class="cx"> {
</span><del>- @private
</del><ins>+@package
</ins><span class="cx"> WebArchivePrivate *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> */
</span><span class="cx"> @interface WebDataSource : NSObject
</span><span class="cx"> {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> void *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> */
</span><span class="cx"> @interface WebFrame : NSObject
</span><span class="cx"> {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebFramePrivate *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> */
</span><span class="cx"> @interface WebFrameView : NSView
</span><span class="cx"> {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebFrameViewPrivate *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> */
</span><span class="cx"> @interface WebPreferences: NSObject <NSCoding>
</span><span class="cx"> {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebPreferencesPrivate *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResource.h (177483 => 177484)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResource.h 2014-12-18 02:02:46 UTC (rev 177483)
+++ trunk/Source/WebKit/mac/WebView/WebResource.h 2014-12-18 02:09:50 UTC (rev 177484)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> */
</span><span class="cx"> @interface WebResource : NSObject <NSCoding, NSCopying>
</span><span class="cx"> {
</span><del>-@private
</del><ins>+@package
</ins><span class="cx"> WebResourcePrivate *_private;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>