<!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>[160414] trunk</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/160414">160414</a></dd>
<dt>Author</dt> <dd>mrowe@apple.com</dd>
<dt>Date</dt> <dd>2013-12-11 01:27:32 -0800 (Wed, 11 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre><https://webkit.org/b/125139> Modernize the WebKit API headers
<rdar://problem/15540175>
Source/WebKit/mac:
This consists of three main changes:
1) Converting the return type of initializer methods to instancetype.
2) Declaring properties rather than getters and setters.
3) Declaring explicitly sized enums.
Changing the declarations from getters and setters to properties also required
updating the headerdoc in a number of places.
Reviewed by Anders Carlsson.
* DOM/WebDOMOperations.h:
* History/WebBackForwardList.h:
* History/WebHistory.h:
* History/WebHistoryItem.h:
* History/WebHistoryItem.mm:
* Plugins/WebPlugin.h:
* Plugins/WebPluginContainer.h:
* WebView/WebArchive.h:
* WebView/WebArchive.mm:
* WebView/WebDataSource.h:
* WebView/WebDataSource.mm:
* WebView/WebEditingDelegate.h:
* WebView/WebFrame.h:
* WebView/WebFrame.mm:
* WebView/WebFrameView.h:
* WebView/WebPolicyDelegate.h:
* WebView/WebPreferences.h:
* WebView/WebPreferences.mm:
(-[WebPreferences cacheModel]): Cast to the enum.
* WebView/WebResource.h:
* WebView/WebResource.mm:
* WebView/WebUIDelegate.h:
* WebView/WebView.h:
* WebView/WebView.mm:
(+[WebView _didSetCacheModel]): Fix the return type.
Tools:
Reviewed by Anders Carlsson.
* DumpRenderTree/mac/TestRunnerMac.mm:
(TestRunner::setCacheModel): Cast to the enum type.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacDOMWebDOMOperationsh">trunk/Source/WebKit/mac/DOM/WebDOMOperations.h</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="#trunkSourceWebKitmacHistoryWebHistoryItemh">trunk/Source/WebKit/mac/History/WebHistoryItem.h</a></li>
<li><a href="#trunkSourceWebKitmacHistoryWebHistoryItemmm">trunk/Source/WebKit/mac/History/WebHistoryItem.mm</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginh">trunk/Source/WebKit/mac/Plugins/WebPlugin.h</a></li>
<li><a href="#trunkSourceWebKitmacPluginsWebPluginContainerh">trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebArchiveh">trunk/Source/WebKit/mac/WebView/WebArchive.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebArchivemm">trunk/Source/WebKit/mac/WebView/WebArchive.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourceh">trunk/Source/WebKit/mac/WebView/WebDataSource.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebDataSourcemm">trunk/Source/WebKit/mac/WebView/WebDataSource.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebEditingDelegateh">trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameh">trunk/Source/WebKit/mac/WebView/WebFrame.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFramemm">trunk/Source/WebKit/mac/WebView/WebFrame.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebFrameViewh">trunk/Source/WebKit/mac/WebView/WebFrameView.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPolicyDelegateh">trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesh">trunk/Source/WebKit/mac/WebView/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebPreferencesmm">trunk/Source/WebKit/mac/WebView/WebPreferences.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourceh">trunk/Source/WebKit/mac/WebView/WebResource.h</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebResourcemm">trunk/Source/WebKit/mac/WebView/WebResource.mm</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="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacTestRunnerMacmm">trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2013-12-03 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/125139> Modernize the WebKit API headers
+ <rdar://problem/15540175>
+
+ This consists of three main changes:
+ 1) Converting the return type of initializer methods to instancetype.
+ 2) Declaring properties rather than getters and setters.
+ 3) Declaring explicitly sized enums.
+
+ Changing the declarations from getters and setters to properties also required
+ updating the headerdoc in a number of places.
+
+ Reviewed by Anders Carlsson.
+
+ * DOM/WebDOMOperations.h:
+ * History/WebBackForwardList.h:
+ * History/WebHistory.h:
+ * History/WebHistoryItem.h:
+ * History/WebHistoryItem.mm:
+ * Plugins/WebPlugin.h:
+ * Plugins/WebPluginContainer.h:
+ * WebView/WebArchive.h:
+ * WebView/WebArchive.mm:
+ * WebView/WebDataSource.h:
+ * WebView/WebDataSource.mm:
+ * WebView/WebEditingDelegate.h:
+ * WebView/WebFrame.h:
+ * WebView/WebFrame.mm:
+ * WebView/WebFrameView.h:
+ * WebView/WebPolicyDelegate.h:
+ * WebView/WebPreferences.h:
+ * WebView/WebPreferences.mm:
+ (-[WebPreferences cacheModel]): Cast to the enum.
+ * WebView/WebResource.h:
+ * WebView/WebResource.mm:
+ * WebView/WebUIDelegate.h:
+ * WebView/WebView.h:
+ * WebView/WebView.mm:
+ (+[WebView _didSetCacheModel]): Fix the return type.
+
</ins><span class="cx"> 2013-12-10 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> <http://webkit.org/b/125556> WebKit doesn't deal with longer bundle versions correctly
</span></span></pre></div>
<a id="trunkSourceWebKitmacDOMWebDOMOperationsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/DOM/WebDOMOperations.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/DOM/WebDOMOperations.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/DOM/WebDOMOperations.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -36,20 +36,20 @@
</span><span class="cx"> @interface DOMNode (WebDOMNodeOperations)
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webArchive
- @result A WebArchive representing the node and the children of the node.
</del><ins>+ @property webArchive
+ @abstract A WebArchive representing the node and the children of the node.
</ins><span class="cx"> */
</span><del>-- (WebArchive *)webArchive;
</del><ins>+@property (nonatomic, readonly, strong) WebArchive *webArchive;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMDocument (WebDOMDocumentOperations)
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webFrame
- @abstract Returns the frame of the DOM document.
</del><ins>+ @property webFrame
+ @abstract The frame of the DOM document.
</ins><span class="cx"> */
</span><del>-- (WebFrame *)webFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *webFrame;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method URLWithAttributeString:
</span><span class="lines">@@ -65,47 +65,47 @@
</span><span class="cx"> @interface DOMRange (WebDOMRangeOperations)
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webArchive
- @result A WebArchive representing the range.
</del><ins>+ @property webArchive
+ @abstract A WebArchive representing the range.
</ins><span class="cx"> */
</span><del>-- (WebArchive *)webArchive;
</del><ins>+@property (nonatomic, readonly, strong) WebArchive *webArchive;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method markupString
- @result A markup string representing the range.
</del><ins>+ @property markupString
+ @abstract A markup string representing the range.
</ins><span class="cx"> */
</span><del>-- (NSString *)markupString;
</del><ins>+@property (nonatomic, readonly, copy) NSString *markupString;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMHTMLFrameElement (WebDOMHTMLFrameElementOperations)
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method contentFrame
- @abstract Returns the content frame of the element.
</del><ins>+ @property contentFrame
+ @abstract The content frame of the element.
</ins><span class="cx"> */
</span><del>-- (WebFrame *)contentFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *contentFrame;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMHTMLIFrameElement (WebDOMHTMLIFrameElementOperations)
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method contentFrame
</del><ins>+ @property contentFrame
</ins><span class="cx"> @abstract Returns the content frame of the element.
</span><span class="cx"> */
</span><del>-- (WebFrame *)contentFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *contentFrame;
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface DOMHTMLObjectElement (WebDOMHTMLObjectElementOperations)
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method contentFrame
- @abstract Returns the content frame of the element.
</del><ins>+ @property contentFrame
+ @abstract The content frame of the element.
</ins><span class="cx"> @discussion Returns non-nil only if the object represents a child frame
</span><span class="cx"> such as if the data of the object is HTML content.
</span><span class="cx"> */
</span><del>-- (WebFrame *)contentFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *contentFrame;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebBackForwardList.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebBackForwardList.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/History/WebBackForwardList.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -76,25 +76,22 @@
</span><span class="cx"> - (void)goToItem:(WebHistoryItem *)item;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method backItem
- @abstract Returns the entry right before the current entry.
- @result The entry right before the current entry, or nil if there isn't one.
</del><ins>+ @property backItem
+ @abstract The entry right before the current entry, or nil if there isn't one.
</ins><span class="cx"> */
</span><del>-- (WebHistoryItem *)backItem;
</del><ins>+@property (nonatomic, readonly, strong) WebHistoryItem *backItem;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method currentItem
</del><ins>+ @property currentItem
</ins><span class="cx"> @abstract Returns the current entry.
</span><del>- @result The current entry.
</del><span class="cx"> */
</span><del>-- (WebHistoryItem *)currentItem;
</del><ins>+@property (nonatomic, readonly, strong) WebHistoryItem *currentItem;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method forwardItem
- @abstract Returns the entry right after the current entry.
- @result The entry right after the current entry, or nil if there isn't one.
</del><ins>+ @property forwardItem
+ @abstract The entry right after the current entry, or nil if there isn't one.
</ins><span class="cx"> */
</span><del>-- (WebHistoryItem *)forwardItem;
</del><ins>+@property (nonatomic, readonly, strong) WebHistoryItem *forwardItem;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method backListWithLimit:
</span><span class="lines">@@ -113,34 +110,24 @@
</span><span class="cx"> - (NSArray *)forwardListWithLimit:(int)limit;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method capacity
- @abstract Returns the list's maximum size.
- @result The list's maximum size.
</del><ins>+ @property capacity
+ @abstract The list's maximum size.
</ins><span class="cx"> */
</span><del>-- (int)capacity;
</del><ins>+@property (nonatomic) int capacity;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setCapacity
- @abstract Sets the list's maximum size.
- @param size The new maximum size for the list.
</del><ins>+ @property backListCount
+ @abstract The number of items in the list.
</ins><span class="cx"> */
</span><del>-- (void)setCapacity:(int)size;
</del><ins>+@property (nonatomic, readonly) int backListCount;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method backListCount
- @abstract Returns the back list's current count.
</del><ins>+ @property forwardListCount
</ins><span class="cx"> @result The number of items in the list.
</span><span class="cx"> */
</span><del>-- (int)backListCount;
</del><ins>+@property (nonatomic, readonly) int forwardListCount;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method forwardListCount
- @abstract Returns the forward list's current count.
- @result The number of items in the list.
-*/
-- (int)forwardListCount;
-
-/*!
</del><span class="cx"> @method containsItem:
</span><span class="cx"> @param item The item that will be checked for presence in the WebBackForwardList.
</span><span class="cx"> @result Returns YES if the item is in the list.
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistory.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistory.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/History/WebHistory.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -113,12 +113,12 @@
</span><span class="cx"> - (void)removeAllItems;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method orderedLastVisitedDays
- @discussion Get an array of NSCalendarDates, each one representing a unique day that contains one
</del><ins>+ @property orderedLastVisitedDays
+ @abstract An array of NSCalendarDates for which history items exist in the WebHistory.
+ @discussion An array of NSCalendarDates, each one representing a unique day that contains one
</ins><span class="cx"> or more history items, ordered from most recent to oldest.
</span><del>- @result Returns an array of NSCalendarDates for which history items exist in the WebHistory.
</del><span class="cx"> */
</span><del>-- (NSArray *)orderedLastVisitedDays;
</del><ins>+@property (nonatomic, readonly, copy) NSArray *orderedLastVisitedDays;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method orderedItemsLastVisitedOnDay:
</span><span class="lines">@@ -141,30 +141,15 @@
</span><span class="cx"> - (WebHistoryItem *)itemForURL:(NSURL *)URL;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setHistoryItemLimit:
- @discussion Limits the number of items that will be stored by the WebHistory.
- @param limit The maximum number of items that will be stored by the WebHistory.
</del><ins>+ @property historyItemLimit
+ @abstract The maximum number of items that will be stored by the WebHistory.
</ins><span class="cx"> */
</span><del>-- (void)setHistoryItemLimit:(int)limit;
</del><ins>+@property (nonatomic) int historyItemLimit;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method historyItemLimit
- @result The maximum number of items that will be stored by the WebHistory.
</del><ins>+ @property historyAgeInDaysLimit
+ @abstract The maximum number of days to be read from stored history.
</ins><span class="cx"> */
</span><del>-- (int)historyItemLimit;
</del><ins>+@property (nonatomic) int historyAgeInDaysLimit;
</ins><span class="cx">
</span><del>-/*!
- @method setHistoryAgeInDaysLimit:
- @discussion setHistoryAgeInDaysLimit: sets the maximum number of days to be read from
- stored history.
- @param limit The maximum number of days to be read from stored history.
-*/
-- (void)setHistoryAgeInDaysLimit:(int)limit;
-
-/*!
- @method historyAgeInDaysLimit
- @return Returns the maximum number of days to be read from stored history.
-*/
-- (int)historyAgeInDaysLimit;
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -63,64 +63,51 @@
</span><span class="cx"> 'artificial' items to add to a WebBackForwardList. When first initialized
</span><span class="cx"> the URLString and originalURLString will be the same.
</span><span class="cx"> */
</span><del>-- (id)initWithURLString:(NSString *)URLString title:(NSString *)title lastVisitedTimeInterval:(NSTimeInterval)time;
</del><ins>+- (instancetype)initWithURLString:(NSString *)URLString title:(NSString *)title lastVisitedTimeInterval:(NSTimeInterval)time;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method originalURLString
- @abstract The string representation of the originial URL of this item.
</del><ins>+ @property originalURLString
+ @abstract The string representation of the initial URL of this item.
</ins><span class="cx"> This value is normally set by the WebKit.
</span><del>- @result The string corresponding to the initial URL of this item.
</del><span class="cx"> */
</span><del>-- (NSString *)originalURLString;
</del><ins>+@property (nonatomic, readonly, copy) NSString *originalURLString;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method URLString
</del><ins>+ @property URLString
</ins><span class="cx"> @abstract The string representation of the URL represented by this item.
</span><span class="cx"> @discussion The URLString may be different than the originalURLString if the page
</span><span class="cx"> redirected to a new location. This value is normally set by the WebKit.
</span><del>- @result The string corresponding to the final URL of this item.
</del><span class="cx"> */
</span><del>-- (NSString *)URLString;
</del><ins>+@property (nonatomic, readonly, copy) NSString *URLString;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method title
</del><ins>+ @property title
</ins><span class="cx"> @abstract The title of the page represented by this item.
</span><span class="cx"> @discussion This title cannot be changed by the client. This value
</span><span class="cx"> is normally set by the WebKit when a page title for the item is received.
</span><del>- @result The title of this item.
</del><span class="cx"> */
</span><del>-- (NSString *)title;
</del><ins>+@property (nonatomic, readonly, copy) NSString *title;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method lastVisitedTimeInterval
</del><ins>+ @property lastVisitedTimeInterval
</ins><span class="cx"> @abstract The last time the page represented by this item was visited. The interval
</span><span class="cx"> is since the reference date as determined by NSDate. This value is normally set by
</span><span class="cx"> the WebKit.
</span><del>- @result The last time this item was visited.
</del><span class="cx"> */
</span><del>-- (NSTimeInterval)lastVisitedTimeInterval;
</del><ins>+@property (nonatomic, readonly) NSTimeInterval lastVisitedTimeInterval;
</ins><span class="cx">
</span><del>-/*!
- @method setAlternateTitle:
- @param alternateTitle The new display title for this item.
- @abstract A title that may be used by the client to display this item.
-*/
-- (void)setAlternateTitle:(NSString *)alternateTitle;
-
</del><span class="cx"> /*
</span><del>- @method title
</del><ins>+ @property alternateTitle
</ins><span class="cx"> @abstract A title that may be used by the client to display this item.
</span><del>- @result The alternate title for this item.
</del><span class="cx"> */
</span><del>-- (NSString *)alternateTitle;
</del><ins>+@property (nonatomic, copy) NSString *alternateTitle;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method icon
</del><ins>+ @property icon
</ins><span class="cx"> @abstract The favorite icon of the page represented by this item.
</span><span class="cx"> @discussion This icon returned will be determined by the WebKit.
</span><del>- @result The icon associated with this item's URL.
</del><span class="cx"> */
</span><del>-- (NSImage *)icon;
</del><ins>+@property (nonatomic, readonly, strong) NSImage *icon;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacHistoryWebHistoryItemmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/History/WebHistoryItem.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/History/WebHistoryItem.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -101,12 +101,12 @@
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> return [self initWithWebCoreHistoryItem:HistoryItem::create()];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithURLString:(NSString *)URLString title:(NSString *)title lastVisitedTimeInterval:(NSTimeInterval)time
</del><ins>+- (instancetype)initWithURLString:(NSString *)URLString title:(NSString *)title lastVisitedTimeInterval:(NSTimeInterval)time
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundOne();
</span><span class="cx"> return [self initWithWebCoreHistoryItem:HistoryItem::create(URLString, title, time)];
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPlugin.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPlugin.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/Plugins/WebPlugin.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -84,14 +84,14 @@
</span><span class="cx"> - (void)webPlugInSetIsSelected:(BOOL)isSelected;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method objectForWebScript
</del><ins>+ @property objectForWebScript
</ins><span class="cx"> @discussion objectForWebScript is used to expose a plug-in's scripting interface. The
</span><span class="cx"> methods of the object are exposed to the script environment. See the WebScripting
</span><span class="cx"> informal protocol for more details.
</span><span class="cx"> @result Returns the object that exposes the plug-in's interface. The class of this
</span><span class="cx"> object can implement methods from the WebScripting informal protocol.
</span><span class="cx"> */
</span><del>-- (id)objectForWebScript;
</del><ins>+@property (nonatomic, readonly, strong) id objectForWebScript;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method webPlugInMainResourceDidReceiveResponse:
</span></span></pre></div>
<a id="trunkSourceWebKitmacPluginsWebPluginContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/Plugins/WebPluginContainer.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -54,19 +54,18 @@
</span><span class="cx"> - (void)webPlugInContainerShowStatus:(NSString *)message;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webPlugInContainerSelectionColor
- @result Returns the color that should be used for any special drawing when
</del><ins>+ @property webPlugInContainerSelectionColor
+ @abstract The color that should be used for any special drawing when
</ins><span class="cx"> plug-in is selected.
</span><span class="cx"> */
</span><del>-- (NSColor *)webPlugInContainerSelectionColor;
</del><ins>+@property (nonatomic, readonly, strong) NSColor *webPlugInContainerSelectionColor;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webFrame
- @discussion The webFrame method allows the plug-in to access the WebFrame that
</del><ins>+ @property webFrame
+ @abstract Allows the plug-in to access the WebFrame that
</ins><span class="cx"> contains the plug-in. This method will not be implemented by containers that
</span><span class="cx"> are not WebKit based.
</span><del>- @result Return the WebFrame that contains the plug-in.
</del><span class="cx"> */
</span><del>-- (WebFrame *)webFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *webFrame;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebArchive.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebArchive.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebArchive.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> @param subframeArchives The archives representing the subframes of the archive (can be nil).
</span><span class="cx"> @result An initialized WebArchive.
</span><span class="cx"> */
</span><del>-- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources subframeArchives:(NSArray *)subframeArchives;
</del><ins>+- (instancetype)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources subframeArchives:(NSArray *)subframeArchives;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method initWithData:
</span><span class="lines">@@ -66,32 +66,32 @@
</span><span class="cx"> @param data The data representing the archive. This can be obtained using WebArchive's data method.
</span><span class="cx"> @result An initialized WebArchive.
</span><span class="cx"> */
</span><del>-- (id)initWithData:(NSData *)data;
</del><ins>+- (instancetype)initWithData:(NSData *)data;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method mainResource
- @result The main resource of the archive.
</del><ins>+ @property mainResource
+ @abstract The main resource of the archive.
</ins><span class="cx"> */
</span><del>-- (WebResource *)mainResource;
</del><ins>+@property (nonatomic, readonly, strong) WebResource *mainResource;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method subresources
- @result The subresource of the archive (can be nil).
</del><ins>+ @property subresources
+ @abstract The subresource of the archive (can be nil).
</ins><span class="cx"> */
</span><del>-- (NSArray *)subresources;
</del><ins>+@property (nonatomic, readonly, copy) NSArray *subresources;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method subframeArchives
- @result The archives representing the subframes of the archive (can be nil).
</del><ins>+ @property subframeArchives
+ @abstract The archives representing the subframes of the archive (can be nil).
</ins><span class="cx"> */
</span><del>-- (NSArray *)subframeArchives;
</del><ins>+@property (nonatomic, readonly, copy) NSArray *subframeArchives;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method data
- @result The data representation of the archive.
</del><ins>+ @property data
+ @abstract The data representation of the archive.
</ins><span class="cx"> @discussion The data returned by this method can be used to save a web archive to a file or to place a web archive on the pasteboard
</span><span class="cx"> using WebArchivePboardType. To create a WebArchive using the returned data, call initWithData:.
</span><span class="cx"> */
</span><del>-- (NSData *)data;
</del><ins>+@property (nonatomic, readonly, copy) NSData *data;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebArchive.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebArchive.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebArchive.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> RefPtr<LegacyWebArchive> coreArchive;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoreArchive:(PassRefPtr<LegacyWebArchive>)coreArchive;
</del><ins>+- (instancetype)initWithCoreArchive:(PassRefPtr<LegacyWebArchive>)coreArchive;
</ins><span class="cx"> - (LegacyWebArchive*)coreArchive;
</span><span class="cx"> - (void)setCoreArchive:(PassRefPtr<LegacyWebArchive>)newCoreArchive;
</span><span class="cx"> @end
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoreArchive:(PassRefPtr<LegacyWebArchive>)_coreArchive
</del><ins>+- (instancetype)initWithCoreArchive:(PassRefPtr<LegacyWebArchive>)_coreArchive
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self || !_coreArchive) {
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebArchive
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundTwo();
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> return YES;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources subframeArchives:(NSArray *)subframeArchives
</del><ins>+- (instancetype)initWithMainResource:(WebResource *)mainResource subresources:(NSArray *)subresources subframeArchives:(NSArray *)subframeArchives
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundTwo();
</span><span class="cx">
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithData:(NSData *)data
</del><ins>+- (instancetype)initWithData:(NSData *)data
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundTwo();
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoder:(NSCoder *)decoder
</del><ins>+- (instancetype)initWithCoder:(NSCoder *)decoder
</ins><span class="cx"> {
</span><span class="cx"> WebResource *mainResource = nil;
</span><span class="cx"> NSArray *subresources = nil;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -57,103 +57,103 @@
</span><span class="cx"> @param request The request to use in creating a datasource.
</span><span class="cx"> @result Returns an initialized WebDataSource.
</span><span class="cx"> */
</span><del>-- (id)initWithRequest:(NSURLRequest *)request;
</del><ins>+- (instancetype)initWithRequest:(NSURLRequest *)request;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method data
- @discussion The data will be incomplete until the datasource has completely loaded.
- @result Returns the raw data associated with the datasource. Returns nil
</del><ins>+ @property data
+ @abstract Returns the raw data associated with the datasource. Returns nil
</ins><span class="cx"> if the datasource hasn't loaded any data.
</span><ins>+ @discussion The data will be incomplete until the datasource has completely loaded.
</ins><span class="cx"> */
</span><del>-- (NSData *)data;
</del><ins>+@property (nonatomic, readonly, copy) NSData *data;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method representation
</del><ins>+ @property representation
+ @abstract The representation associated with this datasource.
+ Returns nil if the datasource hasn't created its representation.
</ins><span class="cx"> @discussion A representation holds a type specific representation
</span><span class="cx"> of the datasource's data. The representation class is determined by mapping
</span><span class="cx"> a MIME type to a class. The representation is created once the MIME type
</span><span class="cx"> of the datasource content has been determined.
</span><del>- @result Returns the representation associated with this datasource.
- Returns nil if the datasource hasn't created it's representation.
</del><span class="cx"> */
</span><del>-- (id <WebDocumentRepresentation>)representation;
</del><ins>+@property (nonatomic, readonly, strong) id<WebDocumentRepresentation> representation;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webFrame
- @result Return the frame that represents this data source.
</del><ins>+ @property webFrame
+ @abstract The frame that represents this data source.
</ins><span class="cx"> */
</span><del>-- (WebFrame *)webFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *webFrame;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method initialRequest
- @result Returns a reference to the original request that created the
</del><ins>+ @property initialRequest
+ @abstract A reference to the original request that created the
</ins><span class="cx"> datasource. This request will be unmodified by WebKit.
</span><span class="cx"> */
</span><del>-- (NSURLRequest *)initialRequest;
</del><ins>+@property (nonatomic, readonly, strong) NSURLRequest *initialRequest;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method request
- @result Returns the request that was used to create this datasource.
</del><ins>+ @property request
+ @abstract The request that was used to create this datasource.
</ins><span class="cx"> */
</span><del>-- (NSMutableURLRequest *)request;
</del><ins>+@property (nonatomic, readonly, strong) NSMutableURLRequest *request;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method response
- @result returns the WebResourceResponse for the data source.
</del><ins>+ @property response
+ @abstract The NSURLResponse for the data source.
</ins><span class="cx"> */
</span><del>-- (NSURLResponse *)response;
</del><ins>+@property (nonatomic, readonly, strong) NSURLResponse *response;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method textEncodingName
- @result Returns either the override encoding, as set on the WebView for this
</del><ins>+ @property textEncodingName
+ @abstract Returns either the override encoding, as set on the WebView for this
</ins><span class="cx"> dataSource or the encoding from the response.
</span><span class="cx"> */
</span><del>-- (NSString *)textEncodingName;
</del><ins>+@property (nonatomic, readonly, copy) NSString *textEncodingName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method isLoading
- @discussion Returns YES if there are any pending loads.
</del><ins>+ @property isLoading
+ @abstract Returns YES if there are any pending loads.
</ins><span class="cx"> */
</span><del>-- (BOOL)isLoading;
</del><ins>+@property (nonatomic, getter=isLoading, readonly) BOOL loading;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method pageTitle
- @result Returns nil or the page title.
</del><ins>+ @property pageTitle
+ @abstract The page title or nil.
</ins><span class="cx"> */
</span><del>-- (NSString *)pageTitle;
</del><ins>+@property (nonatomic, readonly, copy) NSString *pageTitle;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method unreachableURL
</del><ins>+ @property unreachableURL
+ @abstract The unreachableURL for which this dataSource is showing alternate content, or nil.
</ins><span class="cx"> @discussion This will be non-nil only for dataSources created by calls to the
</span><span class="cx"> WebFrame method loadAlternateHTMLString:baseURL:forUnreachableURL:.
</span><del>- @result returns the unreachableURL for which this dataSource is showing alternate content, or nil
</del><span class="cx"> */
</span><del>-- (NSURL *)unreachableURL;
</del><ins>+@property (nonatomic, readonly, strong) NSURL *unreachableURL;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webArchive
- @result A WebArchive representing the data source, its subresources and child frames.
</del><ins>+ @property webArchive
+ @abstract A WebArchive representing the data source, its subresources and child frames.
</ins><span class="cx"> @description This method constructs a WebArchive using the original downloaded data.
</span><span class="cx"> In the case of HTML, if the current state of the document is preferred, webArchive should be
</span><span class="cx"> called on the DOM document instead.
</span><span class="cx"> */
</span><del>-- (WebArchive *)webArchive;
</del><ins>+@property (nonatomic, readonly, strong) WebArchive *webArchive;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method mainResource
- @result A WebResource representing the data source.
</del><ins>+ @property mainResource
+ @abstract A WebResource representing the data source.
</ins><span class="cx"> @description This method constructs a WebResource using the original downloaded data.
</span><span class="cx"> This method can be used to construct a WebArchive in case the archive returned by
</span><span class="cx"> WebDataSource's webArchive isn't sufficient.
</span><span class="cx"> */
</span><del>-- (WebResource *)mainResource;
</del><ins>+@property (nonatomic, readonly, strong) WebResource *mainResource;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method subresources
- @abstract Returns all the subresources associated with the data source.
</del><ins>+ @property subresources
+ @abstract All the subresources associated with the data source.
</ins><span class="cx"> @description The returned array only contains subresources that have fully downloaded.
</span><span class="cx"> */
</span><del>-- (NSArray *)subresources;
</del><ins>+@property (nonatomic, readonly, copy) NSArray *subresources;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> method subresourceForURL:
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebDataSourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebDataSource.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebDataSource.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebDataSource
</span><span class="cx">
</span><del>-- (id)initWithRequest:(NSURLRequest *)request
</del><ins>+- (instancetype)initWithRequest:(NSURLRequest *)request
</ins><span class="cx"> {
</span><span class="cx"> return [self _initWithDocumentLoader:WebDocumentLoaderMac::create(request, SubstituteData())];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebEditingDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebEditingDelegate.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> @class DOMRange;
</span><span class="cx"> @class WebView;
</span><span class="cx">
</span><del>-typedef enum {
</del><ins>+typedef NS_ENUM(NSInteger, WebViewInsertAction) {
</ins><span class="cx"> WebViewInsertActionTyped,
</span><span class="cx"> WebViewInsertActionPasted,
</span><span class="cx"> WebViewInsertActionDropped,
</span><del>-} WebViewInsertAction;
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> @interface NSObject (WebViewEditingDelegate)
</span><span class="cx"> - (BOOL)webView:(WebView *)webView shouldBeginEditingInDOMRange:(DOMRange *)range;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -61,40 +61,40 @@
</span><span class="cx"> @param webView The WebView that manages the frame.
</span><span class="cx"> @result Returns an initialized WebFrame.
</span><span class="cx"> */
</span><del>-- (id)initWithName:(NSString *)name webFrameView:(WebFrameView *)view webView:(WebView *)webView;
</del><ins>+- (instancetype)initWithName:(NSString *)name webFrameView:(WebFrameView *)view webView:(WebView *)webView;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method name
- @result The frame name.
</del><ins>+ @property name
+ @abstract The frame name.
</ins><span class="cx"> */
</span><del>-- (NSString *)name;
</del><ins>+@property (nonatomic, readonly, copy) NSString *name;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webView
- @result Returns the WebView for the document that includes this frame.
</del><ins>+ @property webView
+ @abstract The WebView for the document that includes this frame.
</ins><span class="cx"> */
</span><del>-- (WebView *)webView;
</del><ins>+@property (nonatomic, readonly, strong) WebView *webView;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method frameView
- @result The WebFrameView for this frame.
</del><ins>+ @property frameView
+ @abstract The WebFrameView for this frame.
</ins><span class="cx"> */
</span><del>-- (WebFrameView *)frameView;
</del><ins>+@property (nonatomic, readonly, strong) WebFrameView *frameView;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method DOMDocument
- @abstract Returns the DOM document of the frame.
</del><ins>+ @property DOMDocument
+ @abstract The DOM document of the frame.
</ins><span class="cx"> @description Returns nil if the frame does not contain a DOM document such as a standalone image.
</span><span class="cx"> */
</span><del>-- (DOMDocument *)DOMDocument;
</del><ins>+@property (nonatomic, readonly, strong) DOMDocument *DOMDocument;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method frameElement
- @abstract Returns the frame element of the frame.
</del><ins>+ @property frameElement
+ @abstract The frame element of the frame.
</ins><span class="cx"> @description The class of the result is either DOMHTMLFrameElement, DOMHTMLIFrameElement or DOMHTMLObjectElement.
</span><span class="cx"> Returns nil if the frame is the main frame since there is no frame element for the frame in this case.
</span><span class="cx"> */
</span><del>-- (DOMHTMLElement *)frameElement;
</del><ins>+@property (nonatomic, readonly, strong) DOMHTMLElement *frameElement;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method loadRequest:
</span><span class="lines">@@ -141,21 +141,21 @@
</span><span class="cx"> - (void)loadArchive:(WebArchive *)archive;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method dataSource
</del><ins>+ @property dataSource
+ @abstract The datasource for this frame.
</ins><span class="cx"> @discussion Returns the committed data source. Will return nil if the
</span><span class="cx"> provisional data source hasn't yet been loaded.
</span><del>- @result The datasource for this frame.
</del><span class="cx"> */
</span><del>-- (WebDataSource *)dataSource;
</del><ins>+@property (nonatomic, readonly, strong) WebDataSource *dataSource;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method provisionalDataSource
</del><ins>+ @property provisionalDataSource
+ @abstract The provisional datasource of this frame.
</ins><span class="cx"> @discussion Will return the provisional data source. The provisional data source will
</span><span class="cx"> be nil if no data source has been set on the frame, or the data source
</span><span class="cx"> has successfully transitioned to the committed data source.
</span><del>- @result The provisional datasource of this frame.
</del><span class="cx"> */
</span><del>-- (WebDataSource *)provisionalDataSource;
</del><ins>+@property (nonatomic, readonly, strong) WebDataSource *provisionalDataSource;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method stopLoading
</span><span class="lines">@@ -190,38 +190,38 @@
</span><span class="cx"> - (WebFrame *)findFrameNamed:(NSString *)name;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method parentFrame
- @result The frame containing this frame, or nil if this is a top level frame.
</del><ins>+ @property parentFrame
+ @abstract The frame containing this frame, or nil if this is a top level frame.
</ins><span class="cx"> */
</span><del>-- (WebFrame *)parentFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *parentFrame;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method childFrames
</del><ins>+ @property childFrames
+ @abstract An array of WebFrame.
</ins><span class="cx"> @discussion The frames in the array are associated with a frame set or iframe.
</span><del>- @result Returns an array of WebFrame.
</del><span class="cx"> */
</span><del>-- (NSArray *)childFrames;
</del><ins>+@property (nonatomic, readonly, copy) NSArray *childFrames;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method windowObject
- @result The WebScriptObject representing the frame's JavaScript window object.
</del><ins>+ @property windowObject
+ @abstract The WebScriptObject representing the frame's JavaScript window object.
</ins><span class="cx"> */
</span><del>-- (WebScriptObject *)windowObject;
</del><ins>+@property (nonatomic, readonly, strong) WebScriptObject *windowObject;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method globalContext
- @result The frame's global JavaScript execution context. Use this method to
- bridge between the WebKit and JavaScriptCore APIs.
</del><ins>+ @property globalContext
+ @abstract The frame's global JavaScript execution context.
+ @discussion Use this method to bridge between the WebKit and JavaScriptCore APIs.
</ins><span class="cx"> */
</span><del>-- (JSGlobalContextRef)globalContext;
</del><ins>+@property (nonatomic, readonly) JSGlobalContextRef globalContext;
</ins><span class="cx">
</span><span class="cx"> #if JSC_OBJC_API_ENABLED
</span><span class="cx"> /*!
</span><del>- @method javaScriptContext
- @result The frame's global JavaScript execution context. Use this method to
- bridge between the WebKit and Objective-C JavaScriptCore API.
</del><ins>+ @property javaScriptContext
+ @abstract The frame's global JavaScript execution context.
+ @discussion Use this method to bridge between the WebKit and Objective-C JavaScriptCore API.
</ins><span class="cx"> */
</span><del>-- (JSContext *)javaScriptContext;
</del><ins>+@property (nonatomic, readonly, strong) JSContext *javaScriptContext;
</ins><span class="cx"> #endif // JSC_OBJC_API_ENABLED
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFramemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrame.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebFrame.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -1307,13 +1307,13 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebFrame
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Should be deprecated.
</span><del>-- (id)initWithName:(NSString *)name webFrameView:(WebFrameView *)view webView:(WebView *)webView
</del><ins>+- (instancetype)initWithName:(NSString *)name webFrameView:(WebFrameView *)view webView:(WebView *)webView
</ins><span class="cx"> {
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebFrameView.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebFrameView.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebFrameView.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -44,41 +44,31 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method webFrame
- @abstract Returns the WebFrame associated with this WebFrameView
- @result The WebFrameView's frame.
</del><ins>+ @property webFrame
+ @abstract The WebFrame associated with this WebFrameView
</ins><span class="cx"> */
</span><del>-- (WebFrame *)webFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *webFrame;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method documentView
- @abstract Returns the WebFrameView's document subview
- @result The subview that renders the WebFrameView's contents
</del><ins>+ @property documentView
+ @abstract The WebFrameView's document subview
+ @discussion The subview that renders the WebFrameView's contents
</ins><span class="cx"> */
</span><del>-- (NSView <WebDocumentView> *)documentView;
</del><ins>+@property (nonatomic, readonly, strong) NSView<WebDocumentView> *documentView;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setAllowsScrolling:
- @abstract Sets whether the WebFrameView allows its document to be scrolled
- @param flag YES to allow the document to be scrolled, NO to disallow scrolling
</del><ins>+ @property allowsScrolling
+ @abstract Whether the WebFrameView allows its document to be scrolled
</ins><span class="cx"> */
</span><del>-- (void)setAllowsScrolling:(BOOL)flag;
</del><ins>+@property (nonatomic) BOOL allowsScrolling;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method allowsScrolling
- @abstract Returns whether the WebFrameView allows its document to be scrolled
- @result YES if the document is allowed to scroll, otherwise NO
</del><ins>+ @property canPrintHeadersAndFooters
+ @abstract Whether this frame can print headers and footers
</ins><span class="cx"> */
</span><del>-- (BOOL)allowsScrolling;
</del><ins>+@property (nonatomic, readonly) BOOL canPrintHeadersAndFooters;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method canPrintHeadersAndFooters
- @abstract Tells whether this frame can print headers and footers
- @result YES if the frame can, no otherwise
-*/
-- (BOOL)canPrintHeadersAndFooters;
-
-/*!
</del><span class="cx"> @method printOperationWithPrintInfo
</span><span class="cx"> @abstract Creates a print operation set up to print this frame
</span><span class="cx"> @result A newly created print operation object
</span><span class="lines">@@ -86,13 +76,13 @@
</span><span class="cx"> - (NSPrintOperation *)printOperationWithPrintInfo:(NSPrintInfo *)printInfo;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method documentViewShouldHandlePrint
</del><ins>+ @property documentViewShouldHandlePrint
</ins><span class="cx"> @abstract Called by the host application before it initializes and runs a print operation.
</span><del>- @result If NO is returned, the host application will abort its print operation and call -printDocumentView on the
</del><ins>+ @discussion If NO is returned, the host application will abort its print operation and call -printDocumentView on the
</ins><span class="cx"> WebFrameView. The document view is then expected to run its own print operation. If YES is returned, the host
</span><span class="cx"> application's print operation will continue as normal.
</span><span class="cx"> */
</span><del>-- (BOOL)documentViewShouldHandlePrint;
</del><ins>+@property (nonatomic, readonly) BOOL documentViewShouldHandlePrint;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method printDocumentView
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPolicyDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebPolicyDelegate.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx"> @constant WebNavigationTypeOther Navigation is taking place for some other reason.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-typedef enum {
</del><ins>+typedef NS_ENUM(NSInteger, WebNavigationType) {
</ins><span class="cx"> WebNavigationTypeLinkClicked,
</span><span class="cx"> WebNavigationTypeFormSubmitted,
</span><span class="cx"> WebNavigationTypeBackForward,
</span><span class="cx"> WebNavigationTypeReload,
</span><span class="cx"> WebNavigationTypeFormResubmitted,
</span><span class="cx"> WebNavigationTypeOther
</span><del>-} WebNavigationType;
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> extern NSString *WebActionNavigationTypeKey; // NSNumber (WebNavigationType)
</span><span class="cx"> extern NSString *WebActionElementKey; // NSDictionary of element info
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -57,12 +57,11 @@
</span><span class="cx">
</span><span class="cx"> Examples: Safari, OmniWeb, Shiira.
</span><span class="cx"> */
</span><del>-enum {
</del><ins>+typedef NS_ENUM(NSUInteger, WebCacheModel) {
</ins><span class="cx"> WebCacheModelDocumentViewer = 0,
</span><span class="cx"> WebCacheModelDocumentBrowser = 1,
</span><span class="cx"> WebCacheModelPrimaryWebBrowser = 2
</span><span class="cx"> };
</span><del>-typedef NSUInteger WebCacheModel;
</del><span class="cx">
</span><span class="cx"> typedef struct WebPreferencesPrivate WebPreferencesPrivate;
</span><span class="cx">
</span><span class="lines">@@ -91,357 +90,177 @@
</span><span class="cx"> for the WebPreferences.
</span><span class="cx"> @result Returns a new instance of WebPreferences or a previously allocated instance with the same identifier.
</span><span class="cx"> */
</span><del>-- (id)initWithIdentifier:(NSString *)anIdentifier;
</del><ins>+- (instancetype)initWithIdentifier:(NSString *)anIdentifier;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method identifier
</span><span class="cx"> @result Returns the identifier for this WebPreferences.
</span><span class="cx"> */
</span><del>-- (NSString *)identifier;
</del><ins>+@property (nonatomic, readonly, copy) NSString *identifier;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method standardFontFamily
</del><ins>+ @property standardFontFamily
</ins><span class="cx"> */
</span><del>-- (NSString *)standardFontFamily;
</del><ins>+@property (nonatomic, copy) NSString *standardFontFamily;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setStandardFontFamily:
- @param family
</del><ins>+ @property fixedFontFamily
</ins><span class="cx"> */
</span><del>-- (void)setStandardFontFamily:(NSString *)family;
</del><ins>+@property (nonatomic, copy) NSString *fixedFontFamily;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method fixedFontFamily
</del><ins>+ @property serifFontFamily
</ins><span class="cx"> */
</span><del>-- (NSString *)fixedFontFamily;
</del><ins>+@property (nonatomic, copy) NSString *serifFontFamily;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setFixedFontFamily:
- @param family
</del><ins>+ @property sansSerifFontFamily
</ins><span class="cx"> */
</span><del>-- (void)setFixedFontFamily:(NSString *)family;
</del><ins>+@property (nonatomic, copy) NSString *sansSerifFontFamily;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method serifFontFamily
</del><ins>+ @property cursiveFontFamily
</ins><span class="cx"> */
</span><del>-- (NSString *)serifFontFamily;
</del><ins>+@property (nonatomic, copy) NSString *cursiveFontFamily;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setSerifFontFamily:
- @param family
</del><ins>+ @property fantasyFontFamily
</ins><span class="cx"> */
</span><del>-- (void)setSerifFontFamily:(NSString *)family;
</del><ins>+@property (nonatomic, copy) NSString *fantasyFontFamily;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method sansSerifFontFamily
</del><ins>+ @property defaultFontSize
</ins><span class="cx"> */
</span><del>-- (NSString *)sansSerifFontFamily;
</del><ins>+@property (nonatomic) int defaultFontSize;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setSansSerifFontFamily:
- @param family
</del><ins>+ @property defaultFixedFontSize
</ins><span class="cx"> */
</span><del>-- (void)setSansSerifFontFamily:(NSString *)family;
</del><ins>+@property (nonatomic) int defaultFixedFontSize;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method cursiveFontFamily
</del><ins>+ @property minimumFontSize
</ins><span class="cx"> */
</span><del>-- (NSString *)cursiveFontFamily;
</del><ins>+@property (nonatomic) int minimumFontSize;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setCursiveFontFamily:
- @param family
-*/
-- (void)setCursiveFontFamily:(NSString *)family;
-
-/*!
- @method fantasyFontFamily
-*/
-- (NSString *)fantasyFontFamily;
-
-/*!
- @method setFantasyFontFamily:
- @param family
-*/
-- (void)setFantasyFontFamily:(NSString *)family;
-
-/*!
- @method defaultFontSize
-*/
-- (int)defaultFontSize;
-
-/*!
- @method setDefaultFontSize:
- @param size
-*/
-- (void)setDefaultFontSize:(int)size;
-
-/*!
- @method defaultFixedFontSize
-*/
-- (int)defaultFixedFontSize;
-
-/*!
- @method setDefaultFixedFontSize:
- @param size
-*/
-- (void)setDefaultFixedFontSize:(int)size;
-
-/*!
- @method minimumFontSize
-*/
-- (int)minimumFontSize;
-
-/*!
- @method setMinimumFontSize:
- @param size
-*/
-- (void)setMinimumFontSize:(int)size;
-
-/*!
</del><span class="cx"> @method minimumLogicalFontSize
</span><span class="cx"> */
</span><del>-- (int)minimumLogicalFontSize;
</del><ins>+@property (nonatomic) int minimumLogicalFontSize;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setMinimumLogicalFontSize:
- @param size
</del><ins>+ @property defaultTextEncodingName
</ins><span class="cx"> */
</span><del>-- (void)setMinimumLogicalFontSize:(int)size;
</del><ins>+@property (nonatomic, copy) NSString *defaultTextEncodingName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method defaultTextEncodingName
</del><ins>+ @property userStyleSheetEnabled
</ins><span class="cx"> */
</span><del>-- (NSString *)defaultTextEncodingName;
</del><ins>+@property (nonatomic) BOOL userStyleSheetEnabled;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setDefaultTextEncodingName:
- @param encoding
</del><ins>+ @property userStyleSheetLocation
+ @abstract The location of the user style sheet.
</ins><span class="cx"> */
</span><del>-- (void)setDefaultTextEncodingName:(NSString *)encoding;
</del><ins>+@property (nonatomic, strong) NSURL *userStyleSheetLocation;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method userStyleSheetEnabled
</del><ins>+ @property javaEnabled
</ins><span class="cx"> */
</span><del>-- (BOOL)userStyleSheetEnabled;
</del><ins>+@property (nonatomic, getter=isJavaEnabled) BOOL javaEnabled;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setUserStyleSheetEnabled:
- @param flag
</del><ins>+ @property javaScriptEnabled
</ins><span class="cx"> */
</span><del>-- (void)setUserStyleSheetEnabled:(BOOL)flag;
</del><ins>+@property (nonatomic, getter=isJavaScriptEnabled) BOOL javaScriptEnabled;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method userStyleSheetLocation
- @discussion The location of the user style sheet.
</del><ins>+ @property javaScriptCanOpenWindowsAutomatically
</ins><span class="cx"> */
</span><del>-- (NSURL *)userStyleSheetLocation;
</del><ins>+@property (nonatomic) BOOL javaScriptCanOpenWindowsAutomatically;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setUserStyleSheetLocation:
- @param URL The location of the user style sheet.
</del><ins>+ @property plugInsEnabled
</ins><span class="cx"> */
</span><del>-- (void)setUserStyleSheetLocation:(NSURL *)URL;
</del><ins>+@property (nonatomic, getter=arePlugInsEnabled) BOOL plugInsEnabled;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method isJavaEnabled
</del><ins>+ @property allowsAnimatedImages
</ins><span class="cx"> */
</span><del>-- (BOOL)isJavaEnabled;
</del><ins>+@property (nonatomic) BOOL allowsAnimatedImages;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setJavaEnabled:
- @param flag
</del><ins>+ @property allowsAnimatedImageLooping
</ins><span class="cx"> */
</span><del>-- (void)setJavaEnabled:(BOOL)flag;
</del><ins>+@property (nonatomic) BOOL allowsAnimatedImageLooping;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method isJavaScriptEnabled
</del><ins>+ @property willLoadImagesAutomatically
</ins><span class="cx"> */
</span><del>-- (BOOL)isJavaScriptEnabled;
</del><ins>+@property (nonatomic) BOOL loadsImagesAutomatically;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setJavaScriptEnabled:
- @param flag
-*/
-- (void)setJavaScriptEnabled:(BOOL)flag;
-
-/*!
- @method JavaScriptCanOpenWindowsAutomatically
-*/
-- (BOOL)javaScriptCanOpenWindowsAutomatically;
-
-/*!
- @method setJavaScriptCanOpenWindowsAutomatically:
- @param flag
-*/
-- (void)setJavaScriptCanOpenWindowsAutomatically:(BOOL)flag;
-
-/*!
- @method arePlugInsEnabled
-*/
-- (BOOL)arePlugInsEnabled;
-
-/*!
- @method setPlugInsEnabled:
- @param flag
-*/
-- (void)setPlugInsEnabled:(BOOL)flag;
-
-/*!
- @method allowAnimatedImages
-*/
-- (BOOL)allowsAnimatedImages;
-
-/*!
- @method setAllowAnimatedImages:
- @param flag
-*/
-- (void)setAllowsAnimatedImages:(BOOL)flag;
-
-/*!
- @method allowAnimatedImageLooping
-*/
-- (BOOL)allowsAnimatedImageLooping;
-
-/*!
- @method setAllowAnimatedImageLooping:
- @param flag
-*/
-- (void)setAllowsAnimatedImageLooping: (BOOL)flag;
-
-/*!
- @method setWillLoadImagesAutomatically:
- @param flag
-*/
-- (void)setLoadsImagesAutomatically: (BOOL)flag;
-
-/*!
- @method willLoadImagesAutomatically
-*/
-- (BOOL)loadsImagesAutomatically;
-
-/*!
- @method setAutosaves:
- @param flag
- @discussion If autosave preferences is YES the settings represented by
</del><ins>+ @property autosaves
+ @discussion If autosaves is YES the settings represented by
</ins><span class="cx"> WebPreferences will be stored in the user defaults database.
</span><span class="cx"> */
</span><del>-- (void)setAutosaves:(BOOL)flag;
</del><ins>+@property (nonatomic) BOOL autosaves;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method autosaves
- @result The value of the autosave preferences flag.
</del><ins>+ @property shouldPrintBackgrounds
</ins><span class="cx"> */
</span><del>-- (BOOL)autosaves;
</del><ins>+@property (nonatomic) BOOL shouldPrintBackgrounds;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setShouldPrintBackgrounds:
- @param flag
-*/
-- (void)setShouldPrintBackgrounds:(BOOL)flag;
-
-/*!
- @method shouldPrintBackgrounds
- @result The value of the shouldPrintBackgrounds preferences flag
-*/
-- (BOOL)shouldPrintBackgrounds;
-
-/*!
- @method setPrivateBrowsingEnabled:
- @param flag
</del><ins>+ @property privateBrowsingEnabled:
</ins><span class="cx"> @abstract If private browsing is enabled, WebKit will not store information
</span><span class="cx"> about sites the user visits.
</span><span class="cx"> */
</span><del>-- (void)setPrivateBrowsingEnabled:(BOOL)flag;
</del><ins>+@property (nonatomic) BOOL privateBrowsingEnabled;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method privateBrowsingEnabled
- */
-- (BOOL)privateBrowsingEnabled;
-
-/*!
- @method setTabsToLinks:
- @param flag
- @abstract If tabsToLinks is YES, the tab key will focus links and form controls.
</del><ins>+ @property tabsToLinks
+ @abstract If tabsToLinks is YES, the tab key will focus links and form controls.
</ins><span class="cx"> The option key temporarily reverses this preference.
</span><span class="cx"> */
</span><del>-- (void)setTabsToLinks:(BOOL)flag;
</del><ins>+@property (nonatomic) BOOL tabsToLinks;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method tabsToLinks
-*/
-- (BOOL)tabsToLinks;
-
-/*!
- @method setUsesPageCache:
- @abstract Sets whether the receiver's associated WebViews use the shared
</del><ins>+ @property usesPageCache
+ @abstract Whether the receiver's associated WebViews use the shared
</ins><span class="cx"> page cache.
</span><del>- @param UsesPageCache Whether the receiver's associated WebViews use the
- shared page cache.
</del><span class="cx"> @discussion Pages are cached as they are added to a WebBackForwardList, and
</span><span class="cx"> removed from the cache as they are removed from a WebBackForwardList. Because
</span><span class="cx"> the page cache is global, caching a page in one WebBackForwardList may cause
</span><span class="cx"> a page in another WebBackForwardList to be evicted from the cache.
</span><span class="cx"> */
</span><del>-- (void)setUsesPageCache:(BOOL)usesPageCache;
</del><ins>+@property (nonatomic) BOOL usesPageCache;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method usesPageCache
- @abstract Returns whether the receiver should use the shared page cache.
- @result Whether the receiver should use the shared page cache.
- @discussion Pages are cached as they are added to a WebBackForwardList, and
- removed from the cache as they are removed from a WebBackForwardList. Because
- the page cache is global, caching a page in one WebBackForwardList may cause
- a page in another WebBackForwardList to be evicted from the cache.
-*/
-- (BOOL)usesPageCache;
</del><ins>+ @property cacheModel
+ @abstract Specifies a usage model for a WebView, which WebKit will use to
+ determine its caching behavior. If necessary, WebKit
+ will prune its caches to match cacheModel when set.
</ins><span class="cx">
</span><del>-/*!
-@method setCacheModel:
</del><ins>+ @discussion Research indicates that users tend to browse within clusters of
+ documents that hold resources in common, and to revisit previously visited
+ documents. WebKit and the frameworks below it include built-in caches that take
+ advantage of these patterns, substantially improving document load speed in
+ browsing situations. The WebKit cache model controls the behaviors of all of
+ these caches, including NSURLCache and the various WebCore caches.
</ins><span class="cx">
</span><del>-@abstract Specifies a usage model for a WebView, which WebKit will use to
-determine its caching behavior.
</del><ins>+ Applications with a browsing interface can improve document load speed
+ substantially by specifying WebCacheModelDocumentBrowser. Applications without
+ a browsing interface can reduce memory usage substantially by specifying
+ WebCacheModelDocumentViewer.
</ins><span class="cx">
</span><del>-@param cacheModel The WebView's usage model for WebKit. If necessary, WebKit
-will prune its caches to match cacheModel.
-
-@discussion Research indicates that users tend to browse within clusters of
-documents that hold resources in common, and to revisit previously visited
-documents. WebKit and the frameworks below it include built-in caches that take
-advantage of these patterns, substantially improving document load speed in
-browsing situations. The WebKit cache model controls the behaviors of all of
-these caches, including NSURLCache and the various WebCore caches.
-
-Applications with a browsing interface can improve document load speed
-substantially by specifying WebCacheModelDocumentBrowser. Applications without
-a browsing interface can reduce memory usage substantially by specifying
-WebCacheModelDocumentViewer.
-
-If setCacheModel: is not called, WebKit will select a cache model automatically.
</del><ins>+ If cacheModel is not set, WebKit will select a cache model automatically.
</ins><span class="cx"> */
</span><del>-- (void)setCacheModel:(WebCacheModel)cacheModel;
</del><ins>+@property (nonatomic) WebCacheModel cacheModel;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>-@method cacheModel:
-
-@abstract Returns the usage model according to which WebKit determines its
-caching behavior.
-
-@result The usage model.
</del><ins>+ @property suppressesIncrementalRendering
</ins><span class="cx"> */
</span><del>-- (WebCacheModel)cacheModel;
</del><ins>+@property (nonatomic) BOOL suppressesIncrementalRendering;
</ins><span class="cx">
</span><del>-/*!
- @method setSuppressesIncrementalRendering:
- @param suppressesIncrementalRendering YES to suppress incremental rendering;
- NO otherwise.
-*/
-- (void)setSuppressesIncrementalRendering:(BOOL)suppressesIncrementalRendering;
-
-/*!
- @method suppressesIncrementalRendering
- @result YES if the WebView suppresses incremental rendering; NO otherwise.
-*/
-- (BOOL)suppressesIncrementalRendering;
-
</del><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebPreferences
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> // Create fake identifier
</span><span class="cx"> static int instanceCount = 1;
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> return [self initWithIdentifier:fakeIdentifier];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithIdentifier:(NSString *)anIdentifier
</del><ins>+- (instancetype)initWithIdentifier:(NSString *)anIdentifier
</ins><span class="cx"> {
</span><span class="cx"> WebPreferences *instance = [[self class] _getInstanceForIdentifier:anIdentifier];
</span><span class="cx"> if (instance) {
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoder:(NSCoder *)decoder
</del><ins>+- (instancetype)initWithCoder:(NSCoder *)decoder
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx">
</span><span class="cx"> - (WebCacheModel)cacheModel
</span><span class="cx"> {
</span><del>- return [self _integerValueForKey:WebKitCacheModelPreferenceKey];
</del><ins>+ return (WebCacheModel)[self _integerValueForKey:WebKitCacheModelPreferenceKey];
</ins><span class="cx"> }
</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 (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResource.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebResource.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -52,36 +52,36 @@
</span><span class="cx"> @param frameName The frame name of the resource if the resource represents the contents of an entire HTML frame (can be nil).
</span><span class="cx"> @result An initialized WebResource.
</span><span class="cx"> */
</span><del>-- (id)initWithData:(NSData *)data URL:(NSURL *)URL MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName frameName:(NSString *)frameName;
</del><ins>+- (instancetype)initWithData:(NSData *)data URL:(NSURL *)URL MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName frameName:(NSString *)frameName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method data
- @result The data of the resource.
</del><ins>+ @property data
+ @abstract The data of the resource.
</ins><span class="cx"> */
</span><del>-- (NSData *)data;
</del><ins>+@property (nonatomic, readonly, copy) NSData *data;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method URL
- @result The URL of the resource.
</del><ins>+ @property URL
+ @abstract The URL of the resource.
</ins><span class="cx"> */
</span><del>-- (NSURL *)URL;
</del><ins>+@property (nonatomic, readonly, strong) NSURL *URL;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method MIMEType
- @result The MIME type of the resource.
</del><ins>+ @property MIMEType
+ @abstract The MIME type of the resource.
</ins><span class="cx"> */
</span><del>-- (NSString *)MIMEType;
</del><ins>+@property (nonatomic, readonly, copy) NSString *MIMEType;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method textEncodingName
- @result The text encoding name of the resource (can be nil).
</del><ins>+ @property textEncodingName
+ @abstract The text encoding name of the resource (can be nil).
</ins><span class="cx"> */
</span><del>-- (NSString *)textEncodingName;
</del><ins>+@property (nonatomic, readonly, copy) NSString *textEncodingName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method frameName
- @result The frame name of the resource if the resource represents the contents of an entire HTML frame (can be nil).
</del><ins>+ @property frameName
+ @abstract The frame name of the resource if the resource represents the contents of an entire HTML frame (can be nil).
</ins><span class="cx"> */
</span><del>-- (NSString *)frameName;
</del><ins>+@property (nonatomic, readonly, copy) NSString *frameName;
</ins><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebResourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebResource.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebResource.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebResource.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> @public
</span><span class="cx"> ArchiveResource* coreResource;
</span><span class="cx"> }
</span><del>-- (id)initWithCoreResource:(PassRefPtr<ArchiveResource>)coreResource;
</del><ins>+- (instancetype)initWithCoreResource:(PassRefPtr<ArchiveResource>)coreResource;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WebResourcePrivate
</span><span class="lines">@@ -72,12 +72,12 @@
</span><span class="cx"> WebCoreObjCFinalizeOnMainThread(self);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> return [super init];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoreResource:(PassRefPtr<ArchiveResource>)passedResource
</del><ins>+- (instancetype)initWithCoreResource:(PassRefPtr<ArchiveResource>)passedResource
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx">
</span><span class="cx"> @implementation WebResource
</span><span class="cx">
</span><del>-- (id)init
</del><ins>+- (instancetype)init
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -117,12 +117,12 @@
</span><span class="cx"> return self;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithData:(NSData *)data URL:(NSURL *)URL MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName frameName:(NSString *)frameName
</del><ins>+- (instancetype)initWithData:(NSData *)data URL:(NSURL *)URL MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName frameName:(NSString *)frameName
</ins><span class="cx"> {
</span><span class="cx"> return [self _initWithData:data URL:URL MIMEType:MIMEType textEncodingName:textEncodingName frameName:frameName response:nil copyData:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoder:(NSCoder *)decoder
</del><ins>+- (instancetype)initWithCoder:(NSCoder *)decoder
</ins><span class="cx"> {
</span><span class="cx"> WebCoreThreadViolationCheckRoundTwo();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebUIDelegate.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebUIDelegate.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -81,13 +81,13 @@
</span><span class="cx"> @constant WebDragDestinationActionLoad Allows a location change from the drag
</span><span class="cx"> @constant WebDragDestinationActionAny Allows any of the above to occur
</span><span class="cx"> */
</span><del>-typedef enum {
</del><ins>+typedef NS_OPTIONS(NSUInteger, WebDragDestinationAction) {
</ins><span class="cx"> WebDragDestinationActionNone = 0,
</span><span class="cx"> WebDragDestinationActionDHTML = 1,
</span><span class="cx"> WebDragDestinationActionEdit = 2,
</span><span class="cx"> WebDragDestinationActionLoad = 4,
</span><span class="cx"> WebDragDestinationActionAny = UINT_MAX
</span><del>-} WebDragDestinationAction;
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @enum WebDragSourceAction
</span><span class="lines">@@ -99,14 +99,14 @@
</span><span class="cx"> @constant WebDragSourceActionSelection Allows a selection drag to occur
</span><span class="cx"> @constant WebDragSourceActionAny Allows any of the above to occur
</span><span class="cx"> */
</span><del>-typedef enum {
</del><ins>+typedef NS_OPTIONS(NSUInteger, WebDragSourceAction) {
</ins><span class="cx"> WebDragSourceActionNone = 0,
</span><span class="cx"> WebDragSourceActionDHTML = 1,
</span><span class="cx"> WebDragSourceActionImage = 2,
</span><span class="cx"> WebDragSourceActionLink = 4,
</span><span class="cx"> WebDragSourceActionSelection = 8,
</span><span class="cx"> WebDragSourceActionAny = UINT_MAX
</span><del>-} WebDragSourceAction;
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @protocol WebOpenPanelResultListener
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.h (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.h 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebView.h 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -183,7 +183,7 @@
</span><span class="cx"> @param groupName The name of the webView set to which this webView will be added. May be nil.
</span><span class="cx"> @result Returns an initialized WebView.
</span><span class="cx"> */
</span><del>-- (id)initWithFrame:(NSRect)frame frameName:(NSString *)frameName groupName:(NSString *)groupName;
</del><ins>+- (instancetype)initWithFrame:(NSRect)frame frameName:(NSString *)frameName groupName:(NSString *)groupName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method close
</span><span class="lines">@@ -198,113 +198,62 @@
</span><span class="cx"> - (void)close;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setShouldCloseWithWindow:
- @abstract Set whether the receiver closes when either it's window or hostWindow closes.
- @param close YES if the receiver should close when either it's window or hostWindow closes, otherwise NO.
</del><ins>+ @property shouldCloseWithWindow
+ @abstract Whether the receiver closes when either it's window or hostWindow closes.
+ @discussion Defaults to YES in garbage collected applications, otherwise NO to maintain backwards compatibility.
</ins><span class="cx"> */
</span><del>-- (void)setShouldCloseWithWindow:(BOOL)close;
</del><ins>+@property (nonatomic) BOOL shouldCloseWithWindow;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method shouldCloseWithWindow
- @abstract Returns whether the receiver closes when either it's window or hostWindow closes.
- @discussion Defaults to YES in garbage collected applications, otherwise NO to maintain backwards compatibility.
- @result YES if the receiver closes when either it's window or hostWindow closes, otherwise NO.
</del><ins>+ @property UIDelegate
+ @abstract The WebView's WebUIDelegate.
</ins><span class="cx"> */
</span><del>-- (BOOL)shouldCloseWithWindow;
</del><ins>+@property (nonatomic, assign) id UIDelegate;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setUIDelegate:
- @abstract Set the WebView's WebUIDelegate.
- @param delegate The WebUIDelegate to set as the delegate.
-*/
-- (void)setUIDelegate:(id)delegate;
</del><ins>+ @property resourceLoadDelegate
+ @abstract The WebView's WebResourceLoadDelegate.
+*/
+@property (nonatomic, assign) id resourceLoadDelegate;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method UIDelegate
- @abstract Return the WebView's WebUIDelegate.
- @result The WebView's WebUIDelegate.
</del><ins>+ @property downloadDelegate
+ @abstract The WebView's WebDownloadDelegate.
</ins><span class="cx"> */
</span><del>-- (id)UIDelegate;
</del><ins>+@property (nonatomic, assign) id downloadDelegate;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setResourceLoadDelegate:
- @abstract Set the WebView's WebResourceLoadDelegate load delegate.
- @param delegate The WebResourceLoadDelegate to set as the load delegate.
</del><ins>+ @property frameLoadDelegate
+ @abstract The WebView's WebFrameLoadDelegate delegate.
</ins><span class="cx"> */
</span><del>-- (void)setResourceLoadDelegate:(id)delegate;
</del><ins>+@property (nonatomic, assign) id frameLoadDelegate;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method resourceLoadDelegate
- @result Return the WebView's WebResourceLoadDelegate.
-*/
-- (id)resourceLoadDelegate;
</del><ins>+ @property policyDelegate
+ @abstract The WebView's WebPolicyDelegate.
+*/
+@property (nonatomic, assign) id policyDelegate;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setDownloadDelegate:
- @abstract Set the WebView's WebDownloadDelegate.
- @discussion The download delegate is retained by WebDownload when any downloads are in progress.
- @param delegate The WebDownloadDelegate to set as the download delegate.
-*/
-- (void)setDownloadDelegate:(id)delegate;
</del><ins>+ @property mainFrame
+ @abstract The top level frame.
+ @discussion Note that even documents that are not framesets will have a mainFrame.
+*/
+@property (nonatomic, readonly, strong) WebFrame *mainFrame;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method downloadDelegate
- @abstract Return the WebView's WebDownloadDelegate.
- @result The WebView's WebDownloadDelegate.
-*/
-- (id)downloadDelegate;
-
-/*!
- @method setFrameLoadDelegate:
- @abstract Set the WebView's WebFrameLoadDelegate delegate.
- @param delegate The WebFrameLoadDelegate to set as the delegate.
-*/
-- (void)setFrameLoadDelegate:(id)delegate;
-
-/*!
- @method frameLoadDelegate
- @abstract Return the WebView's WebFrameLoadDelegate delegate.
- @result The WebView's WebFrameLoadDelegate delegate.
-*/
-- (id)frameLoadDelegate;
-
-/*!
- @method setPolicyDelegate:
- @abstract Set the WebView's WebPolicyDelegate delegate.
- @param delegate The WebPolicyDelegate to set as the delegate.
-*/
-- (void)setPolicyDelegate:(id)delegate;
-
-/*!
- @method policyDelegate
- @abstract Return the WebView's WebPolicyDelegate.
- @result The WebView's WebPolicyDelegate.
-*/
-- (id)policyDelegate;
-
-/*!
- @method mainFrame
- @abstract Return the top level frame.
- @discussion Note that even document that are not framesets will have a
- mainFrame.
- @result The main frame.
-*/
-- (WebFrame *)mainFrame;
-
-/*!
- @method selectedFrame
- @abstract Return the frame that has the active selection.
</del><ins>+ @property selectedFrame
+ @abstract The frame that has the active selection.
</ins><span class="cx"> @discussion Returns the frame that contains the first responder, if any. Otherwise returns the
</span><span class="cx"> frame that contains a non-zero-length selection, if any. Returns nil if no frame meets these criteria.
</span><del>- @result The selected frame.
</del><span class="cx"> */
</span><del>-- (WebFrame *)selectedFrame;
</del><ins>+@property (nonatomic, readonly, strong) WebFrame *selectedFrame;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method backForwardList
- @result The backforward list for this webView.
</del><ins>+ @property backForwardList
+ @abstract The backforward list for this WebView.
</ins><span class="cx"> */
</span><del>-- (WebBackForwardList *)backForwardList;
</del><ins>+@property (nonatomic, readonly, strong) WebBackForwardList *backForwardList;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method setMaintainsBackForwardList:
</span><span class="lines">@@ -335,49 +284,33 @@
</span><span class="cx"> - (BOOL)goToBackForwardItem:(WebHistoryItem *)item;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setTextSizeMultiplier:
- @abstract Change the size of the text rendering in views managed by this webView.
- @param multiplier A fractional percentage value, 1.0 is 100%.
</del><ins>+ @property textSizeMultiplier
+ @abstract The text size multipler.
</ins><span class="cx"> */
</span><del>-- (void)setTextSizeMultiplier:(float)multiplier;
</del><ins>+@property (nonatomic) float textSizeMultiplier;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method textSizeMultiplier
- @result The text size multipler.
-*/
-- (float)textSizeMultiplier;
-
-/*!
- @method setApplicationNameForUserAgent:
- @abstract Set the application name.
- @discussion This name will be used in user-agent strings
- that are chosen for best results in rendering web pages.
- @param applicationName The application name
</del><ins>+ @property applicationNameForUserAgent
+ @abstract The name of the application as used in the user-agent string.
</ins><span class="cx"> */
</span><del>-- (void)setApplicationNameForUserAgent:(NSString *)applicationName;
</del><ins>+@property (nonatomic, copy) NSString *applicationNameForUserAgent;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method applicationNameForUserAgent
- @result The name of the application as used in the user-agent string.
-*/
-- (NSString *)applicationNameForUserAgent;
-
-/*!
</del><span class="cx"> @method setCustomUserAgent:
</span><span class="cx"> @abstract Set the user agent.
</span><del>- @discussion Setting this means that the webView should use this user-agent string
- instead of constructing a user-agent string for each URL. Setting it to nil
- causes the webView to construct the user-agent string for each URL
- for best results rendering web pages.
</del><ins>+ @discussion .
</ins><span class="cx"> @param userAgentString The user agent description
</span><span class="cx"> */
</span><del>-- (void)setCustomUserAgent:(NSString *)userAgentString;
</del><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method customUserAgent
- @result The custom user-agent string or nil if no custom user-agent string has been set.
</del><ins>+ @property customUserAgent
+ @abstract The custom user-agent string or nil if no custom user-agent string has been set.
+ @discussion Setting this means that the webView should use this user-agent string
+ instead of constructing a user-agent string for each URL. Setting it to nil
+ causes the webView to construct the user-agent string for each URL
+ for best results rendering web pages
</ins><span class="cx"> */
</span><del>-- (NSString *)customUserAgent;
</del><ins>+@property (nonatomic, copy) NSString *customUserAgent;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method userAgentForURL:
</span><span class="lines">@@ -389,45 +322,31 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method supportsTextEncoding
- @abstract Find out if the current web page supports text encodings.
- @result YES if the document view of the current web page can
- support different text encodings.
</del><ins>+ @property supportsTextEncoding
+ @abstract If the document view of the current web page can support different text encodings.
</ins><span class="cx"> */
</span><del>-- (BOOL)supportsTextEncoding;
</del><ins>+@property (nonatomic, readonly) BOOL supportsTextEncoding;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setCustomTextEncodingName:
</del><ins>+ @property customTextEncodingName
+ @abstract The custom text encoding name or nil if no custom text encoding name has been set.
</ins><span class="cx"> @discussion Make the page display with a different text encoding; stops any load in progress.
</span><span class="cx"> The text encoding passed in overrides the normal text encoding smarts including
</span><span class="cx"> what's specified in a web page's header or HTTP response.
</span><span class="cx"> The text encoding automatically goes back to the default when the top level frame
</span><span class="cx"> changes to a new location.
</span><span class="cx"> Setting the text encoding name to nil makes the webView use default encoding rules.
</span><del>- @param encoding The text encoding name to use to display a page or nil.
-*/
-- (void)setCustomTextEncodingName:(NSString *)encodingName;
</del><span class="cx">
</span><del>-/*!
- @method customTextEncodingName
- @result The custom text encoding name or nil if no custom text encoding name has been set.
</del><span class="cx"> */
</span><del>-- (NSString *)customTextEncodingName;
</del><ins>+@property (nonatomic, copy) NSString *customTextEncodingName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setMediaStyle:
- @discussion Set the media style for the WebView. The mediaStyle will override the normal value
- of the CSS media property. Setting the value to nil will restore the normal value.
- @param mediaStyle The value to use for the CSS media property.
-*/
-- (void)setMediaStyle:(NSString *)mediaStyle;
-
-/*!
</del><span class="cx"> @method mediaStyle
</span><del>- @result mediaStyle The value to use for the CSS media property, as set by setMediaStyle:. It
- will be nil unless set by that method.
</del><ins>+ @abstract The media style for the WebView.
+ @discussion The mediaStyle will override the normal value
+ of the CSS media property. Setting the value to nil will restore the normal value. The value will be nil unless explicitly set.
</ins><span class="cx"> */
</span><del>-- (NSString *)mediaStyle;
</del><ins>+@property (nonatomic, copy) NSString *mediaStyle;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method stringByEvaluatingJavaScriptFromString:
</span><span class="lines">@@ -437,60 +356,37 @@
</span><span class="cx"> - (NSString *)stringByEvaluatingJavaScriptFromString:(NSString *)script;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method windowScriptObject
- @discussion windowScriptObject return a WebScriptObject that represents the
</del><ins>+ @property windowScriptObject
+ @abstract A WebScriptObject that represents the
</ins><span class="cx"> window object from the script environment.
</span><del>- @result Returns the window object from the script environment.
</del><span class="cx"> */
</span><del>-- (WebScriptObject *)windowScriptObject;
</del><ins>+@property (nonatomic, readonly, strong) WebScriptObject *windowScriptObject;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setPreferences:
- @param preferences The preferences to use for the webView.
- @abstract Override the standard setting for the webView.
-*/
-- (void)setPreferences: (WebPreferences *)prefs;
-
-/*!
- @method preferences
- @result Returns the preferences used by this webView.
</del><ins>+ @property preferences
+ @abstract The preferences used by this WebView.
</ins><span class="cx"> @discussion This method will return [WebPreferences standardPreferences] if no
</span><span class="cx"> other instance of WebPreferences has been set.
</span><span class="cx"> */
</span><del>-- (WebPreferences *)preferences;
</del><ins>+@property (nonatomic, strong) WebPreferences *preferences;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setPreferencesIdentifier:
- @param anIdentifier The string to use a prefix for storing values for this WebView in the user
- defaults database.
- @discussion If the WebPreferences for this WebView are stored in the user defaults database, the
- string set in this method will be used a key prefix.
</del><ins>+ @property preferencesIdentifier
+ @abstract The WebPreferences key prefix.
+ @discussion If the WebPreferences for this WebView are stored in the user defaults database, this string will be used as a key prefix.
</ins><span class="cx"> */
</span><del>-- (void)setPreferencesIdentifier:(NSString *)anIdentifier;
</del><ins>+@property (nonatomic, copy) NSString *preferencesIdentifier;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method preferencesIdentifier
- @result Returns the WebPreferences key prefix.
-*/
-- (NSString *)preferencesIdentifier;
-
-
-/*!
- @method setHostWindow:
- @param hostWindow The host window for the web view.
</del><ins>+ @property hostWindow
+ @abstract The host window for the web view.
</ins><span class="cx"> @discussion Parts of WebKit (such as plug-ins and JavaScript) depend on a window to function
</span><span class="cx"> properly. Set a host window so these parts continue to function even when the web view is
</span><span class="cx"> not in an actual window.
</span><span class="cx"> */
</span><del>-- (void)setHostWindow:(NSWindow *)hostWindow;
</del><ins>+@property (nonatomic, strong) NSWindow *hostWindow;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method hostWindow
- @result The host window for the web view.
-*/
-- (NSWindow *)hostWindow;
-
-/*!
</del><span class="cx"> @method searchFor:direction:caseSensitive:
</span><span class="cx"> @abstract Searches a document view for a string and highlights the string if it is found.
</span><span class="cx"> Starts the search from the current selection. Will search across all frames.
</span><span class="lines">@@ -514,22 +410,15 @@
</span><span class="cx"> */
</span><span class="cx"> + (void)registerViewClass:(Class)viewClass representationClass:(Class)representationClass forMIMEType:(NSString *)MIMEType;
</span><span class="cx">
</span><del>-
</del><span class="cx"> /*!
</span><del>- @method setGroupName:
- @param groupName The name of the group for this WebView.
- @discussion JavaScript may access named frames within the same group.
</del><ins>+ @property groupName
+ @abstract The group name for this WebView.
+ @discussion JavaScript may access named frames within the same group.
</ins><span class="cx"> */
</span><del>-- (void)setGroupName:(NSString *)groupName;
</del><ins>+@property (nonatomic, copy) NSString *groupName;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method groupName
- @discussion The group name for this WebView.
-*/
-- (NSString *)groupName;
-
-/*!
- @method estimatedProgress
</del><ins>+ @property estimatedProgress
</ins><span class="cx"> @discussion An estimate of the percent complete for a document load. This
</span><span class="cx"> value will range from 0 to 1.0 and, once a load completes, will remain at 1.0
</span><span class="cx"> until a new load starts, at which point it will be reset to 0. The value is an
</span><span class="lines">@@ -538,13 +427,13 @@
</span><span class="cx"> indication it is recommended that you implement a WebFrameLoadDelegate and a
</span><span class="cx"> WebResourceLoadDelegate.
</span><span class="cx"> */
</span><del>-- (double)estimatedProgress;
</del><ins>+@property (nonatomic, readonly) double estimatedProgress;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method isLoading
- @discussion Returns YES if there are any pending loads.
</del><ins>+ @property loading
+ @abstract Whether there are any pending loads in this WebView.
</ins><span class="cx"> */
</span><del>-- (BOOL)isLoading;
</del><ins>+@property (nonatomic, getter=isLoading, readonly) BOOL loading;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method elementAtPoint:
</span><span class="lines">@@ -554,10 +443,10 @@
</span><span class="cx"> - (NSDictionary *)elementAtPoint:(NSPoint)point;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method pasteboardTypesForSelection
- @abstract Returns the pasteboard types that WebView can use for the current selection
</del><ins>+ @property pasteboardTypesForSelection
+ @abstract The pasteboard types that the WebView can use for the current selection
</ins><span class="cx"> */
</span><del>-- (NSArray *)pasteboardTypesForSelection;
</del><ins>+@property (nonatomic, readonly, copy) NSArray *pasteboardTypesForSelection;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> @method writeSelectionWithPasteboardTypes:toPasteboard:
</span><span class="lines">@@ -598,65 +487,44 @@
</span><span class="cx"> - (void)removeDragCaret;
</span><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setDrawsBackground:
- @param drawsBackround YES to cause the receiver to draw a default white background, NO otherwise.
- @abstract Sets whether the receiver draws a default white background when the loaded page has no background specified.
</del><ins>+ @property drawsBackground
+ @abstract Whether the receiver draws a default white background when the loaded page has no background specified.
</ins><span class="cx"> */
</span><del>-- (void)setDrawsBackground:(BOOL)drawsBackround;
</del><ins>+@property (nonatomic) BOOL drawsBackground;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method drawsBackground
- @result Returns YES if the receiver draws a default white background, NO otherwise.
-*/
-- (BOOL)drawsBackground;
-
-/*!
- @method setShouldUpdateWhileOffscreen:
- @abstract Sets whether the receiver must update even when it is not in a window that is currently visible.
- @param updateWhileOffscreen whether the receiver is required to render updates to the web page when it is not in a visible window.
- @abstract If set to NO, then whenever the web view is not in a visible window, updates to the web page will not necessarily be rendered in the view.
</del><ins>+ @method shouldUpdateWhileOffscreen
+ @abstract Whether the WebView is always updated even when it is not in a window that is currently visible.
+ @discussion If set to NO, then whenever the web view is not in a visible window, updates to the web page will not necessarily be rendered in the view.
</ins><span class="cx"> However, when the window is made visible, the view will be updated automatically. Not updating while hidden can improve performance. If set to is YES,
</span><span class="cx"> hidden web views are always updated. This is the default.
</span><span class="cx"> */
</span><del>-- (void)setShouldUpdateWhileOffscreen:(BOOL)updateWhileOffscreen;
</del><ins>+@property (nonatomic) BOOL shouldUpdateWhileOffscreen;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method shouldUpdateWhileOffscreen
- @result Returns whether the web view is always updated even when it is not in a window that is currently visible.
</del><ins>+ @property mainFrameURL
+ @abstract The main frame's current URL.
</ins><span class="cx"> */
</span><del>-- (BOOL)shouldUpdateWhileOffscreen;
</del><ins>+@property (nonatomic, copy) NSString *mainFrameURL;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method setMainFrameURL:
- @param URLString The URL to load in the mainFrame.
</del><ins>+ @property mainFrameDocument
+ @abstract The main frame's DOMDocument.
</ins><span class="cx"> */
</span><del>-- (void)setMainFrameURL:(NSString *)URLString;
</del><ins>+@property (nonatomic, readonly, strong) DOMDocument *mainFrameDocument;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method mainFrameURL
- @result Returns the main frame's current URL.
</del><ins>+ @property mainFrameTitle
+ @abstract The main frame's title if any, otherwise an empty string.
</ins><span class="cx"> */
</span><del>-- (NSString *)mainFrameURL;
</del><ins>+@property (nonatomic, readonly, copy) NSString *mainFrameTitle;
</ins><span class="cx">
</span><span class="cx"> /*!
</span><del>- @method mainFrameDocument
- @result Returns the main frame's DOMDocument.
</del><ins>+ @property mainFrameIcon
+ @abstract The site icon for the current page loaded in the mainFrame, or nil.
</ins><span class="cx"> */
</span><del>-- (DOMDocument *)mainFrameDocument;
</del><ins>+@property (nonatomic, readonly, strong) NSImage *mainFrameIcon;
</ins><span class="cx">
</span><del>-/*!
- @method mainFrameTitle
- @result Returns the main frame's title if any, otherwise an empty string.
-*/
-- (NSString *)mainFrameTitle;
-
-/*!
- @method mainFrameIcon
- @discussion The methods returns the site icon for the current page loaded in the mainFrame.
- @result Returns the main frame's icon if any, otherwise nil.
-*/
-- (NSImage *)mainFrameIcon;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -665,15 +533,15 @@
</span><span class="cx"> - (IBAction)stopLoading:(id)sender;
</span><span class="cx"> - (IBAction)reload:(id)sender;
</span><span class="cx"> - (IBAction)reloadFromOrigin:(id)sender;
</span><del>-- (BOOL)canGoBack;
</del><ins>+@property (nonatomic, readonly) BOOL canGoBack;
</ins><span class="cx"> - (IBAction)goBack:(id)sender;
</span><del>-- (BOOL)canGoForward;
</del><ins>+@property (nonatomic, readonly) BOOL canGoForward;
</ins><span class="cx"> - (IBAction)goForward:(id)sender;
</span><del>-- (BOOL)canMakeTextLarger;
</del><ins>+@property (nonatomic, readonly) BOOL canMakeTextLarger;
</ins><span class="cx"> - (IBAction)makeTextLarger:(id)sender;
</span><del>-- (BOOL)canMakeTextSmaller;
</del><ins>+@property (nonatomic, readonly) BOOL canMakeTextSmaller;
</ins><span class="cx"> - (IBAction)makeTextSmaller:(id)sender;
</span><del>-- (BOOL)canMakeTextStandardSize;
</del><ins>+@property (nonatomic, readonly) BOOL canMakeTextStandardSize;
</ins><span class="cx"> - (IBAction)makeTextStandardSize:(id)sender;
</span><span class="cx"> - (IBAction)toggleContinuousSpellChecking:(id)sender;
</span><span class="cx"> - (IBAction)toggleSmartInsertDelete:(id)sender;
</span><span class="lines">@@ -695,21 +563,16 @@
</span><span class="cx"> @interface WebView (WebViewEditing)
</span><span class="cx"> - (DOMRange *)editableDOMRangeForPoint:(NSPoint)point;
</span><span class="cx"> - (void)setSelectedDOMRange:(DOMRange *)range affinity:(NSSelectionAffinity)selectionAffinity;
</span><del>-- (DOMRange *)selectedDOMRange;
-- (NSSelectionAffinity)selectionAffinity;
-- (BOOL)maintainsInactiveSelection;
-- (void)setEditable:(BOOL)flag;
-- (BOOL)isEditable;
-- (void)setTypingStyle:(DOMCSSStyleDeclaration *)style;
-- (DOMCSSStyleDeclaration *)typingStyle;
-- (void)setSmartInsertDeleteEnabled:(BOOL)flag;
-- (BOOL)smartInsertDeleteEnabled;
-- (void)setContinuousSpellCheckingEnabled:(BOOL)flag;
-- (BOOL)isContinuousSpellCheckingEnabled;
-- (NSInteger)spellCheckerDocumentTag;
-- (NSUndoManager *)undoManager;
-- (void)setEditingDelegate:(id)delegate;
-- (id)editingDelegate;
</del><ins>+@property (nonatomic, readonly, strong) DOMRange *selectedDOMRange;
+@property (nonatomic, readonly) NSSelectionAffinity selectionAffinity;
+@property (nonatomic, readonly) BOOL maintainsInactiveSelection;
+@property (nonatomic, getter=isEditable) BOOL editable;
+@property (nonatomic, strong) DOMCSSStyleDeclaration *typingStyle;
+@property (nonatomic) BOOL smartInsertDeleteEnabled;
+@property (nonatomic, getter=isContinuousSpellCheckingEnabled) BOOL continuousSpellCheckingEnabled;
+@property (nonatomic, readonly) NSInteger spellCheckerDocumentTag;
+@property (nonatomic, readonly, strong) NSUndoManager *undoManager;
+@property (nonatomic, strong) id editingDelegate;
</ins><span class="cx"> - (DOMCSSStyleDeclaration *)styleDeclarationWithText:(NSString *)text;
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -399,7 +399,7 @@
</span><span class="cx"> id target; // Non-retained. Don't retain delegates.
</span><span class="cx"> id defaultTarget;
</span><span class="cx"> }
</span><del>-- (id)initWithTarget:(id)target defaultTarget:(id)defaultTarget;
</del><ins>+- (instancetype)initWithTarget:(id)target defaultTarget:(id)defaultTarget;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> FindOptions coreOptions(WebFindOptions options)
</span><span class="lines">@@ -3280,7 +3280,7 @@
</span><span class="cx">
</span><span class="cx"> // Used to send messages to delegates that implement informal protocols.
</span><span class="cx">
</span><del>-- (id)initWithTarget:(id)t defaultTarget:(id)dt
</del><ins>+- (instancetype)initWithTarget:(id)t defaultTarget:(id)dt
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span><span class="lines">@@ -3632,12 +3632,12 @@
</span><span class="cx"> return isOldClient && !pthread_main_np();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithFrame:(NSRect)f
</del><ins>+- (instancetype)initWithFrame:(NSRect)f
</ins><span class="cx"> {
</span><span class="cx"> return [self initWithFrame:f frameName:nil groupName:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithFrame:(NSRect)f frameName:(NSString *)frameName groupName:(NSString *)groupName
</del><ins>+- (instancetype)initWithFrame:(NSRect)f frameName:(NSString *)frameName groupName:(NSString *)groupName
</ins><span class="cx"> {
</span><span class="cx"> if (needsWebViewInitThreadWorkaround())
</span><span class="cx"> return [[self _webkit_invokeOnMainThread] initWithFrame:f frameName:frameName groupName:groupName];
</span><span class="lines">@@ -3646,7 +3646,7 @@
</span><span class="cx"> return [self _initWithFrame:f frameName:frameName groupName:groupName usesDocumentViews:YES];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithCoder:(NSCoder *)decoder
</del><ins>+- (instancetype)initWithCoder:(NSCoder *)decoder
</ins><span class="cx"> {
</span><span class="cx"> if (needsWebViewInitThreadWorkaround())
</span><span class="cx"> return [[self _webkit_invokeOnMainThread] initWithCoder:decoder];
</span><span class="lines">@@ -6225,7 +6225,7 @@
</span><span class="cx"> return s_cacheModel;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-+ (WebCacheModel)_didSetCacheModel
</del><ins>++ (BOOL)_didSetCacheModel
</ins><span class="cx"> {
</span><span class="cx"> return s_didSetCacheModel;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Tools/ChangeLog 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-03 Mark Rowe <mrowe@apple.com>
+
+ <https://webkit.org/b/125139> Modernize the WebKit API headers
+ <rdar://problem/15540175>
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/mac/TestRunnerMac.mm:
+ (TestRunner::setCacheModel): Cast to the enum type.
+
</ins><span class="cx"> 2013-12-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of forward exit on DoubleAsInt32
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacTestRunnerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm (160413 => 160414)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2013-12-11 08:31:33 UTC (rev 160413)
+++ trunk/Tools/DumpRenderTree/mac/TestRunnerMac.mm 2013-12-11 09:27:32 UTC (rev 160414)
</span><span class="lines">@@ -706,7 +706,7 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::setCacheModel(int cacheModel)
</span><span class="cx"> {
</span><del>- [[WebPreferences standardPreferences] setCacheModel:cacheModel];
</del><ins>+ [[WebPreferences standardPreferences] setCacheModel:(WebCacheModel)cacheModel];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool TestRunner::isCommandEnabled(JSStringRef name)
</span></span></pre>
</div>
</div>
</body>
</html>