Diff
Modified: trunk/Source/WebCore/ChangeLog (202409 => 202410)
--- trunk/Source/WebCore/ChangeLog 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 02:47:19 UTC (rev 202410)
@@ -1,3 +1,31 @@
+2016-06-23 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused didCancelAuthenticationChallenge
+ https://bugs.webkit.org/show_bug.cgi?id=158819
+
+ Reviewed by David Kilzer.
+
+ No change in behavior. This callback was deprecated in Yosemite. It is never called.
+
+ * loader/EmptyClients.h:
+ * loader/FrameLoaderClient.h:
+ * loader/ResourceLoadNotifier.cpp:
+ (WebCore::ResourceLoadNotifier::didCancelAuthenticationChallenge): Deleted.
+ * loader/ResourceLoadNotifier.h:
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::didCancelAuthenticationChallenge): Deleted.
+ * loader/ResourceLoader.h:
+ * platform/network/ResourceHandle.h:
+ * platform/network/ResourceHandleClient.h:
+ (WebCore::ResourceHandleClient::didCancelAuthenticationChallenge): Deleted.
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::didCancelAuthenticationChallenge): Deleted.
+ * platform/network/mac/WebCoreResourceHandleAsDelegate.mm:
+ (-[WebCoreResourceHandleAsDelegate connection:didCancelAuthenticationChallenge:]): Deleted.
+ * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+ (-[WebCoreResourceHandleAsOperationQueueDelegate connection:didCancelAuthenticationChallenge:]): Deleted.
+ * platform/spi/cocoa/NSURLDownloadSPI.h:
+
2016-06-23 Anders Carlsson <ander...@apple.com>
Add "shippingType" to the list of valid payment request properties
Modified: trunk/Source/WebCore/loader/EmptyClients.h (202409 => 202410)
--- trunk/Source/WebCore/loader/EmptyClients.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/loader/EmptyClients.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -266,7 +266,6 @@
bool shouldUseCredentialStorage(DocumentLoader*, unsigned long) override { return false; }
void dispatchWillSendRequest(DocumentLoader*, unsigned long, ResourceRequest&, const ResourceResponse&) override { }
void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&) override { }
- void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long, const AuthenticationChallenge&) override { }
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool canAuthenticateAgainstProtectionSpace(DocumentLoader*, unsigned long, const ProtectionSpace&) override { return false; }
#endif
Modified: trunk/Source/WebCore/loader/FrameLoaderClient.h (202409 => 202410)
--- trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/loader/FrameLoaderClient.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -136,7 +136,6 @@
virtual void dispatchWillSendRequest(DocumentLoader*, unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse) = 0;
virtual bool shouldUseCredentialStorage(DocumentLoader*, unsigned long identifier) = 0;
virtual void dispatchDidReceiveAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) = 0;
- virtual void dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long identifier, const AuthenticationChallenge&) = 0;
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
virtual bool canAuthenticateAgainstProtectionSpace(DocumentLoader*, unsigned long identifier, const ProtectionSpace&) = 0;
#endif
Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp (202409 => 202410)
--- trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.cpp 2016-06-24 02:47:19 UTC (rev 202410)
@@ -62,16 +62,6 @@
m_frame.loader().client().dispatchDidReceiveAuthenticationChallenge(loader, identifier, currentWebChallenge);
}
-void ResourceLoadNotifier::didCancelAuthenticationChallenge(ResourceLoader* loader, const AuthenticationChallenge& currentWebChallenge)
-{
- didCancelAuthenticationChallenge(loader->identifier(), loader->documentLoader(), currentWebChallenge);
-}
-
-void ResourceLoadNotifier::didCancelAuthenticationChallenge(unsigned long identifier, DocumentLoader* loader, const AuthenticationChallenge& currentWebChallenge)
-{
- m_frame.loader().client().dispatchDidCancelAuthenticationChallenge(loader, identifier, currentWebChallenge);
-}
-
void ResourceLoadNotifier::willSendRequest(ResourceLoader* loader, ResourceRequest& clientRequest, const ResourceResponse& redirectResponse)
{
m_frame.loader().applyUserAgent(clientRequest);
Modified: trunk/Source/WebCore/loader/ResourceLoadNotifier.h (202409 => 202410)
--- trunk/Source/WebCore/loader/ResourceLoadNotifier.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/loader/ResourceLoadNotifier.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -50,8 +50,6 @@
void didReceiveAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
void didReceiveAuthenticationChallenge(unsigned long identifier, DocumentLoader*, const AuthenticationChallenge&);
- void didCancelAuthenticationChallenge(ResourceLoader*, const AuthenticationChallenge&);
- void didCancelAuthenticationChallenge(unsigned long identifier, DocumentLoader*, const AuthenticationChallenge&);
void willSendRequest(ResourceLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
void didReceiveResponse(ResourceLoader*, const ResourceResponse&);
Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (202409 => 202410)
--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-06-24 02:47:19 UTC (rev 202410)
@@ -714,14 +714,6 @@
#endif
}
-void ResourceLoader::didCancelAuthenticationChallenge(const AuthenticationChallenge& challenge)
-{
- // Protect this in this delegate method since the additional processing can do
- // anything including possibly derefing this; one example of this is Radar 3266216.
- Ref<ResourceLoader> protectedThis(*this);
- frameLoader()->notifier().didCancelAuthenticationChallenge(this, challenge);
-}
-
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool ResourceLoader::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
Modified: trunk/Source/WebCore/loader/ResourceLoader.h (202409 => 202410)
--- trunk/Source/WebCore/loader/ResourceLoader.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -113,7 +113,6 @@
virtual bool shouldUseCredentialStorage();
virtual void didReceiveAuthenticationChallenge(const AuthenticationChallenge&);
- WEBCORE_EXPORT void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
virtual bool canAuthenticateAgainstProtectionSpace(const ProtectionSpace&);
#endif
@@ -197,7 +196,6 @@
#endif
bool shouldUseCredentialStorage(ResourceHandle*) override { return shouldUseCredentialStorage(); }
void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) override { didReceiveAuthenticationChallenge(challenge); }
- void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge) override { didCancelAuthenticationChallenge(challenge); }
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace& protectionSpace) override { return canAuthenticateAgainstProtectionSpace(protectionSpace); }
#endif
Modified: trunk/Source/WebCore/platform/network/ResourceHandle.h (202409 => 202410)
--- trunk/Source/WebCore/platform/network/ResourceHandle.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/platform/network/ResourceHandle.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -126,7 +126,6 @@
#endif
#if PLATFORM(COCOA) && !USE(CFNETWORK)
- void didCancelAuthenticationChallenge(const AuthenticationChallenge&);
WEBCORE_EXPORT NSURLConnection *connection() const;
id makeDelegate(bool);
id delegate();
Modified: trunk/Source/WebCore/platform/network/ResourceHandleClient.h (202409 => 202410)
--- trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/platform/network/ResourceHandleClient.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -113,7 +113,6 @@
virtual bool shouldUseCredentialStorage(ResourceHandle*) { return false; }
virtual void didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
- virtual void didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge&) { }
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
virtual bool canAuthenticateAgainstProtectionSpace(ResourceHandle*, const ProtectionSpace&) { return false; }
#endif
Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (202409 => 202410)
--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -623,16 +623,6 @@
return false;
}
-void ResourceHandle::didCancelAuthenticationChallenge(const AuthenticationChallenge& challenge)
-{
- ASSERT(d->m_currentMacChallenge);
- ASSERT(d->m_currentMacChallenge == challenge.nsURLAuthenticationChallenge());
- ASSERT(!d->m_currentWebChallenge.isNull());
-
- if (client())
- client()->didCancelAuthenticationChallenge(this, challenge);
-}
-
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool ResourceHandle::canAuthenticateAgainstProtectionSpace(const ProtectionSpace& protectionSpace)
{
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm (202409 => 202410)
--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsDelegate.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -109,19 +109,6 @@
m_handle->didReceiveAuthenticationChallenge(core(challenge));
}
-- (void)connection:(NSURLConnection *)connection didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
-{
- // FIXME: We probably don't need to implement this (see <rdar://problem/8960124>).
-
- UNUSED_PARAM(connection);
-
- LOG(Network, "Handle %p delegate connection:%p didCancelAuthenticationChallenge:%p", m_handle, connection, challenge);
-
- if (!m_handle)
- return;
- m_handle->didCancelAuthenticationChallenge(core(challenge));
-}
-
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
{
Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (202409 => 202410)
--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -145,22 +145,6 @@
});
}
-- (void)connection:(NSURLConnection *)connection didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
-{
- // FIXME: We probably don't need to implement this (see <rdar://problem/8960124>).
-
- ASSERT(!isMainThread());
- UNUSED_PARAM(connection);
-
- LOG(Network, "Handle %p delegate connection:%p didCancelAuthenticationChallenge:%p", m_handle, connection, challenge);
-
- dispatch_async(dispatch_get_main_queue(), ^{
- if (!m_handle)
- return;
- m_handle->didCancelAuthenticationChallenge(core(challenge));
- });
-}
-
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
- (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
{
Modified: trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h (202409 => 202410)
--- trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebCore/platform/spi/cocoa/NSURLDownloadSPI.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -52,7 +52,6 @@
- (NSURLRequest *)download:(NSURLDownload *)download willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse;
- (BOOL)download:(NSURLDownload *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace;
- (void)download:(NSURLDownload *)download didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
-- (void)download:(NSURLDownload *)download didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge;
- (BOOL)downloadShouldUseCredentialStorage:(NSURLDownload *)download;
- (void)download:(NSURLDownload *)download didReceiveResponse:(NSURLResponse *)response;
- (void)download:(NSURLDownload *)download willResumeWithResponse:(NSURLResponse *)response fromByte:(long long)startingByte;
Modified: trunk/Source/WebKit/ios/ChangeLog (202409 => 202410)
--- trunk/Source/WebKit/ios/ChangeLog 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/ios/ChangeLog 2016-06-24 02:47:19 UTC (rev 202410)
@@ -1,3 +1,15 @@
+2016-06-23 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused didCancelAuthenticationChallenge
+ https://bugs.webkit.org/show_bug.cgi?id=158819
+
+ Reviewed by David Kilzer.
+
+ * DefaultDelegates/WebDefaultResourceLoadDelegate.m:
+ (-[WebDefaultResourceLoadDelegate webView:resource:didReceiveAuthenticationChallenge:fromDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:canAuthenticateAgainstProtectionSpace:forDataSource:]):
+ (-[WebDefaultResourceLoadDelegate webView:resource:didCancelAuthenticationChallenge:fromDataSource:]): Deleted.
+
2016-06-02 David Kilzer <ddkil...@apple.com>
Fix typo in -[WebDefaultUIKitDelegate deleteFromInputwithFlags:]
Modified: trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m (202409 => 202410)
--- trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/ios/DefaultDelegates/WebDefaultResourceLoadDelegate.m 2016-06-24 02:47:19 UTC (rev 202410)
@@ -53,10 +53,6 @@
{
}
-- (void)webView:(WebView *)sender resource:(id)identifier didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge fromDataSource:(WebDataSource *)dataSource
-{
-}
-
- (BOOL)webView:(WebView *)sender resource:(id)identifier canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace forDataSource:(WebDataSource *)dataSource
{
return NO;
Modified: trunk/Source/WebKit/mac/ChangeLog (202409 => 202410)
--- trunk/Source/WebKit/mac/ChangeLog 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-24 02:47:19 UTC (rev 202410)
@@ -1,3 +1,19 @@
+2016-06-23 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused didCancelAuthenticationChallenge
+ https://bugs.webkit.org/show_bug.cgi?id=158819
+
+ Reviewed by David Kilzer.
+
+ * Misc/WebDownload.mm:
+ (-[WebDownloadInternal download:didCancelAuthenticationChallenge:]): Deleted.
+ * WebCoreSupport/WebFrameLoaderClient.h:
+ * WebCoreSupport/WebFrameLoaderClient.mm:
+ (WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge): Deleted.
+ * WebView/WebDelegateImplementationCaching.h:
+ * WebView/WebView.mm:
+ (-[WebView _cacheResourceLoadDelegateImplementations]):
+
2016-06-23 John Wilander <wilan...@apple.com>
Enable window.open() for existing versions of Secret Society app
Modified: trunk/Source/WebKit/mac/Misc/WebDownload.mm (202409 => 202410)
--- trunk/Source/WebKit/mac/Misc/WebDownload.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/mac/Misc/WebDownload.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -148,17 +148,6 @@
#endif
}
-- (void)download:(NSURLDownload *)download didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
-{
-#if !PLATFORM(IOS)
- if ([realDelegate respondsToSelector:@selector(download:didCancelAuthenticationChallenge:)]) {
- [realDelegate download:download didCancelAuthenticationChallenge:challenge];
- } else {
- [[WebPanelAuthenticationHandler sharedHandler] cancelAuthentication:challenge];
- }
-#endif
-}
-
- (void)download:(NSURLDownload *)download didReceiveResponse:(NSURLResponse *)response
{
[realDelegate download:download didReceiveResponse:response];
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h (202409 => 202410)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -80,7 +80,6 @@
void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
- void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) override;
#endif
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm (202409 => 202410)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -457,24 +457,6 @@
return true;
}
-void WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge(DocumentLoader* loader, unsigned long identifier, const AuthenticationChallenge&challenge)
-{
- WebView *webView = getWebView(m_webFrame.get());
- WebResourceDelegateImplementationCache* implementations = WebViewGetResourceLoadDelegateImplementations(webView);
- NSURLAuthenticationChallenge *webChallenge = mac(challenge);
-
- if (implementations->didCancelAuthenticationChallengeFunc) {
- if (id resource = [webView _objectForIdentifier:identifier]) {
- CallResourceLoadDelegate(implementations->didCancelAuthenticationChallengeFunc, webView, @selector(webView:resource:didCancelAuthenticationChallenge:fromDataSource:), resource, webChallenge, dataSource(loader));
- return;
- }
- }
-
-#if !PLATFORM(IOS)
- [(WebPanelAuthenticationHandler *)[WebPanelAuthenticationHandler sharedHandler] cancelAuthentication:webChallenge];
-#endif
-}
-
void WebFrameLoaderClient::dispatchDidReceiveResponse(DocumentLoader* loader, unsigned long identifier, const ResourceResponse& response)
{
WebView *webView = getWebView(m_webFrame.get());
Modified: trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h (202409 => 202410)
--- trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/mac/WebView/WebDelegateImplementationCaching.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -38,7 +38,6 @@
@class WebView;
struct WebResourceDelegateImplementationCache {
- IMP didCancelAuthenticationChallengeFunc;
IMP didReceiveAuthenticationChallengeFunc;
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
IMP canAuthenticateAgainstProtectionSpaceFunc;
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (202409 => 202410)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -2584,7 +2584,6 @@
return;
}
- cache->didCancelAuthenticationChallengeFunc = getMethod(delegate, @selector(webView:resource:didCancelAuthenticationChallenge:fromDataSource:));
cache->didFailLoadingWithErrorFromDataSourceFunc = getMethod(delegate, @selector(webView:resource:didFailLoadingWithError:fromDataSource:));
cache->didFinishLoadingFromDataSourceFunc = getMethod(delegate, @selector(webView:resource:didFinishLoadingFromDataSource:));
cache->didLoadResourceFromMemoryCacheFunc = getMethod(delegate, @selector(webView:didLoadResourceFromMemoryCache:response:length:fromDataSource:));
Modified: trunk/Source/WebKit/win/ChangeLog (202409 => 202410)
--- trunk/Source/WebKit/win/ChangeLog 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/win/ChangeLog 2016-06-24 02:47:19 UTC (rev 202410)
@@ -1,3 +1,14 @@
+2016-06-23 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused didCancelAuthenticationChallenge
+ https://bugs.webkit.org/show_bug.cgi?id=158819
+
+ Reviewed by David Kilzer.
+
+ * WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge): Deleted.
+ * WebCoreSupport/WebFrameLoaderClient.h:
+
2016-06-22 Per Arne Vollan <pvol...@apple.com>
[Win] The test storage/indexeddb/modern/handle-user-delete.html is timing out.
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp (202409 => 202410)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp 2016-06-24 02:47:19 UTC (rev 202410)
@@ -222,17 +222,6 @@
challenge.authenticationClient()->receivedRequestToContinueWithoutCredential(challenge);
}
-void WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge(DocumentLoader* loader, unsigned long identifier, const AuthenticationChallenge& challenge)
-{
- WebView* webView = m_webFrame->webView();
- COMPtr<IWebResourceLoadDelegate> resourceLoadDelegate;
- if (FAILED(webView->resourceLoadDelegate(&resourceLoadDelegate)))
- return;
-
- COMPtr<WebURLAuthenticationChallenge> webChallenge(AdoptCOM, WebURLAuthenticationChallenge::createInstance(challenge));
- resourceLoadDelegate->didCancelAuthenticationChallenge(webView, identifier, webChallenge.get(), getWebDataSource(loader));
-}
-
void WebFrameLoaderClient::dispatchWillSendRequest(DocumentLoader* loader, unsigned long identifier, ResourceRequest& request, const ResourceResponse& redirectResponse)
{
WebView* webView = m_webFrame->webView();
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h (202409 => 202410)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameLoaderClient.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -26,8 +26,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebFrameLoaderClient_h
-#define WebFrameLoaderClient_h
+#pragma once
#include <WebCore/COMPtr.h>
#include <WebCore/FrameLoaderClient.h>
@@ -69,7 +68,6 @@
void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
- void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
void dispatchDidReceiveResponse(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ResourceResponse&) override;
void dispatchDidReceiveContentLength(WebCore::DocumentLoader*, unsigned long identifier, int dataLength) override;
void dispatchDidFinishLoading(WebCore::DocumentLoader*, unsigned long identifier) override;
@@ -219,5 +217,3 @@
bool m_hasSentResponseToPlugin;
};
-
-#endif // WebFrameLoaderClient_h
Modified: trunk/Source/WebKit2/ChangeLog (202409 => 202410)
--- trunk/Source/WebKit2/ChangeLog 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-24 02:47:19 UTC (rev 202410)
@@ -1,3 +1,19 @@
+2016-06-23 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused didCancelAuthenticationChallenge
+ https://bugs.webkit.org/show_bug.cgi?id=158819
+
+ Reviewed by David Kilzer.
+
+ * NetworkProcess/Downloads/mac/DownloadMac.mm:
+ (-[WKDownloadAsDelegate download:didCancelAuthenticationChallenge:]): Deleted.
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::didCancelAuthenticationChallenge): Deleted.
+ * NetworkProcess/NetworkLoad.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge): Deleted.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
2016-06-23 Benjamin Poulain <benja...@webkit.org>
Specialize synchronous event tracking per event type
Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm (202409 => 202410)
--- trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm 2016-06-24 02:47:19 UTC (rev 202410)
@@ -189,12 +189,6 @@
});
}
-- (void)download:(NSURLDownload *)download didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
-{
- // FIXME: Implement.
- notImplemented();
-}
-
- (BOOL)downloadShouldUseCredentialStorage:(NSURLDownload *)download
{
return NO;
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (202409 => 202410)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-24 02:47:19 UTC (rev 202410)
@@ -451,14 +451,6 @@
NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, challenge);
}
-void NetworkLoad::didCancelAuthenticationChallenge(ResourceHandle* handle, const AuthenticationChallenge&)
-{
- ASSERT_UNUSED(handle, handle == m_handle);
-
- // This function is probably not needed (see <rdar://problem/8960124>).
- notImplemented();
-}
-
void NetworkLoad::receivedCancellation(ResourceHandle* handle, const AuthenticationChallenge&)
{
ASSERT_UNUSED(handle, handle == m_handle);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (202409 => 202410)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -88,7 +88,6 @@
void cannotShowURL(WebCore::ResourceHandle*) override;
bool shouldUseCredentialStorage(WebCore::ResourceHandle*) override;
void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
- void didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) override;
bool usesAsyncCallbacks() override { return true; }
bool loadingSynchronousXHR() override { return m_client.isSynchronous(); }
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (202409 => 202410)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2016-06-24 02:47:19 UTC (rev 202410)
@@ -196,11 +196,6 @@
WebProcess::singleton().supplement<AuthenticationManager>()->didReceiveAuthenticationChallenge(m_frame, challenge);
}
-void WebFrameLoaderClient::dispatchDidCancelAuthenticationChallenge(DocumentLoader*, unsigned long /*identifier*/, const AuthenticationChallenge&)
-{
- notImplemented();
-}
-
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool WebFrameLoaderClient::canAuthenticateAgainstProtectionSpace(DocumentLoader*, unsigned long, const ProtectionSpace& protectionSpace)
{
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h (202409 => 202410)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-06-24 02:44:28 UTC (rev 202409)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h 2016-06-24 02:47:19 UTC (rev 202410)
@@ -69,7 +69,6 @@
void dispatchWillSendRequest(WebCore::DocumentLoader*, unsigned long identifier, WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse) override;
bool shouldUseCredentialStorage(WebCore::DocumentLoader*, unsigned long identifier) override;
void dispatchDidReceiveAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
- void dispatchDidCancelAuthenticationChallenge(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::AuthenticationChallenge&) override;
#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
bool canAuthenticateAgainstProtectionSpace(WebCore::DocumentLoader*, unsigned long identifier, const WebCore::ProtectionSpace&) override;
#endif
