Title: [234903] trunk/Source/WebKit
- Revision
- 234903
- Author
- [email protected]
- Date
- 2018-08-15 15:48:05 -0700 (Wed, 15 Aug 2018)
Log Message
Remove WKNavigationDelegatePrivate's canAuthenticateAgainstProtectionSpace
https://bugs.webkit.org/show_bug.cgi?id=188622
Reviewed by Timothy Hatcher.
It's been deprecated for a release now, nobody uses it, and it's a concept from NSURLConnection, which we don't use any more in WebKit2.
* UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
* UIProcess/Cocoa/NavigationState.h:
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::setNavigationDelegate):
(WebKit::NavigationState::NavigationClient::canAuthenticateAgainstProtectionSpace):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (234902 => 234903)
--- trunk/Source/WebKit/ChangeLog 2018-08-15 22:10:51 UTC (rev 234902)
+++ trunk/Source/WebKit/ChangeLog 2018-08-15 22:48:05 UTC (rev 234903)
@@ -1,3 +1,18 @@
+2018-08-15 Alex Christensen <[email protected]>
+
+ Remove WKNavigationDelegatePrivate's canAuthenticateAgainstProtectionSpace
+ https://bugs.webkit.org/show_bug.cgi?id=188622
+
+ Reviewed by Timothy Hatcher.
+
+ It's been deprecated for a release now, nobody uses it, and it's a concept from NSURLConnection, which we don't use any more in WebKit2.
+
+ * UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h:
+ * UIProcess/Cocoa/NavigationState.h:
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::setNavigationDelegate):
+ (WebKit::NavigationState::NavigationClient::canAuthenticateAgainstProtectionSpace):
+
2018-08-15 Tim Horton <[email protected]>
Crashes in Quip under _dictionaryPopupInfoForRange, in setObject:forKey:
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h (234902 => 234903)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2018-08-15 22:10:51 UTC (rev 234902)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKNavigationDelegatePrivate.h 2018-08-15 22:48:05 UTC (rev 234903)
@@ -75,7 +75,6 @@
- (void)_webView:(WKWebView *)webView renderingProgressDidChange:(_WKRenderingProgressEvents)progressEvents;
-- (BOOL)_webView:(WKWebView *)webView canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace WK_API_DEPRECATED_WITH_REPLACEMENT("webView:didReceiveAuthenticationChallenge:completionHandler:", macosx(10.10, 10.13.4), ios(8.0, 11.3));
- (void)_webView:(WKWebView *)webView didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge WK_API_DEPRECATED_WITH_REPLACEMENT("webView:didReceiveAuthenticationChallenge:completionHandler:", macosx(10.10, 10.13.4), ios(8.0, 11.3));
- (void)_webViewWebProcessDidCrash:(WKWebView *)webView;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h (234902 => 234903)
--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h 2018-08-15 22:10:51 UTC (rev 234902)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.h 2018-08-15 22:48:05 UTC (rev 234903)
@@ -207,7 +207,6 @@
bool webViewDidReceiveAuthenticationChallengeCompletionHandler : 1;
bool webViewWebContentProcessDidTerminate : 1;
bool webViewWebContentProcessDidTerminateWithReason : 1;
- bool webViewCanAuthenticateAgainstProtectionSpace : 1;
bool webViewDidReceiveAuthenticationChallenge : 1;
bool webViewWebProcessDidCrash : 1;
bool webViewWebProcessDidBecomeResponsive : 1;
Modified: trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm (234902 => 234903)
--- trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2018-08-15 22:10:51 UTC (rev 234902)
+++ trunk/Source/WebKit/UIProcess/Cocoa/NavigationState.mm 2018-08-15 22:48:05 UTC (rev 234903)
@@ -164,7 +164,6 @@
m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler = [delegate respondsToSelector:@selector(webView:didReceiveAuthenticationChallenge:completionHandler:)];
m_navigationDelegateMethods.webViewWebContentProcessDidTerminate = [delegate respondsToSelector:@selector(webViewWebContentProcessDidTerminate:)];
m_navigationDelegateMethods.webViewWebContentProcessDidTerminateWithReason = [delegate respondsToSelector:@selector(_webView:webContentProcessDidTerminateWithReason:)];
- m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace = [delegate respondsToSelector:@selector(_webView:canAuthenticateAgainstProtectionSpace:)];
m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallenge = [delegate respondsToSelector:@selector(_webView:didReceiveAuthenticationChallenge:)];
m_navigationDelegateMethods.webViewWebProcessDidCrash = [delegate respondsToSelector:@selector(_webViewWebProcessDidCrash:)];
m_navigationDelegateMethods.webViewWebProcessDidBecomeResponsive = [delegate respondsToSelector:@selector(_webViewWebProcessDidBecomeResponsive:)];
@@ -872,20 +871,7 @@
bool NavigationState::NavigationClient::canAuthenticateAgainstProtectionSpace(WebPageProxy&, WebProtectionSpace* protectionSpace)
{
- if (m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler)
- return true;
-
- if (!m_navigationState.m_navigationDelegateMethods.webViewCanAuthenticateAgainstProtectionSpace)
- return false;
-
- auto navigationDelegate = m_navigationState.m_navigationDelegate.get();
- if (!navigationDelegate)
- return false;
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- return [static_cast<id <WKNavigationDelegatePrivate>>(navigationDelegate.get()) _webView:m_navigationState.m_webView canAuthenticateAgainstProtectionSpace:protectionSpace->protectionSpace().nsSpace()];
-#pragma clang diagnostic pop
+ return !!m_navigationState.m_navigationDelegateMethods.webViewDidReceiveAuthenticationChallengeCompletionHandler;
}
void NavigationState::NavigationClient::didReceiveAuthenticationChallenge(WebPageProxy&, AuthenticationChallengeProxy& authenticationChallenge)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
