Attempt to fix the Apple El Capitan build following <https://trac.webkit.org/changese...
authordbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Oct 2017 23:40:45 +0000 (23:40 +0000)
committerdbates@webkit.org <dbates@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 27 Oct 2017 23:40:45 +0000 (23:40 +0000)
(https://bugs.webkit.org/show_bug.cgi?id=178919)

Move definition of NetworkLoad::isAllowedToAskUserForCredentials() outside of USE(NETWORK_SESSION)-guarded section.

* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::isAllowedToAskUserForCredentials const):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@224135 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/NetworkProcess/NetworkLoad.cpp

index 81568f7..42c9b58 100644 (file)
@@ -1,5 +1,15 @@
 2017-10-27  Daniel Bates  <dabates@apple.com>
 
+        Attempt to fix the Apple El Capitan build following <https://trac.webkit.org/changeset/224134>
+        (https://bugs.webkit.org/show_bug.cgi?id=178919)
+
+        Move definition of NetworkLoad::isAllowedToAskUserForCredentials() outside of USE(NETWORK_SESSION)-guarded section.
+
+        * NetworkProcess/NetworkLoad.cpp:
+        (WebKit::NetworkLoad::isAllowedToAskUserForCredentials const):
+
+2017-10-27  Daniel Bates  <dabates@apple.com>
+
         Only allow non-mixed content protected subresources to ask for credentials
         https://bugs.webkit.org/show_bug.cgi?id=178919
         <rdar://problem/35015245>
index a3c95dd..447d8a1 100644 (file)
@@ -269,6 +269,11 @@ void NetworkLoad::sharedWillSendRedirectedRequest(ResourceRequest&& request, Res
     m_client.get().willSendRedirectedRequest(WTFMove(oldRequest), WTFMove(request), WTFMove(redirectResponse));
 }
 
+bool NetworkLoad::isAllowedToAskUserForCredentials() const
+{
+    return m_client.get().isAllowedToAskUserForCredentials();
+}
+
 #if USE(NETWORK_SESSION)
 
 void NetworkLoad::convertTaskToDownload(PendingDownload& pendingDownload, const ResourceRequest& updatedRequest, const ResourceResponse& response)
@@ -326,11 +331,6 @@ void NetworkLoad::didReceiveChallenge(const AuthenticationChallenge& challenge,
 #endif
 }
 
-bool NetworkLoad::isAllowedToAskUserForCredentials() const
-{
-    return m_client.get().isAllowedToAskUserForCredentials();
-}
-
 void NetworkLoad::completeAuthenticationChallenge(ChallengeCompletionHandler&& completionHandler)
 {
     bool isServerTrustEvaluation = m_challenge->protectionSpace().authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested;