Title: [198755] trunk/Source/WebKit2
- Revision
- 198755
- Author
- [email protected]
- Date
- 2016-03-28 13:32:56 -0700 (Mon, 28 Mar 2016)
Log Message
Use std::exchange for std::functions instead of WTFMove
https://bugs.webkit.org/show_bug.cgi?id=155950
rdar://problem/25348817
Reviewed by Anders Carlsson.
* NetworkProcess/NetworkLoad.cpp:
(WebKit::NetworkLoad::convertTaskToDownload):
(WebKit::NetworkLoad::setPendingDownloadID):
(WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
This makes the member variable nullptr when the value is moved so we don't use it again.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (198754 => 198755)
--- trunk/Source/WebKit2/ChangeLog 2016-03-28 18:52:12 UTC (rev 198754)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-28 20:32:56 UTC (rev 198755)
@@ -1,3 +1,17 @@
+2016-03-28 Alex Christensen <[email protected]>
+
+ Use std::exchange for std::functions instead of WTFMove
+ https://bugs.webkit.org/show_bug.cgi?id=155950
+ rdar://problem/25348817
+
+ Reviewed by Anders Carlsson.
+
+ * NetworkProcess/NetworkLoad.cpp:
+ (WebKit::NetworkLoad::convertTaskToDownload):
+ (WebKit::NetworkLoad::setPendingDownloadID):
+ (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):
+ This makes the member variable nullptr when the value is moved so we don't use it again.
+
2016-03-28 Brian Burg <[email protected]>
Web Automation: report the browsing context's window frame (size and origin)
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (198754 => 198755)
--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-03-28 18:52:12 UTC (rev 198754)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2016-03-28 20:32:56 UTC (rev 198755)
@@ -178,7 +178,7 @@
ASSERT(m_responseCompletionHandler);
if (m_responseCompletionHandler)
- NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), WTFMove(m_responseCompletionHandler));
+ NetworkProcess::singleton().findPendingDownloadLocation(*m_task.get(), std::exchange(m_responseCompletionHandler, nullptr));
}
void NetworkLoad::setPendingDownloadID(DownloadID downloadID)
@@ -345,7 +345,7 @@
#if USE(NETWORK_SESSION)
ASSERT_WITH_MESSAGE(!m_handle, "Blobs should never give authentication challenges");
ASSERT(m_challengeCompletionHandler);
- auto completionHandler = WTFMove(m_challengeCompletionHandler);
+ auto completionHandler = std::exchange(m_challengeCompletionHandler, nullptr);
if (!result) {
if (m_task && m_task->allowsSpecificHTTPSCertificateForHost(m_challenge))
completionHandler(AuthenticationChallengeDisposition::UseCredential, serverTrustCredential(m_challenge));
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
