Diff
Modified: trunk/Source/WebKit2/ChangeLog (154894 => 154895)
--- trunk/Source/WebKit2/ChangeLog 2013-08-30 17:46:50 UTC (rev 154894)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-30 17:50:52 UTC (rev 154895)
@@ -1,3 +1,16 @@
+2013-08-30 Csaba Osztrogonác <[email protected]>
+
+ Add USE(PROTECTION_SPACE_AUTH_CALLBACK) guards to canAuthenticateAgainstProtectionSpace()
+ https://bugs.webkit.org/show_bug.cgi?id=120351
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/AsynchronousNetworkLoaderClient.cpp:
+ * NetworkProcess/AsynchronousNetworkLoaderClient.h:
+ * NetworkProcess/NetworkLoaderClient.h:
+ * NetworkProcess/SynchronousNetworkLoaderClient.cpp:
+ * NetworkProcess/SynchronousNetworkLoaderClient.h:
+
2013-08-30 Gabor Abraham <[email protected]>
Fix, remove unused parameter in UIProcess/WebColorPicker.cpp.
Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp (154894 => 154895)
--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-08-30 17:46:50 UTC (rev 154894)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp 2013-08-30 17:50:52 UTC (rev 154895)
@@ -52,12 +52,14 @@
loader->sendAbortingOnFailure(Messages::WebResourceLoader::WillSendRequest(request, redirectResponse), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
void AsynchronousNetworkLoaderClient::canAuthenticateAgainstProtectionSpace(NetworkResourceLoader* loader, const ProtectionSpace& protectionSpace)
{
// This message is DispatchMessageEvenWhenWaitingForSyncReply to avoid a situation where the NetworkProcess is deadlocked
// waiting for 6 connections to complete while the WebProcess is waiting for a 7th (Synchronous XHR) to complete.
loader->sendAbortingOnFailure(Messages::WebResourceLoader::CanAuthenticateAgainstProtectionSpace(protectionSpace), CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply);
}
+#endif
void AsynchronousNetworkLoaderClient::didReceiveResponse(NetworkResourceLoader* loader, const ResourceResponse& response)
{
Modified: trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h (154894 => 154895)
--- trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h 2013-08-30 17:46:50 UTC (rev 154894)
+++ trunk/Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h 2013-08-30 17:50:52 UTC (rev 154895)
@@ -45,7 +45,9 @@
AsynchronousNetworkLoaderClient();
virtual void willSendRequest(NetworkResourceLoader*, WebCore::ResourceRequest& newRequest, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
virtual void canAuthenticateAgainstProtectionSpace(NetworkResourceLoader*, const WebCore::ProtectionSpace&) OVERRIDE;
+#endif
virtual void didReceiveResponse(NetworkResourceLoader*, const WebCore::ResourceResponse&) OVERRIDE;
virtual void didReceiveBuffer(NetworkResourceLoader*, WebCore::SharedBuffer*, int encodedDataLength) OVERRIDE;
virtual void didSendData(NetworkResourceLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE;
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoaderClient.h (154894 => 154895)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoaderClient.h 2013-08-30 17:46:50 UTC (rev 154894)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoaderClient.h 2013-08-30 17:50:52 UTC (rev 154895)
@@ -47,7 +47,9 @@
virtual ~NetworkLoaderClient() { }
virtual void willSendRequest(NetworkResourceLoader*, WebCore::ResourceRequest& newRequest, const WebCore::ResourceResponse& redirectResponse) = 0;
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
virtual void canAuthenticateAgainstProtectionSpace(NetworkResourceLoader*, const WebCore::ProtectionSpace&) = 0;
+#endif
virtual void didReceiveResponse(NetworkResourceLoader*, const WebCore::ResourceResponse&) = 0;
virtual void didReceiveBuffer(NetworkResourceLoader*, WebCore::SharedBuffer*, int encodedDataLength) = 0;
virtual void didSendData(NetworkResourceLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) = 0;
Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp (154894 => 154895)
--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2013-08-30 17:46:50 UTC (rev 154894)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp 2013-08-30 17:50:52 UTC (rev 154895)
@@ -66,6 +66,7 @@
loader->continueWillSendRequest(m_currentRequest);
}
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
void SynchronousNetworkLoaderClient::canAuthenticateAgainstProtectionSpace(NetworkResourceLoader* loader, const ProtectionSpace&)
{
// FIXME: We should ask the WebProcess like the asynchronous case below does.
@@ -73,6 +74,7 @@
// It's possible that we can jump straight to the UI process to resolve this.
loader->continueCanAuthenticateAgainstProtectionSpace(true);
}
+#endif
void SynchronousNetworkLoaderClient::didReceiveResponse(NetworkResourceLoader*, const ResourceResponse& response)
{
Modified: trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h (154894 => 154895)
--- trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2013-08-30 17:46:50 UTC (rev 154894)
+++ trunk/Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h 2013-08-30 17:50:52 UTC (rev 154895)
@@ -56,7 +56,9 @@
SynchronousNetworkLoaderClient(const WebCore::ResourceRequest& originalRequest, PassRefPtr<Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::DelayedReply>);
virtual void willSendRequest(NetworkResourceLoader*, WebCore::ResourceRequest& proposedRequest, const WebCore::ResourceResponse& redirectResponse) OVERRIDE;
+#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
virtual void canAuthenticateAgainstProtectionSpace(NetworkResourceLoader*, const WebCore::ProtectionSpace&) OVERRIDE;
+#endif
virtual void didReceiveResponse(NetworkResourceLoader*, const WebCore::ResourceResponse&) OVERRIDE;
virtual void didReceiveBuffer(NetworkResourceLoader*, WebCore::SharedBuffer*, int encodedDataLength) OVERRIDE;
virtual void didSendData(NetworkResourceLoader*, unsigned long long bytesSent, unsigned long long totalBytesToBeSent) OVERRIDE { }
