Title: [208880] trunk/Source/WebKit2
- Revision
- 208880
- Author
- achristen...@apple.com
- Date
- 2016-11-17 23:21:37 -0800 (Thu, 17 Nov 2016)
Log Message
REGRESSION: API test _WKDownload.ConvertResponseToDownload is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=164631
Reviewed by Carlos Garcia Campos.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::convertToDownload):
I could reproduce the flaky failure 100% of the time when not using NETWORK_SESSION
by adding a usleep(1000000) in NetworkResourceLoader::convertToDownload. m_networkLoad
was not being set to nullptr before it was being checked in NetworkResourceLoader::abort
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (208879 => 208880)
--- trunk/Source/WebKit2/ChangeLog 2016-11-18 06:28:05 UTC (rev 208879)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-18 07:21:37 UTC (rev 208880)
@@ -1,5 +1,18 @@
2016-11-17 Alex Christensen <achristen...@webkit.org>
+ REGRESSION: API test _WKDownload.ConvertResponseToDownload is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=164631
+
+ Reviewed by Carlos Garcia Campos.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::convertToDownload):
+ I could reproduce the flaky failure 100% of the time when not using NETWORK_SESSION
+ by adding a usleep(1000000) in NetworkResourceLoader::convertToDownload. m_networkLoad
+ was not being set to nullptr before it was being checked in NetworkResourceLoader::abort
+
+2016-11-17 Alex Christensen <achristen...@webkit.org>
+
Fix CMake build after r208865
https://bugs.webkit.org/show_bug.cgi?id=164894
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (208879 => 208880)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-18 06:28:05 UTC (rev 208879)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-11-18 07:21:37 UTC (rev 208880)
@@ -283,7 +283,7 @@
void NetworkResourceLoader::convertToDownload(DownloadID downloadID, const ResourceRequest& request, const ResourceResponse& response)
{
ASSERT(m_networkLoad);
- NetworkProcess::singleton().downloadManager().convertNetworkLoadToDownload(downloadID, WTFMove(m_networkLoad), WTFMove(m_fileReferences), request, response);
+ NetworkProcess::singleton().downloadManager().convertNetworkLoadToDownload(downloadID, std::exchange(m_networkLoad, nullptr), WTFMove(m_fileReferences), request, response);
}
void NetworkResourceLoader::abort()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
