<!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>[165678] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165678">165678</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-14 22:12:19 -0700 (Fri, 14 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert erroneous changes made to UIProcess/API/Cocoa in <a href="http://trac.webkit.org/projects/webkit/changeset/165676">r165676</a>.
* UIProcess/API/Cocoa/WKBackForwardList.h:
* UIProcess/API/Cocoa/WKBackForwardListItem.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h.
* UIProcess/API/Cocoa/WKNavigation.h:
* UIProcess/API/Cocoa/WKNavigationAction.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h.
* UIProcess/API/Cocoa/WKNavigationDelegate.h:
(NS_ENUM):
* UIProcess/API/Cocoa/WKNavigationResponse.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h.
* UIProcess/API/Cocoa/WKNavigationTrigger.h: Removed.
* UIProcess/API/Cocoa/WKWebView.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponseh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationTriggerh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationTrigger.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165677 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-15 04:38:58 UTC (rev 165677)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-03-14 Ryosuke Niwa <rniwa@webkit.org>
+
+ Revert erroneous changes made to UIProcess/API/Cocoa in r165676.
+
+ * UIProcess/API/Cocoa/WKBackForwardList.h:
+ * UIProcess/API/Cocoa/WKBackForwardListItem.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h.
+ * UIProcess/API/Cocoa/WKNavigation.h:
+ * UIProcess/API/Cocoa/WKNavigationAction.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h.
+ * UIProcess/API/Cocoa/WKNavigationDelegate.h:
+ (NS_ENUM):
+ * UIProcess/API/Cocoa/WKNavigationResponse.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h.
+ * UIProcess/API/Cocoa/WKNavigationTrigger.h: Removed.
+ * UIProcess/API/Cocoa/WKWebView.h:
+
</ins><span class="cx"> 2014-03-14 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix the production build.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h (165677 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-03-15 04:38:58 UTC (rev 165677)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardList.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@class WKNavigation;
</del><ins>+#import <WebKit2/WKBackForwardListItem.h>
</ins><span class="cx">
</span><span class="cx"> /*! Posted when a back-forward list changes. The notification object is the WKBackForwardList
</span><span class="cx"> that changed. The <code>userInfo</code> dictionary may contain the
</span><span class="lines">@@ -38,25 +38,25 @@
</span><span class="cx">
</span><span class="cx"> /*! A key in the <code>userInfo</code> dictionary of a
</span><span class="cx"> @link WKBackForwardListDidChangeNotification @/link, whose value is the
</span><del>- @link WKNavigation @/link that was appended to the list.
</del><ins>+ @link WKBackForwardListItem @/link that was appended to the list.
</ins><span class="cx"> */
</span><span class="cx"> WK_EXTERN NSString * const WKBackForwardListAddedItemKey;
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /*! A key in the <code>userInfo</code> dictionary of a
</span><span class="cx"> @link WKBackForwardListDidChangeNotification @/link, whose value is an NSArray of
</span><del>- @link WKNavigation@/link instances that were removed from the list.
</del><ins>+ @link WKBackForwardListItem@/link instances that were removed from the list.
</ins><span class="cx"> */
</span><span class="cx"> WK_EXTERN NSString * const WKBackForwardListRemovedItemsKey;
</span><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKBackForwardList : NSObject
</span><span class="cx">
</span><del>-@property (readonly) WKNavigation *currentItem;
-@property (readonly) WKNavigation *backItem;
-@property (readonly) WKNavigation *forwardItem;
</del><ins>+@property (readonly) WKBackForwardListItem *currentItem;
+@property (readonly) WKBackForwardListItem *backItem;
+@property (readonly) WKBackForwardListItem *forwardItem;
</ins><span class="cx">
</span><del>-- (WKNavigation *)itemAtIndex:(NSInteger)index;
</del><ins>+- (WKBackForwardListItem *)itemAtIndex:(NSInteger)index;
</ins><span class="cx">
</span><span class="cx"> @property (readonly) NSUInteger backListCount;
</span><span class="cx"> @property (readonly) NSUInteger forwardListCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemhfromrev165675trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h (from rev 165675, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h) (0 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+/*
+ * Copyright (C) 2013 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+#import <Foundation/Foundation.h>
+
+WK_API_CLASS
+@interface WKBackForwardListItem : NSObject
+
+@property (readonly) NSURL *URL;
+@property (readonly) NSString *title;
+@property (readonly) NSURL *originalURL;
+
+@end
+
+#endif // WK_API_ENABLED
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h (165677 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h 2014-03-15 04:38:58 UTC (rev 165677)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -28,25 +28,11 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@class WKFrameInfo;
-@class WKNavigationTrigger;
-
</del><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKNavigation : NSObject
</span><span class="cx">
</span><del>-// What triggered this action?
-@property (nonatomic, readonly) WKNavigationTrigger *trigger;
-
-// Where is it going?
-@property (nonatomic, readonly) NSURLRequest *originalRequest;
</del><span class="cx"> @property (nonatomic, readonly) NSURLRequest *request;
</span><del>-@property (nonatomic, readonly) WKFrameInfo *targetFrame;
</del><span class="cx">
</span><del>-// What do we know so far? XXX: should this be factored into a separate result object?
-@property (nonatomic, readonly) NSURLResponse *response;
-@property (nonatomic, readonly) BOOL canShowMIMEType;
-@property (readonly) NSString *title;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionhfromrev165675trunkSourceWebKit2UIProcessAPICocoaWKNavigationActionh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h (from rev 165675, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h) (0 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationAction.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+@class WKFrameInfo;
+
+typedef NS_ENUM(NSInteger, WKNavigationType) {
+ WKNavigationTypeLinkActivated,
+ WKNavigationTypeFormSubmitted,
+ WKNavigationTypeBackForward,
+ WKNavigationTypeReload,
+ WKNavigationTypeFormResubmitted,
+ WKNavigationTypeOther = -1,
+};
+
+WK_API_CLASS
+@interface WKNavigationAction : NSObject
+
+@property (nonatomic, readonly) WKFrameInfo *sourceFrame;
+@property (nonatomic, readonly) WKFrameInfo *destinationFrame;
+
+@property (nonatomic, readonly) WKNavigationType navigationType;
+@property (nonatomic, readonly) NSURLRequest *request;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h (165677 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-03-15 04:38:58 UTC (rev 165677)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationDelegate.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> @class WKNavigation;
</span><ins>+@class WKNavigationAction;
+@class WKNavigationResponse;
</ins><span class="cx"> @class WKWebView;
</span><span class="cx">
</span><span class="cx"> typedef NS_ENUM(NSInteger, WKNavigationPolicyDecision) {
</span><span class="lines">@@ -37,12 +39,18 @@
</span><span class="cx"> WKNavigationPolicyDecisionDownload
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+typedef NS_ENUM(NSInteger, WKNavigationResponsePolicyDecision) {
+ WKNavigationResponsePolicyDecisionCancel,
+ WKNavigationResponsePolicyDecisionAllow,
+ WKNavigationResponsePolicyDecisionBecomeDownload
+};
+
</ins><span class="cx"> @protocol WKNavigationDelegate <NSObject>
</span><span class="cx">
</span><span class="cx"> @optional
</span><span class="cx">
</span><del>-- (void)webView:(WKWebView *)webView decideActionPolicyForNavigation:(WKNavigation *)navigation decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
-- (void)webView:(WKWebView *)webView decideResponsePolicyForNavigation:(WKNavigation *)navigationResponse decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
</del><ins>+- (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigationAction *)navigationAction decisionHandler:(void (^)(WKNavigationPolicyDecision))decisionHandler;
+- (void)webView:(WKWebView *)webView decidePolicyForNavigationResponse:(WKNavigationResponse *)navigationResponse decisionHandler:(void (^)(WKNavigationResponsePolicyDecision))decisionHandler;
</ins><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation;
</span><span class="cx"> - (void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponsehfromrev165675trunkSourceWebKit2UIProcessAPICocoaWKNavigationResponseh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h (from rev 165675, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h) (0 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationResponse.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <WebKit2/WKFoundation.h>
+
+#if WK_API_ENABLED
+
+@class WKFrameInfo;
+
+WK_API_CLASS
+@interface WKNavigationResponse : NSObject
+
+@property (nonatomic, readonly) WKFrameInfo *frame;
+@property (nonatomic, readonly) NSURLResponse *response;
+@property (nonatomic, readonly) BOOL canShowMIMEType;
+
+@end
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationTriggerh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationTrigger.h (165677 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationTrigger.h 2014-03-15 04:38:58 UTC (rev 165677)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationTrigger.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -1,52 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <Foundation/Foundation.h>
-#import <WebKit2/WKFoundation.h>
-
-#if WK_API_ENABLED
-
-@class WKFrameInfo;
-
-typedef NS_ENUM(NSInteger, WKNavigationType) {
- WKNavigationTypeLinkActivated,
- WKNavigationTypeFormSubmitted,
- WKNavigationTypeBackForward,
- WKNavigationTypeReload,
- WKNavigationTypeFormResubmitted,
- WKNavigationTypeOther = -1,
-};
-
-WK_API_CLASS
-@interface WKNavigationTrigger : NSObject
-
-@property (nonatomic, readonly) WKFrameInfo *originatingFrame;
-@property (nonatomic, readonly) WKNavigationType navigationType;
-@property (nonatomic, readonly) NSUInteger modifierFlags;
-@property (nonatomic, readonly) NSUInteger mouseButton;
-
-@end
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h (165677 => 165678)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-15 04:38:58 UTC (rev 165677)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.h 2014-03-15 05:12:19 UTC (rev 165678)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> @class WKBackForwardList;
</span><ins>+@class WKBackForwardListItem;
</ins><span class="cx"> @class WKNavigation;
</span><span class="cx"> @class WKWebViewConfiguration;
</span><span class="cx">
</span><span class="lines">@@ -58,7 +59,6 @@
</span><span class="cx"> @property (nonatomic, readonly) WKWebViewConfiguration *configuration;
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, weak) id <WKNavigationDelegate> navigationDelegate;
</span><del>-@property (nonatomic, weak) id <WKNavigationDelegate> subframeNavigationDelegate;
</del><span class="cx">
</span><span class="cx"> @property (nonatomic, weak) id <WKUIDelegate> UIDelegate;
</span><span class="cx">
</span><span class="lines">@@ -84,10 +84,10 @@
</span><span class="cx"> /*! @abstract Navigates to an item from the back-forward list and sets it as the current item.
</span><span class="cx"> @param item The item to navigate to. Must be one of the items in the receiver's back-forward
</span><span class="cx"> list.
</span><del>- @result A new navigation to requested item, or nil if it is the current item.
</del><ins>+ @result A new navigation to requested item, or nil if it is the current item.
</ins><span class="cx"> @seealso backForwardList
</span><span class="cx"> */
</span><del>-- (WKNavigation *)goToBackForwardListItem:(WKNavigation *)item;
</del><ins>+- (WKNavigation *)goToBackForwardListItem:(WKBackForwardListItem *)item;
</ins><span class="cx">
</span><span class="cx"> - (IBAction)stopLoading:(id)sender;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>