<!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>[171655] branches/safari-600.1-branch</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/171655">171655</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2014-07-27 11:33:17 -0700 (Sun, 27 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/171626">r171626</a>. <rdar://problem/17730536></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2ChangeLog">branches/safari-600.1-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2SharedAPICocoaWebKitPrivateh">branches/safari-600.1-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationmm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationInternalh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessCocoaNavigationStatemm">branches/safari-600.1-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#branchessafari6001branchSourceWebKit2WebKit2xcodeprojprojectpbxproj">branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari6001branchToolsChangeLog">branches/safari-600.1-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6001branchToolsTestWebKitAPITestsWebKit2CocoaNavigationmm">branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationPrivateh">branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/ChangeLog (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/ChangeLog 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171626. <rdar://problem/17730536>
+
+ 2014-07-24 Anders Carlsson <andersca@apple.com>
+
+ WKNavigation's properties are either always nil or don't behave as documented
+ https://bugs.webkit.org/show_bug.cgi?id=135267
+ <rdar://problem/17730536>
+
+ Reviewed by Andreas Kling.
+
+ Remove the properties from WKNavigation and introduce -[WKNavigation _request] as SPI for now.
+
+ * Shared/API/Cocoa/WebKitPrivate.h:
+ * UIProcess/API/Cocoa/WKNavigation.h:
+ * UIProcess/API/Cocoa/WKNavigation.mm:
+ (-[WKNavigation _request]):
+ (-[WKNavigation initialRequest]): Deleted.
+ (-[WKNavigation request]): Deleted.
+ (-[WKNavigation setRequest:]): Deleted.
+ (-[WKNavigation response]): Deleted.
+ (-[WKNavigation error]): Deleted.
+ * UIProcess/API/Cocoa/WKNavigationInternal.h:
+ * UIProcess/API/Cocoa/WKNavigationPrivate.h: Copied from Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h.
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::createLoadRequestNavigation):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2014-07-25 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171622. <rdar://problem/15917314>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2SharedAPICocoaWebKitPrivateh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/Shared/API/Cocoa/WebKitPrivate.h 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKHistoryDelegatePrivate.h>
</span><ins>+#import <WebKit/WKNavigationPrivate.h>
</ins><span class="cx"> #import <WebKit/WKProcessPoolPrivate.h>
</span><span class="cx"> #import <WebKit/WKUIDelegatePrivate.h>
</span><span class="cx"> #import <WebKit/WKWebViewConfigurationPrivate.h>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.h 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -29,8 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import <Foundation/Foundation.h>
</span><span class="cx">
</span><del>-/*! A WKNavigation object contains information for tracking the loading
- progress of a webpage.
</del><ins>+/*! A WKNavigation object can be used for tracking the loading progress of a webpage.
</ins><span class="cx"> @discussion A navigation is returned from the web view load methods, and is
</span><span class="cx"> also passed to the navigation delegate methods, to uniquely identify a webpage
</span><span class="cx"> load from start to finish.
</span><span class="lines">@@ -38,25 +37,6 @@
</span><span class="cx"> WK_CLASS_AVAILABLE(10_10, 8_0)
</span><span class="cx"> @interface WKNavigation : NSObject
</span><span class="cx">
</span><del>-/*! @abstract The initial request used to perform the navigation.
- */
-@property (nonatomic, readonly, copy) NSURLRequest *initialRequest;
-
-/*! @abstract The navigation's current request.
- @discussion This request may be different from the one returned by
- initialRequest if server-side redirects have occurred.
- */
-@property (nonatomic, readonly, copy) NSURLRequest *request;
-
-/* @abstract The response to the navigation, or nil if no response has yet
- been received.
- */
-@property (nonatomic, readonly, copy) NSURLResponse *response;
-
-/* @abstract The error if the navigation failed, or nil if it did not fail.
- */
-@property (nonatomic, readonly, copy) NSError *error;
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigation.mm 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -24,44 +24,20 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><del>-#import "WKNavigation.h"
</del><ins>+#import "WKNavigationInternal.h"
</ins><span class="cx">
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@implementation WKNavigation {
- RetainPtr<NSURLRequest> _request;
-}
</del><ins>+@implementation WKNavigation
</ins><span class="cx">
</span><del>-- (NSURLRequest *)initialRequest
</del><ins>+- (NSURLRequest *)_request
</ins><span class="cx"> {
</span><del>- // FIXME: Implement.
- return nil;
-}
-
-- (NSURLRequest *)request
-{
</del><span class="cx"> return _request.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)setRequest:(NSURLRequest *)request
-{
- _request = adoptNS([request copy]);
-}
</del><span class="cx">
</span><del>-- (NSURLResponse *)response
-{
- // FIXME: Implement.
- return nil;
-}
-
-- (NSError *)error
-{
- // FIXME: Implement.
- return nil;
-}
-
</del><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationInternalh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationInternal.h 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -23,13 +23,16 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#import "WKNavigation.h"
</del><ins>+#import "WKNavigationPrivate.h"
</ins><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-@interface WKNavigation ()
</del><ins>+#import <wtf/RetainPtr.h>
</ins><span class="cx">
</span><del>-@property (nonatomic, readwrite, copy) NSURLRequest *request;
</del><ins>+@interface WKNavigation () {
+@package
+ RetainPtr<NSURLRequest> _request;
+}
</ins><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessAPICocoaWKNavigationPrivatehfromrev171626trunkSourceWebKit2UIProcessAPICocoaWKNavigationPrivateh"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationPrivate.h (from rev 171626, trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationPrivate.h) (0 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationPrivate.h (rev 0)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationPrivate.h 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -0,0 +1,34 @@
</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 <WebKit/WKNavigation.h>
+
+#if WK_API_ENABLED
+
+@interface WKNavigation (WKPrivate)
+@property (nonatomic, readonly, copy) NSURLRequest *_request;
+@end
+
+#endif
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> ASSERT(!m_navigations.contains(navigationID));
</span><span class="cx">
</span><span class="cx"> RetainPtr<WKNavigation> navigation = adoptNS([[WKNavigation alloc] init]);
</span><del>- [navigation setRequest:request];
</del><ins>+ navigation->_request = request;
</ins><span class="cx">
</span><span class="cx"> m_navigations.set(navigationID, navigation);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -421,6 +421,7 @@
</span><span class="cx"> 1AC8702D130B49A2002C1257 /* WebPluginSiteDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC8702B130B49A2002C1257 /* WebPluginSiteDataManager.h */; };
</span><span class="cx"> 1AC8702E130B49A2002C1257 /* WebPluginSiteDataManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */; };
</span><span class="cx"> 1ACB7987191ECADD006A6A61 /* XPCPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACB7986191ECADD006A6A61 /* XPCPtr.h */; };
</span><ins>+ 1ACC87BA1981C341003D1AF4 /* WKNavigationPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACC87B91981C341003D1AF4 /* WKNavigationPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 1ACECD2417162DB1001FC9EF /* StorageAreaMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */; };
</span><span class="cx"> 1ACECD2517162DB1001FC9EF /* StorageAreaMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */; };
</span><span class="cx"> 1AD01BC81905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AD01BC61905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm */; };
</span><span class="lines">@@ -2404,6 +2405,7 @@
</span><span class="cx"> 1AC8702B130B49A2002C1257 /* WebPluginSiteDataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginSiteDataManager.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AC8702C130B49A2002C1257 /* WebPluginSiteDataManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPluginSiteDataManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1ACB7986191ECADD006A6A61 /* XPCPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XPCPtr.h; sourceTree = "<group>"; };
</span><ins>+ 1ACC87B91981C341003D1AF4 /* WKNavigationPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationPrivate.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1ACECD2217162DB1001FC9EF /* StorageAreaMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageAreaMap.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1ACECD2317162DB1001FC9EF /* StorageAreaMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageAreaMap.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AD01BC61905D37E00C9C45F /* _WKErrorRecoveryAttempting.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = _WKErrorRecoveryAttempting.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -5043,6 +5045,7 @@
</span><span class="cx"> 1A4D664D18A3031B00D82E21 /* WKFrameInfoInternal.h */,
</span><span class="cx"> 1A422F8A18B29B5400D8CD96 /* WKHistoryDelegatePrivate.h */,
</span><span class="cx"> 1A5B1C4F1898606F004FCF9B /* WKNavigation.h */,
</span><ins>+ 1ACC87B91981C341003D1AF4 /* WKNavigationPrivate.h */,
</ins><span class="cx"> 1A5B1C4E1898606F004FCF9B /* WKNavigation.mm */,
</span><span class="cx"> 1A256E3618A1A788006FB922 /* WKNavigationAction.h */,
</span><span class="cx"> 1A256E3518A1A788006FB922 /* WKNavigationAction.mm */,
</span><span class="lines">@@ -7648,6 +7651,7 @@
</span><span class="cx"> 517DD5BF180DA7D30081660B /* DatabaseProcessProxy.h in Headers */,
</span><span class="cx"> 935EEB9B1277617C003322B8 /* WKBundleBackForwardListItem.h in Headers */,
</span><span class="cx"> 51EFC1CF1524E62500C9A938 /* WKBundleDOMWindowExtension.h in Headers */,
</span><ins>+ 1ACC87BA1981C341003D1AF4 /* WKNavigationPrivate.h in Headers */,
</ins><span class="cx"> 1AAF08A2192681D100B6390C /* WebUserContentControllerProxy.h in Headers */,
</span><span class="cx"> BCD25F1711D6BDE100169B0E /* WKBundleFrame.h in Headers */,
</span><span class="cx"> BCF049E611FE20F600F86A58 /* WKBundleFramePrivate.h in Headers */,
</span></span></pre></div>
<a id="branchessafari6001branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/ChangeLog (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/ChangeLog 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Tools/ChangeLog 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-27 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r171626. <rdar://problem/17730536>
+
+ 2014-07-25 Anders Carlsson <andersca@apple.com>
+
+ WKNavigation's properties are either always nil or don't behave as documented
+ https://bugs.webkit.org/show_bug.cgi?id=135267
+ <rdar://problem/17730536>
+
+ Reviewed by Andreas Kling.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
+ (-[NavigationDelegate webView:didStartProvisionalNavigation:]):
+ (TEST):
+ (-[DidFailProvisionalNavigationDelegate webView:didStartProvisionalNavigation:]):
+ (-[DidFailProvisionalNavigationDelegate webView:didFailProvisionalNavigation:withError:]):
+
</ins><span class="cx"> 2014-07-24 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r171487
</span></span></pre></div>
<a id="branchessafari6001branchToolsTestWebKitAPITestsWebKit2CocoaNavigationmm"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm (171654 => 171655)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-07-27 18:30:17 UTC (rev 171654)
+++ branches/safari-600.1-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2014-07-27 18:33:17 UTC (rev 171655)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#import <WebKit/WKNavigation.h>
</del><ins>+#import <WebKit/WKNavigationPrivate.h>
</ins><span class="cx"> #import <WebKit/WKNavigationDelegate.h>
</span><span class="cx"> #import <WebKit/WKWebView.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
</span><span class="cx"> {
</span><span class="cx"> EXPECT_EQ(currentNavigation, navigation);
</span><del>- EXPECT_NOT_NULL(navigation.request);
</del><ins>+ EXPECT_NOT_NULL(navigation._request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx">
</span><span class="cx"> currentNavigation = [webView loadRequest:request];
</span><span class="cx"> ASSERT_NOT_NULL(currentNavigation);
</span><del>- ASSERT_TRUE([[currentNavigation request] isEqual:request]);
</del><ins>+ ASSERT_TRUE([[currentNavigation _request] isEqual:request]);
</ins><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&isDone);
</span><span class="cx"> }
</span><span class="lines">@@ -101,13 +101,13 @@
</span><span class="cx"> - (void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
</span><span class="cx"> {
</span><span class="cx"> EXPECT_EQ(currentNavigation, navigation);
</span><del>- EXPECT_NOT_NULL(navigation.request);
</del><ins>+ EXPECT_NOT_NULL(navigation._request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)webView:(WKWebView *)webView didFailProvisionalNavigation:(WKNavigation *)navigation withError:(NSError *)error
</span><span class="cx"> {
</span><span class="cx"> EXPECT_EQ(currentNavigation, navigation);
</span><del>- EXPECT_NOT_NULL(navigation.request);
</del><ins>+ EXPECT_NOT_NULL(navigation._request);
</ins><span class="cx">
</span><span class="cx"> EXPECT_TRUE([error.domain isEqualToString:NSURLErrorDomain]);
</span><span class="cx"> EXPECT_EQ(NSURLErrorUnsupportedURL, error.code);
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> currentNavigation = [webView loadRequest:request];
</span><span class="cx"> ASSERT_NOT_NULL(currentNavigation);
</span><del>- ASSERT_TRUE([[currentNavigation request] isEqual:request]);
</del><ins>+ ASSERT_TRUE([[currentNavigation _request] isEqual:request]);
</ins><span class="cx">
</span><span class="cx"> TestWebKitAPI::Util::run(&isDone);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>