Diff
Modified: branches/safari-604-branch/Source/WebCore/ChangeLog (219785 => 219786)
--- branches/safari-604-branch/Source/WebCore/ChangeLog 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebCore/ChangeLog 2017-07-23 06:52:00 UTC (rev 219786)
@@ -1,5 +1,34 @@
2017-07-22 Jason Marcell <[email protected]>
+ Cherry-pick r219709. rdar://problem/33462692
+
+ 2017-07-20 David Quesada <[email protected]>
+
+ Add SPI to notify WKNavigationDelegate about client redirects
+ https://bugs.webkit.org/show_bug.cgi?id=174680
+ rdar://problem/33184886
+
+ Reviewed by Brady Eidson.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::performClientRedirect):
+ * loader/FrameLoader.h:
+ Add a convenience method for NavigationScheduler that handles a FrameLoadRequest
+ as a client redirect. Currently this means loading the request and informing the
+ client about it.
+
+ * loader/FrameLoaderClient.h:
+ Add FrameLoaderClient::dispatchDidPerformClientRedirect() to inform the client when
+ a client redirect occurs.
+
+ * loader/NavigationScheduler.cpp:
+ Removed ScheduledURLNavigation::fire(). This class was never instantiated directly,
+ and all subclasses override fire(), so this was unused code.
+ For ScheduledRedirects and ScheduledLocationChange, use FrameLoader's new method to
+ load the request as a client redirect.
+
+2017-07-22 Jason Marcell <[email protected]>
+
Cherry-pick r219703. rdar://problem/33462696
2017-07-20 Chris Dumez <[email protected]>
Modified: branches/safari-604-branch/Source/WebCore/loader/FrameLoader.cpp (219785 => 219786)
--- branches/safari-604-branch/Source/WebCore/loader/FrameLoader.cpp 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebCore/loader/FrameLoader.cpp 2017-07-23 06:52:00 UTC (rev 219786)
@@ -2049,6 +2049,12 @@
m_quickRedirectComing = (lockBackForwardList == LockBackForwardList::Yes || history().currentItemShouldBeReplaced()) && m_documentLoader && !m_isExecutingJavaScriptFormAction;
}
+void FrameLoader::performClientRedirect(FrameLoadRequest&& frameLoadRequest)
+{
+ changeLocation(WTFMove(frameLoadRequest));
+ m_client.dispatchDidPerformClientRedirect();
+}
+
bool FrameLoader::shouldReload(const URL& currentURL, const URL& destinationURL)
{
// This function implements the rule: "Don't reload if navigating by fragment within
Modified: branches/safari-604-branch/Source/WebCore/loader/FrameLoader.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebCore/loader/FrameLoader.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebCore/loader/FrameLoader.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -263,6 +263,7 @@
bool allAncestorsAreComplete() const; // including this
void clientRedirected(const URL&, double delay, double fireDate, LockBackForwardList);
void clientRedirectCancelledOrFinished(bool cancelWithLoadInProgress);
+ void performClientRedirect(FrameLoadRequest&&);
// FIXME: This is public because this asynchronous callback from the FrameLoaderClient
// uses the policy machinery (and therefore is called via the PolicyChecker). Once we
Modified: branches/safari-604-branch/Source/WebCore/loader/FrameLoaderClient.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebCore/loader/FrameLoaderClient.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebCore/loader/FrameLoaderClient.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -151,6 +151,7 @@
virtual void dispatchDidChangeProvisionalURL() { }
virtual void dispatchDidCancelClientRedirect() = 0;
virtual void dispatchWillPerformClientRedirect(const URL&, double interval, double fireDate) = 0;
+ virtual void dispatchDidPerformClientRedirect() { }
virtual void dispatchDidChangeMainDocument() { }
virtual void dispatchDidNavigateWithinPage() { }
virtual void dispatchDidChangeLocationWithinPage() = 0;
Modified: branches/safari-604-branch/Source/WebCore/loader/NavigationScheduler.cpp (219785 => 219786)
--- branches/safari-604-branch/Source/WebCore/loader/NavigationScheduler.cpp 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebCore/loader/NavigationScheduler.cpp 2017-07-23 06:52:00 UTC (rev 219786)
@@ -127,16 +127,6 @@
{
}
- void fire(Frame& frame) override
- {
- UserGestureIndicator gestureIndicator { userGestureToForward() };
-
- ResourceRequest resourceRequest { m_url, m_referrer, UseProtocolCachePolicy };
- FrameLoadRequest frameLoadRequest { m_initiatingDocument.get(), *m_securityOrigin, resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::Yes, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
-
- frame.loader().changeLocation(WTFMove(frameLoadRequest));
- }
-
void didStartTimer(Frame& frame, Timer& timer) override
{
if (m_haveToldClient)
@@ -195,7 +185,7 @@
ResourceRequest resourceRequest { url(), referrer(), refresh ? ReloadIgnoringCacheData : UseProtocolCachePolicy };
FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
- frame.loader().changeLocation(WTFMove(frameLoadRequest));
+ frame.loader().performClientRedirect(WTFMove(frameLoadRequest));
}
};
@@ -211,7 +201,7 @@
ResourceRequest resourceRequest { url(), referrer(), UseProtocolCachePolicy };
FrameLoadRequest frameLoadRequest { initiatingDocument(), *securityOrigin(), resourceRequest, "_self", lockHistory(), lockBackForwardList(), MaybeSendReferrer, AllowNavigationToInvalidURL::No, NewFrameOpenerPolicy::Allow, shouldOpenExternalURLs(), initiatedByMainFrame() };
- frame.loader().changeLocation(WTFMove(frameLoadRequest));
+ frame.loader().performClientRedirect(WTFMove(frameLoadRequest));
}
};
Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog 2017-07-23 06:52:00 UTC (rev 219786)
@@ -1,5 +1,43 @@
2017-07-22 Jason Marcell <[email protected]>
+ Cherry-pick r219709. rdar://problem/33462692
+
+ 2017-07-20 David Quesada <[email protected]>
+
+ Add SPI to notify WKNavigationDelegate about client redirects
+ https://bugs.webkit.org/show_bug.cgi?id=174680
+ rdar://problem/33184886
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/API/APINavigationClient.h:
+ (API::NavigationClient::didPerformClientRedirectForNavigation):
+ Add a new virtual method for navigation clients to implement if they want to be informed
+ when the page is initiating a navigation that is a client redirect.
+
+ * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
+ Declare the new WKNavigationDelegate method -_webView:didPerformClientRedirectForNavigation:
+
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::setNavigationDelegate):
+ (WebKit::NavigationState::NavigationClient::didPerformClientRedirectForNavigation):
+ Add a new method to NavigationState method to tell the WKNavigationDelegate when a
+ client redirect happens.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::didPerformClientRedirectForLoadForFrame):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ Allow the WebPageProxy to receive a message from the web process when a client redirect happens.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidPerformClientRedirect):
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+ Send this new message to the UI process on client redirects.
+
+2017-07-22 Jason Marcell <[email protected]>
+
Cherry-pick r219703. rdar://problem/33462696
2017-07-20 Chris Dumez <[email protected]>
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/API/APINavigationClient.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/API/APINavigationClient.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/API/APINavigationClient.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -69,6 +69,7 @@
virtual void didStartProvisionalNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
virtual void didReceiveServerRedirectForProvisionalNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
+ virtual void didPerformClientRedirectForNavigation(WebKit::WebPageProxy&, API::Navigation*) { }
virtual void didFailProvisionalNavigationWithError(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, API::Navigation*, const WebCore::ResourceError&, API::Object*) { }
virtual void didFailProvisionalLoadInSubframeWithError(WebKit::WebPageProxy&, WebKit::WebFrameProxy&, const WebCore::SecurityOriginData&, API::Navigation*, const WebCore::ResourceError&, API::Object*) { }
virtual void didCommitNavigation(WebKit::WebPageProxy&, API::Navigation*, API::Object*) { }
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -44,6 +44,8 @@
- (void)_webView:(WKWebView *)webView navigation:(WKNavigation *)navigation didFailProvisionalLoadInSubframe:(WKFrameInfo *)subframe withError:(NSError *)error;
+- (void)_webView:(WKWebView *)webView didPerformClientRedirectForNavigation:(WKNavigation *)navigation;
+
- (void)_webView:(WKWebView *)webView navigationDidFinishDocumentLoad:(WKNavigation *)navigation;
- (void)_webView:(WKWebView *)webView navigation:(WKNavigation *)navigation didSameDocumentNavigation:(_WKSameDocumentNavigationType)navigationType;
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/Cocoa/NavigationState.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/Cocoa/NavigationState.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/Cocoa/NavigationState.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -91,6 +91,7 @@
private:
void didStartProvisionalNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
void didReceiveServerRedirectForProvisionalNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
+ void didPerformClientRedirectForNavigation(WebPageProxy&, API::Navigation*) override;
void didFailProvisionalNavigationWithError(WebPageProxy&, WebFrameProxy&, API::Navigation*, const WebCore::ResourceError&, API::Object*) override;
void didFailProvisionalLoadInSubframeWithError(WebPageProxy&, WebFrameProxy&, const WebCore::SecurityOriginData&, API::Navigation*, const WebCore::ResourceError&, API::Object*) override;
void didCommitNavigation(WebPageProxy&, API::Navigation*, API::Object*) override;
@@ -172,6 +173,7 @@
bool webViewDidReceiveServerRedirectForProvisionalNavigation : 1;
bool webViewDidFailProvisionalNavigationWithError : 1;
bool webViewNavigationDidFailProvisionalLoadInSubframeWithError : 1;
+ bool webViewDidPerformClientRedirectForNavigation : 1;
bool webViewDidCommitNavigation : 1;
bool webViewNavigationDidFinishDocumentLoad : 1;
bool webViewDidFinishNavigation : 1;
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2017-07-23 06:52:00 UTC (rev 219786)
@@ -150,6 +150,7 @@
m_navigationDelegateMethods.webViewDidFailNavigationWithError = [delegate respondsToSelector:@selector(webView:didFailNavigation:withError:)];
m_navigationDelegateMethods.webViewNavigationDidFailProvisionalLoadInSubframeWithError = [delegate respondsToSelector:@selector(_webView:navigation:didFailProvisionalLoadInSubframe:withError:)];
+ m_navigationDelegateMethods.webViewDidPerformClientRedirectForNavigation = [delegate respondsToSelector:@selector(_webView:didPerformClientRedirectForNavigation:)];
m_navigationDelegateMethods.webViewNavigationDidFinishDocumentLoad = [delegate respondsToSelector:@selector(_webView:navigationDidFinishDocumentLoad:)];
m_navigationDelegateMethods.webViewNavigationDidSameDocumentNavigation = [delegate respondsToSelector:@selector(_webView:navigation:didSameDocumentNavigation:)];
m_navigationDelegateMethods.webViewRenderingProgressDidChange = [delegate respondsToSelector:@selector(_webView:renderingProgressDidChange:)];
@@ -488,6 +489,23 @@
[navigationDelegate webView:m_navigationState.m_webView didReceiveServerRedirectForProvisionalNavigation:wkNavigation];
}
+void NavigationState::NavigationClient::didPerformClientRedirectForNavigation(WebPageProxy& page, API::Navigation* navigation)
+{
+ if (!m_navigationState.m_navigationDelegateMethods.webViewDidPerformClientRedirectForNavigation)
+ return;
+
+ auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
+ if (!navigationDelegate)
+ return;
+
+ // FIXME: We should assert that navigation is not null here, but it's currently null for some navigations through the page cache.
+ WKNavigation *wkNavigation = nil;
+ if (navigation)
+ wkNavigation = wrapper(*navigation);
+
+ [(id <WKNavigationDelegatePrivate>)navigationDelegate _webView:m_navigationState.m_webView didPerformClientRedirectForNavigation:wkNavigation];
+}
+
static RetainPtr<NSError> createErrorWithRecoveryAttempter(WKWebView *webView, WebFrameProxy& webFrameProxy, NSError *originalError)
{
RefPtr<API::FrameHandle> frameHandle = API::FrameHandle::create(webFrameProxy.frameID());
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.cpp 2017-07-23 06:52:00 UTC (rev 219786)
@@ -3189,6 +3189,24 @@
m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(*this, *frame, navigation.get(), m_process->transformHandlesToObjects(userData.object()).get());
}
+void WebPageProxy::didPerformClientRedirectForLoadForFrame(uint64_t frameID, uint64_t navigationID)
+{
+ PageClientProtector protector(m_pageClient);
+
+ WebFrameProxy* frame = m_process->webFrame(frameID);
+ MESSAGE_CHECK(frame);
+
+ // FIXME: We should message check that navigationID is not zero here, but it's currently zero for some navigations through the page cache.
+ RefPtr<API::Navigation> navigation;
+ if (frame->isMainFrame() && navigationID)
+ navigation = &navigationState().navigation(navigationID);
+
+ if (m_navigationClient) {
+ if (frame->isMainFrame())
+ m_navigationClient->didPerformClientRedirectForNavigation(*this, navigation.get());
+ }
+}
+
void WebPageProxy::didChangeProvisionalURLForFrame(uint64_t frameID, uint64_t, const String& url)
{
PageClientProtector protector(m_pageClient);
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -1248,6 +1248,7 @@
void didStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& url, const String& unreachableURL, const UserData&);
void didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, const String&, const UserData&);
+ void didPerformClientRedirectForLoadForFrame(uint64_t frameID, uint64_t navigationID);
void didChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, const String& url);
void didFailProvisionalLoadForFrame(uint64_t frameID, const WebCore::SecurityOriginData& frameSecurityOrigin, uint64_t navigationID, const String& provisionalURL, const WebCore::ResourceError&, const UserData&);
void didCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, const String& mimeType, bool frameHasCustomContentProvider, uint32_t frameLoadType, const WebCore::CertificateInfo&, bool containsPluginDocument, std::optional<WebCore::HasInsecureContent> forcedHasInsecureContent, const UserData&);
Modified: branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.messages.in (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.messages.in 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/WebPageProxy.messages.in 2017-07-23 06:52:00 UTC (rev 219786)
@@ -118,6 +118,7 @@
# Frame load messages
DidStartProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, String unreachableURL, WebKit::UserData userData)
DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, uint64_t navigationID, String url, WebKit::UserData userData)
+ DidPerformClientRedirectForLoadForFrame(uint64_t frameID, uint64_t navigationID)
DidChangeProvisionalURLForFrame(uint64_t frameID, uint64_t navigationID, String url)
DidFailProvisionalLoadForFrame(uint64_t frameID, struct WebCore::SecurityOriginData frameSecurityOrigin, uint64_t navigationID, String provisionalURL, WebCore::ResourceError error, WebKit::UserData userData)
DidCommitLoadForFrame(uint64_t frameID, uint64_t navigationID, String mimeType, bool hasCustomContentProvider, uint32_t loadType, WebCore::CertificateInfo certificateInfo, bool containsPluginDocument, std::optional<WebCore::HasInsecureContent> forcedHasInsecureContent, WebKit::UserData userData)
Modified: branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2017-07-23 06:52:00 UTC (rev 219786)
@@ -290,6 +290,18 @@
webPage->send(Messages::WebPageProxy::DidReceiveServerRedirectForProvisionalLoadForFrame(m_frame->frameID(), documentLoader.navigationID(), url, UserData(WebProcess::singleton().transformObjectsToHandles(userData.get()).get())));
}
+void WebFrameLoaderClient::dispatchDidPerformClientRedirect()
+{
+ WebPage* webPage = m_frame->page();
+ if (!webPage)
+ return;
+
+ auto navigationID = static_cast<WebDocumentLoader&>(*m_frame->coreFrame()->loader().documentLoader()).navigationID();
+
+ // Notify the UIProcess.
+ webPage->send(Messages::WebPageProxy::DidPerformClientRedirectForLoadForFrame(m_frame->frameID(), navigationID));
+}
+
void WebFrameLoaderClient::dispatchDidChangeProvisionalURL()
{
WebPage* webPage = m_frame->page();
Modified: branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (219785 => 219786)
--- branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Source/WebKit/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2017-07-23 06:52:00 UTC (rev 219786)
@@ -88,6 +88,7 @@
void dispatchDidDispatchOnloadEvents() final;
void dispatchDidReceiveServerRedirectForProvisionalLoad() final;
+ void dispatchDidPerformClientRedirect() final;
void dispatchDidChangeProvisionalURL() final;
void dispatchDidCancelClientRedirect() final;
void dispatchWillPerformClientRedirect(const WebCore::URL&, double interval, double fireDate) final;
Modified: branches/safari-604-branch/Tools/ChangeLog (219785 => 219786)
--- branches/safari-604-branch/Tools/ChangeLog 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Tools/ChangeLog 2017-07-23 06:52:00 UTC (rev 219786)
@@ -1,5 +1,22 @@
2017-07-22 Jason Marcell <[email protected]>
+ Cherry-pick r219709. rdar://problem/33462692
+
+ 2017-07-20 David Quesada <[email protected]>
+
+ Add SPI to notify WKNavigationDelegate about client redirects
+ https://bugs.webkit.org/show_bug.cgi?id=174680
+ rdar://problem/33184886
+
+ Reviewed by Brady Eidson.
+
+ * TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm:
+ (-[DidPerformClientRedirectNavigationDelegate _webView:didPerformClientRedirectForNavigation:]):
+ (TEST):
+ Add API test for -[id<WKNavigationDelegatePrivate> _webView:didPerformClientRedirectForNavigation:].
+
+2017-07-22 Jason Marcell <[email protected]>
+
Cherry-pick r219666. rdar://problem/33464328
2017-07-19 Megan Gardner <[email protected]>
Modified: branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm (219785 => 219786)
--- branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2017-07-23 06:51:49 UTC (rev 219785)
+++ branches/safari-604-branch/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/Navigation.mm 2017-07-23 06:52:00 UTC (rev 219786)
@@ -25,8 +25,8 @@
#include "config.h"
+#import <WebKit/WKNavigationDelegatePrivate.h>
#import <WebKit/WKNavigationPrivate.h>
-#import <WebKit/WKNavigationDelegate.h>
#import <WebKit/WKWebView.h>
#import <wtf/RetainPtr.h>
#import "PlatformUtilities.h"
@@ -36,6 +36,7 @@
static bool isDone;
static RetainPtr<WKNavigation> currentNavigation;
+static RetainPtr<NSURL> redirectURL;
@interface NavigationDelegate : NSObject <WKNavigationDelegate>
@end
@@ -187,4 +188,40 @@
ASSERT_TRUE([delegate decidedPolicyForBackForwardNavigation]);
}
+@interface DidPerformClientRedirectNavigationDelegate : NSObject<WKNavigationDelegatePrivate>
+@end
+
+@implementation DidPerformClientRedirectNavigationDelegate
+- (void)_webView:(WKWebView *)webView didPerformClientRedirectForNavigation:(WKNavigation *)navigation
+{
+ isDone = true;
+ redirectURL = webView.URL;
+}
+@end
+
+TEST(WKNavigation, DidPerformClientRedirect)
+{
+ RetainPtr<WKWebView> webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]);
+
+ RetainPtr<DidPerformClientRedirectNavigationDelegate> delegate = adoptNS([[DidPerformClientRedirectNavigationDelegate alloc] init]);
+ [webView setNavigationDelegate:delegate.get()];
+
+ NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"data:text/html,%3Cmeta%20http-equiv=%22refresh%22%20content=%220;URL=""
+
+ isDone = false;
+ redirectURL = nil;
+ [webView loadRequest:request];
+ TestWebKitAPI::Util::run(&isDone);
+
+ ASSERT_STREQ(redirectURL.get().absoluteString.UTF8String, "data:text/html,Page1");
+
+ request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"data:text/html,%3Cscript%3Ewindow.location=%22data:text/html,Page2%22;%3C/script%3E"]];
+ isDone = false;
+ redirectURL = nil;
+ [webView loadRequest:request];
+ TestWebKitAPI::Util::run(&isDone);
+
+ ASSERT_STREQ(redirectURL.get().absoluteString.UTF8String, "data:text/html,Page2");
+}
+
#endif