<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202184] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202184">202184</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-06-17 16:27:28 -0700 (Fri, 17 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use WTF::NoncopyableFunction in NetworkDataTaskClient
https://bugs.webkit.org/show_bug.cgi?id=158887
Reviewed by Alex Christensen.
Use WTF::NoncopyableFunction in NetworkDataTaskClient instead of std::function
and consistently move it around. This avoids some unnecessary copying.
* NetworkProcess/Downloads/DownloadManager.cpp:
(WebKit::DownloadManager::willDecidePendingDownloadDestination):
(WebKit::DownloadManager::continueDecidePendingDownloadDestination):
* NetworkProcess/Downloads/DownloadManager.h:
* NetworkProcess/NetworkDataTask.h:
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::willPerformHTTPRedirection):
(WebKit::NetworkLoad::didReceiveChallenge):
(WebKit::NetworkLoad::didReceiveResponseNetworkSession):
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::NetworkProcess::findPendingDownloadLocation):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/PingLoad.h:
* NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
(WebKit::NetworkDataTask::didReceiveChallenge):
(WebKit::NetworkDataTask::didReceiveResponse):
(WebKit::NetworkDataTask::willPerformHTTPRedirection):
(WebKit::NetworkDataTask::tryPasswordBasedAuthentication):
* NetworkProcess/cocoa/NetworkSessionCocoa.mm:
(-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
* Shared/Authentication/AuthenticationManager.cpp:
(WebKit::AuthenticationManager::addChallengeToChallengeMap):
(WebKit::AuthenticationManager::coalesceChallengesMatching):
(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
(WebKit::AuthenticationManager::tryUseCertificateInfoForChallenge):
(WebKit::AuthenticationManager::useCredentialForSingleChallenge):
* Shared/Authentication/AuthenticationManager.h:
* Shared/Authentication/mac/AuthenticationManager.mac.mm:
(WebKit::AuthenticationManager::tryUseCertificateInfoForChallenge):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh">trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkDataTaskh">trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessPingLoadh">trunk/Source/WebKit2/NetworkProcess/PingLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm">trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2016-06-17 Chris Dumez <cdumez@apple.com>
+
+ Use WTF::NoncopyableFunction in NetworkDataTaskClient
+ https://bugs.webkit.org/show_bug.cgi?id=158887
+
+ Reviewed by Alex Christensen.
+
+ Use WTF::NoncopyableFunction in NetworkDataTaskClient instead of std::function
+ and consistently move it around. This avoids some unnecessary copying.
+
+ * NetworkProcess/Downloads/DownloadManager.cpp:
+ (WebKit::DownloadManager::willDecidePendingDownloadDestination):
+ (WebKit::DownloadManager::continueDecidePendingDownloadDestination):
+ * NetworkProcess/Downloads/DownloadManager.h:
+ * NetworkProcess/NetworkDataTask.h:
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::willPerformHTTPRedirection):
+ (WebKit::NetworkLoad::didReceiveChallenge):
+ (WebKit::NetworkLoad::didReceiveResponseNetworkSession):
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::findPendingDownloadLocation):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/PingLoad.h:
+ * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
+ (WebKit::NetworkDataTask::didReceiveChallenge):
+ (WebKit::NetworkDataTask::didReceiveResponse):
+ (WebKit::NetworkDataTask::willPerformHTTPRedirection):
+ (WebKit::NetworkDataTask::tryPasswordBasedAuthentication):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (-[WKNetworkSessionDelegate URLSession:task:didReceiveChallenge:completionHandler:]):
+ * Shared/Authentication/AuthenticationManager.cpp:
+ (WebKit::AuthenticationManager::addChallengeToChallengeMap):
+ (WebKit::AuthenticationManager::coalesceChallengesMatching):
+ (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+ (WebKit::AuthenticationManager::tryUseCertificateInfoForChallenge):
+ (WebKit::AuthenticationManager::useCredentialForSingleChallenge):
+ * Shared/Authentication/AuthenticationManager.h:
+ * Shared/Authentication/mac/AuthenticationManager.mac.mm:
+ (WebKit::AuthenticationManager::tryUseCertificateInfoForChallenge):
+
</ins><span class="cx"> 2016-06-17 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> Web video playback controls should have RTL volume slider
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.cpp 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> pendingDownload->continueWillSendRequest(WTFMove(request));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DownloadManager::willDecidePendingDownloadDestination(NetworkDataTask& networkDataTask, ResponseCompletionHandler completionHandler)
</del><ins>+void DownloadManager::willDecidePendingDownloadDestination(NetworkDataTask& networkDataTask, ResponseCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> auto downloadID = networkDataTask.pendingDownloadID();
</span><span class="cx"> auto pendingDownload = m_pendingDownloads.take(downloadID);
</span><span class="lines">@@ -107,8 +107,8 @@
</span><span class="cx"> void DownloadManager::continueDecidePendingDownloadDestination(DownloadID downloadID, String destination, const SandboxExtension::Handle& sandboxExtensionHandle, bool allowOverwrite)
</span><span class="cx"> {
</span><span class="cx"> auto pair = m_downloadsWaitingForDestination.take(downloadID);
</span><del>- auto networkDataTask = pair.first;
- auto completionHandler = pair.second;
</del><ins>+ auto networkDataTask = WTFMove(pair.first);
+ auto completionHandler = WTFMove(pair.second);
</ins><span class="cx"> if (!networkDataTask || !completionHandler)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessDownloadsDownloadManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/Downloads/DownloadManager.h 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> std::pair<RefPtr<NetworkDataTask>, std::unique_ptr<PendingDownload>> dataTaskBecameDownloadTask(DownloadID, std::unique_ptr<Download>&&);
</span><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
</span><span class="cx"> void continueWillSendRequest(DownloadID, WebCore::ResourceRequest&&);
</span><del>- void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler);
</del><ins>+ void willDecidePendingDownloadDestination(NetworkDataTask&, ResponseCompletionHandler&&);
</ins><span class="cx"> void continueDecidePendingDownloadDestination(DownloadID, String destination, const SandboxExtension::Handle&, bool allowOverwrite);
</span><span class="cx"> #else
</span><span class="cx"> void convertHandleToDownload(DownloadID, WebCore::ResourceHandle*, const WebCore::ResourceRequest&, const WebCore::ResourceResponse&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkDataTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkDataTask.h 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -62,15 +63,15 @@
</span><span class="cx"> RejectProtectionSpace
</span><span class="cx"> };
</span><span class="cx">
</span><del>-typedef std::function<void(const WebCore::ResourceRequest&)> RedirectCompletionHandler;
-typedef std::function<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
-typedef std::function<void(WebCore::PolicyAction)> ResponseCompletionHandler;
</del><ins>+typedef NoncopyableFunction<void(const WebCore::ResourceRequest&)> RedirectCompletionHandler;
+typedef NoncopyableFunction<void(AuthenticationChallengeDisposition, const WebCore::Credential&)> ChallengeCompletionHandler;
+typedef NoncopyableFunction<void(WebCore::PolicyAction)> ResponseCompletionHandler;
</ins><span class="cx">
</span><span class="cx"> class NetworkDataTaskClient {
</span><span class="cx"> public:
</span><del>- virtual void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler) = 0;
- virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) = 0;
- virtual void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler) = 0;
</del><ins>+ virtual void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&) = 0;
+ virtual void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&) = 0;
+ virtual void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler&&) = 0;
</ins><span class="cx"> virtual void didReceiveData(Ref<WebCore::SharedBuffer>&&) = 0;
</span><span class="cx"> virtual void didCompleteWithError(const WebCore::ResourceError&) = 0;
</span><span class="cx"> virtual void didBecomeDownload() = 0;
</span><span class="lines">@@ -98,9 +99,9 @@
</span><span class="cx"> ~NetworkDataTask();
</span><span class="cx">
</span><span class="cx"> void didSendData(uint64_t totalBytesSent, uint64_t totalBytesExpectedToSend);
</span><del>- void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</del><ins>+ void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&);
</ins><span class="cx"> void didCompleteWithError(const WebCore::ResourceError&);
</span><del>- void didReceiveResponse(WebCore::ResourceResponse&&, ResponseCompletionHandler);
</del><ins>+ void didReceiveResponse(WebCore::ResourceResponse&&, ResponseCompletionHandler&&);
</ins><span class="cx"> void didReceiveData(Ref<WebCore::SharedBuffer>&&);
</span><span class="cx"> void didBecomeDownload();
</span><span class="cx">
</span><span class="lines">@@ -126,14 +127,14 @@
</span><span class="cx"> const WebCore::ResourceRequest& firstRequest() const { return m_firstRequest; }
</span><span class="cx"> WebCore::ResourceRequest currentRequest();
</span><span class="cx"> String suggestedFilename();
</span><del>- void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler);
</del><ins>+ void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&);
</ins><span class="cx"> void transferSandboxExtensionToDownload(Download&);
</span><span class="cx"> bool allowsSpecificHTTPSCertificateForHost(const WebCore::AuthenticationChallenge&);
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkDataTask(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ContentSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect);
</span><span class="cx">
</span><del>- bool tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</del><ins>+ bool tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge&, const ChallengeCompletionHandler&);
</ins><span class="cx">
</span><span class="cx"> enum FailureType {
</span><span class="cx"> NoFailure,
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -205,14 +205,14 @@
</span><span class="cx"> m_task->setPendingDownload(pendingDownload);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::willPerformHTTPRedirection(ResourceResponse&& response, ResourceRequest&& request, RedirectCompletionHandler completionHandler)
</del><ins>+void NetworkLoad::willPerformHTTPRedirection(ResourceResponse&& response, ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_redirectCompletionHandler);
</span><del>- m_redirectCompletionHandler = completionHandler;
</del><ins>+ m_redirectCompletionHandler = WTFMove(completionHandler);
</ins><span class="cx"> sharedWillSendRedirectedRequest(WTFMove(request), WTFMove(response));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::didReceiveChallenge(const AuthenticationChallenge& challenge, std::function<void(AuthenticationChallengeDisposition, const Credential&)> completionHandler)
</del><ins>+void NetworkLoad::didReceiveChallenge(const AuthenticationChallenge& challenge, ChallengeCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> // NetworkResourceLoader does not know whether the request is cross origin, so Web process computes an applicable credential policy for it.
</span><span class="cx"> ASSERT(m_parameters.clientCredentialPolicy != DoNotAskClientForCrossOriginCredentials);
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_challengeCompletionHandler = completionHandler;
</del><ins>+ m_challengeCompletionHandler = WTFMove(completionHandler);
</ins><span class="cx"> m_challenge = challenge;
</span><span class="cx">
</span><span class="cx"> if (m_client.isSynchronous()) {
</span><span class="lines">@@ -240,15 +240,15 @@
</span><span class="cx"> m_client.canAuthenticateAgainstProtectionSpaceAsync(challenge.protectionSpace());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler completionHandler)
</del><ins>+void NetworkLoad::didReceiveResponseNetworkSession(ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (m_task && m_task->pendingDownloadID().downloadID())
</span><del>- NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), completionHandler, m_task->currentRequest());
</del><ins>+ NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(completionHandler), m_task->currentRequest());
</ins><span class="cx"> else if (sharedDidReceiveResponse(WTFMove(response)) == NetworkLoadClient::ShouldContinueDidReceiveResponse::Yes)
</span><span class="cx"> completionHandler(PolicyUse);
</span><span class="cx"> else
</span><del>- m_responseCompletionHandler = completionHandler;
</del><ins>+ m_responseCompletionHandler = WTFMove(completionHandler);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkLoad::didReceiveData(Ref<SharedBuffer>&& buffer)
</span><span class="lines">@@ -380,9 +380,9 @@
</span><span class="cx">
</span><span class="cx"> if (m_task) {
</span><span class="cx"> if (auto* pendingDownload = m_task->pendingDownload())
</span><del>- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, *m_challenge, completionHandler);
</del><ins>+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, *m_challenge, WTFMove(completionHandler));
</ins><span class="cx"> else
</span><del>- NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, *m_challenge, completionHandler);
</del><ins>+ NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, *m_challenge, WTFMove(completionHandler));
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> if (m_handle)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -66,9 +66,9 @@
</span><span class="cx"> DownloadID pendingDownloadID() { return m_task->pendingDownloadID(); }
</span><span class="cx">
</span><span class="cx"> // NetworkDataTaskClient
</span><del>- void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler) final;
- void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler) final;
- void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler) final;
</del><ins>+ void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&&) final;
+ void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&) final;
+ void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler&&) final;
</ins><span class="cx"> void didReceiveData(Ref<WebCore::SharedBuffer>&&) final;
</span><span class="cx"> void didCompleteWithError(const WebCore::ResourceError&) final;
</span><span class="cx"> void didBecomeDownload() final;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -496,12 +496,12 @@
</span><span class="cx"> downloadProxyConnection()->send(Messages::DownloadProxy::DidCancel({ }), downloadID.downloadID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTask, ResponseCompletionHandler completionHandler, const ResourceRequest& updatedRequest)
</del><ins>+void NetworkProcess::findPendingDownloadLocation(NetworkDataTask& networkDataTask, ResponseCompletionHandler&& completionHandler, const ResourceRequest& updatedRequest)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t destinationID = networkDataTask.pendingDownloadID().downloadID();
</span><span class="cx"> downloadProxyConnection()->send(Messages::DownloadProxy::DidStart(updatedRequest, String()), destinationID);
</span><span class="cx">
</span><del>- downloadManager().willDecidePendingDownloadDestination(networkDataTask, completionHandler);
</del><ins>+ downloadManager().willDecidePendingDownloadDestination(networkDataTask, WTFMove(completionHandler));
</ins><span class="cx"> downloadProxyConnection()->send(Messages::DownloadProxy::DecideDestinationWithSuggestedFilenameAsync(networkDataTask.pendingDownloadID(), networkDataTask.suggestedFilename()), destinationID);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- void findPendingDownloadLocation(NetworkDataTask&, ResponseCompletionHandler, const WebCore::ResourceRequest&);
</del><ins>+ void findPendingDownloadLocation(NetworkDataTask&, ResponseCompletionHandler&&, const WebCore::ResourceRequest&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void prefetchDNS(const String&);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessPingLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/PingLoad.h (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/PingLoad.h 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -48,17 +48,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler completionHandler) override
</del><ins>+ void willPerformHTTPRedirection(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&, RedirectCompletionHandler&& completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> completionHandler({ });
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><del>- void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler completionHandler) override
</del><ins>+ void didReceiveChallenge(const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&& completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> completionHandler(AuthenticationChallengeDisposition::Cancel, { });
</span><span class="cx"> delete this;
</span><span class="cx"> }
</span><del>- void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler completionHandler) override
</del><ins>+ void didReceiveResponseNetworkSession(WebCore::ResourceResponse&&, ResponseCompletionHandler&& completionHandler) override
</ins><span class="cx"> {
</span><span class="cx"> completionHandler(WebCore::PolicyAction::PolicyIgnore);
</span><span class="cx"> delete this;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkDataTaskCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> m_client->didSendData(totalBytesSent, totalBytesExpectedToSend);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkDataTask::didReceiveChallenge(const WebCore::AuthenticationChallenge& challenge, ChallengeCompletionHandler completionHandler)
</del><ins>+void NetworkDataTask::didReceiveChallenge(const WebCore::AuthenticationChallenge& challenge, ChallengeCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> // Proxy authentication is handled by CFNetwork internally. We can get here if the user cancels
</span><span class="cx"> // CFNetwork authentication dialog, and we shouldn't ask the client to display another one in that case.
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><del>- m_client->didReceiveChallenge(challenge, completionHandler);
</del><ins>+ m_client->didReceiveChallenge(challenge, WTFMove(completionHandler));
</ins><span class="cx"> else {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> completionHandler(AuthenticationChallengeDisposition::PerformDefaultHandling, { });
</span><span class="lines">@@ -165,10 +165,10 @@
</span><span class="cx"> m_client->didCompleteWithError(error);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkDataTask::didReceiveResponse(WebCore::ResourceResponse&& response, ResponseCompletionHandler completionHandler)
</del><ins>+void NetworkDataTask::didReceiveResponse(WebCore::ResourceResponse&& response, ResponseCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (m_client)
</span><del>- m_client->didReceiveResponseNetworkSession(WTFMove(response), completionHandler);
</del><ins>+ m_client->didReceiveResponseNetworkSession(WTFMove(response), WTFMove(completionHandler));
</ins><span class="cx"> else {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> completionHandler(WebCore::PolicyAction::PolicyIgnore);
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> m_client->didBecomeDownload();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkDataTask::willPerformHTTPRedirection(WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& request, RedirectCompletionHandler completionHandler)
</del><ins>+void NetworkDataTask::willPerformHTTPRedirection(WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& request, RedirectCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (redirectResponse.httpStatusCode() == 307 || redirectResponse.httpStatusCode() == 308) {
</span><span class="cx"> ASSERT(m_lastHTTPMethod == request.httpMethod());
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span><del>- m_client->willPerformHTTPRedirection(WTFMove(redirectResponse), WTFMove(request), completionHandler);
</del><ins>+ m_client->willPerformHTTPRedirection(WTFMove(redirectResponse), WTFMove(request), WTFMove(completionHandler));
</ins><span class="cx"> else {
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> completionHandler({ });
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> m_task.get()._pathToDownloadTaskFile = filename;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool NetworkDataTask::tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge& challenge, ChallengeCompletionHandler completionHandler)
</del><ins>+bool NetworkDataTask::tryPasswordBasedAuthentication(const WebCore::AuthenticationChallenge& challenge, const ChallengeCompletionHandler& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (!challenge.protectionSpace().isPasswordBased())
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkSessionCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> completionHandlerCopy(toNSURLSessionAuthChallengeDisposition(disposition), credential.nsCredential());
</span><span class="cx"> Block_release(completionHandlerCopy);
</span><span class="cx"> };
</span><del>- networkDataTask->didReceiveChallenge(challenge, challengeCompletionHandler);
</del><ins>+ networkDataTask->didReceiveChallenge(challenge, WTFMove(challengeCompletionHandler));
</ins><span class="cx"> } else {
</span><span class="cx"> LOG(NetworkSession, "%llu didReceiveChallenge completionHandler (cancel)", taskIdentifier);
</span><span class="cx"> completionHandler(NSURLSessionAuthChallengeCancelAuthenticationChallenge, nil);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -68,12 +68,12 @@
</span><span class="cx"> m_process->addMessageReceiver(Messages::AuthenticationManager::messageReceiverName(), *this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-uint64_t AuthenticationManager::addChallengeToChallengeMap(const Challenge& challenge)
</del><ins>+uint64_t AuthenticationManager::addChallengeToChallengeMap(Challenge&& challenge)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="cx"> uint64_t challengeID = generateAuthenticationChallengeID();
</span><del>- m_challenges.set(challengeID, challenge);
</del><ins>+ m_challenges.set(challengeID, WTFMove(challenge));
</ins><span class="cx"> return challengeID;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,9 +91,11 @@
</span><span class="cx">
</span><span class="cx"> Vector<uint64_t> AuthenticationManager::coalesceChallengesMatching(uint64_t challengeID) const
</span><span class="cx"> {
</span><del>- auto challenge = m_challenges.get(challengeID);
- ASSERT(!challenge.challenge.isNull());
</del><ins>+ auto iterator = m_challenges.find(challengeID);
+ ASSERT(iterator != m_challenges.end());
</ins><span class="cx">
</span><ins>+ auto& challenge = iterator->value;
+
</ins><span class="cx"> Vector<uint64_t> challengesToCoalesce;
</span><span class="cx"> challengesToCoalesce.append(challengeID);
</span><span class="cx">
</span><span class="lines">@@ -128,12 +130,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>-void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler completionHandler)
</del><ins>+void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(pageID);
</span><span class="cx"> ASSERT(frameID);
</span><span class="cx">
</span><del>- uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge, completionHandler});
</del><ins>+ uint64_t challengeID = addChallengeToChallengeMap({ pageID, authenticationChallenge, WTFMove(completionHandler) });
</ins><span class="cx">
</span><span class="cx"> // Coalesce challenges in the same protection space and in the same page.
</span><span class="cx"> if (shouldCoalesceChallenge(pageID, challengeID, authenticationChallenge))
</span><span class="lines">@@ -142,10 +144,10 @@
</span><span class="cx"> m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AuthenticationManager::didReceiveAuthenticationChallenge(PendingDownload& pendingDownload, const WebCore::AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler completionHandler)
</del><ins>+void AuthenticationManager::didReceiveAuthenticationChallenge(PendingDownload& pendingDownload, const WebCore::AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> uint64_t dummyPageID = 0;
</span><del>- uint64_t challengeID = addChallengeToChallengeMap({dummyPageID, authenticationChallenge, completionHandler});
</del><ins>+ uint64_t challengeID = addChallengeToChallengeMap({ dummyPageID, authenticationChallenge, WTFMove(completionHandler) });
</ins><span class="cx">
</span><span class="cx"> // Coalesce challenges in the same protection space and in the same page.
</span><span class="cx"> if (shouldCoalesceChallenge(dummyPageID, challengeID, authenticationChallenge))
</span><span class="lines">@@ -188,7 +190,7 @@
</span><span class="cx">
</span><span class="cx"> // Currently, only Mac knows how to respond to authentication challenges with certificate info.
</span><span class="cx"> #if !HAVE(SEC_IDENTITY)
</span><del>-bool AuthenticationManager::tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const CertificateInfo&, ChallengeCompletionHandler)
</del><ins>+bool AuthenticationManager::tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const CertificateInfo&, const ChallengeCompletionHandler&)
</ins><span class="cx"> {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -208,7 +210,7 @@
</span><span class="cx"> ASSERT(!challenge.challenge.isNull());
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- auto completionHandler = challenge.completionHandler;
</del><ins>+ auto completionHandler = WTFMove(challenge.completionHandler);
</ins><span class="cx"> #else
</span><span class="cx"> ChallengeCompletionHandler completionHandler = nullptr;
</span><span class="cx"> #endif
</span><span class="lines">@@ -222,7 +224,7 @@
</span><span class="cx"> // FIXME: Remove the use of AuthenticationClient in WebKit2 once NETWORK_SESSION is used for all loads.
</span><span class="cx"> if (completionHandler) {
</span><span class="cx"> ASSERT(!coreClient);
</span><del>- challenge.completionHandler(AuthenticationChallengeDisposition::UseCredential, credential);
</del><ins>+ completionHandler(AuthenticationChallengeDisposition::UseCredential, credential);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><del>- void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
- void didReceiveAuthenticationChallenge(PendingDownload&, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler);
</del><ins>+ void didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&);
+ void didReceiveAuthenticationChallenge(PendingDownload&, const WebCore::AuthenticationChallenge&, ChallengeCompletionHandler&&);
</ins><span class="cx"> void continueCanAuthenticateAgainstProtectionSpace(DownloadID, bool canAuthenticate);
</span><span class="cx"> #endif
</span><span class="cx"> // Called for resources in the WebProcess (NetworkProcess disabled)
</span><span class="lines">@@ -94,9 +94,9 @@
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span><span class="cx">
</span><del>- bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&, ChallengeCompletionHandler);
</del><ins>+ bool tryUseCertificateInfoForChallenge(const WebCore::AuthenticationChallenge&, const WebCore::CertificateInfo&, const ChallengeCompletionHandler&);
</ins><span class="cx">
</span><del>- uint64_t addChallengeToChallengeMap(const Challenge&);
</del><ins>+ uint64_t addChallengeToChallengeMap(Challenge&&);
</ins><span class="cx"> bool shouldCoalesceChallenge(uint64_t pageID, uint64_t challengeID, const WebCore::AuthenticationChallenge&) const;
</span><span class="cx">
</span><span class="cx"> void useCredentialForSingleChallenge(uint64_t challengeID, const WebCore::Credential&, const WebCore::CertificateInfo&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationmacAuthenticationManagermacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm (202183 => 202184)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2016-06-17 22:24:52 UTC (rev 202183)
+++ trunk/Source/WebKit2/Shared/Authentication/mac/AuthenticationManager.mac.mm 2016-06-17 23:27:28 UTC (rev 202184)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> // FIXME: This function creates an identity from a certificate, which should not be needed. We should pass an identity over IPC (as we do on iOS).
</span><del>-bool AuthenticationManager::tryUseCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const CertificateInfo& certificateInfo, ChallengeCompletionHandler completionHandler)
</del><ins>+bool AuthenticationManager::tryUseCertificateInfoForChallenge(const AuthenticationChallenge& challenge, const CertificateInfo& certificateInfo, const ChallengeCompletionHandler& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> if (certificateInfo.isEmpty())
</span><span class="cx"> return false;
</span></span></pre>
</div>
</div>
</body>
</html>