NETWORK_SESSION does not need didReceiveAuthenticationChallenge(uint64_t, uint64_t...
authorcdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jul 2017 23:55:22 +0000 (23:55 +0000)
committercdumez@apple.com <cdumez@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Jul 2017 23:55:22 +0000 (23:55 +0000)
https://bugs.webkit.org/show_bug.cgi?id=174595

Reviewed by Alex Christensen.

* Shared/Authentication/AuthenticationManager.cpp:
(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
* Shared/Authentication/AuthenticationManager.h:

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

Source/WebKit/ChangeLog
Source/WebKit/Shared/Authentication/AuthenticationManager.cpp
Source/WebKit/Shared/Authentication/AuthenticationManager.h

index 857081d..62cdc79 100644 (file)
@@ -1,3 +1,14 @@
+2017-07-17  Chris Dumez  <cdumez@apple.com>
+
+        NETWORK_SESSION does not need didReceiveAuthenticationChallenge(uint64_t, uint64_t, const AuthenticationChallenge&)
+        https://bugs.webkit.org/show_bug.cgi?id=174595
+
+        Reviewed by Alex Christensen.
+
+        * Shared/Authentication/AuthenticationManager.cpp:
+        (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+        * Shared/Authentication/AuthenticationManager.h:
+
 2017-07-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 
         [iOS DnD] Web process uses too much memory when beginning a drag on a very large image
index f16ffa5..7df7231 100644 (file)
@@ -156,16 +156,14 @@ void AuthenticationManager::didReceiveAuthenticationChallenge(PendingDownload& p
     pendingDownload.send(Messages::DownloadProxy::DidReceiveAuthenticationChallenge(authenticationChallenge, challengeID));
 }
 #endif
+
+#if !USE(NETWORK_SESSION)
 void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge)
 {
     ASSERT(pageID);
     ASSERT(frameID);
 
-    uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge
-#if USE(NETWORK_SESSION)
-        , { }
-#endif
-    });
+    uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge});
 
     // Coalesce challenges in the same protection space and in the same page.
     if (shouldCoalesceChallenge(pageID, challengeID, authenticationChallenge))
@@ -173,6 +171,7 @@ void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, u
     
     m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
 }
+#endif
 
 #if !USE(NETWORK_SESSION)
 void AuthenticationManager::didReceiveAuthenticationChallenge(Download& download, const AuthenticationChallenge& authenticationChallenge)
index 6372cd2..3636ff1 100644 (file)
@@ -72,9 +72,10 @@ public:
 #endif
     // Called for resources in the WebProcess (NetworkProcess disabled)
     void didReceiveAuthenticationChallenge(WebFrame*, const WebCore::AuthenticationChallenge&);
+
+#if !USE(NETWORK_SESSION)
     // Called for resources in the NetworkProcess (NetworkProcess enabled)
     void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&);
-#if !USE(NETWORK_SESSION)
     void didReceiveAuthenticationChallenge(Download&, const WebCore::AuthenticationChallenge&);
 #endif