Title: [240019] trunk/Source/WebKit
- Revision
- 240019
- Author
- achristen...@apple.com
- Date
- 2019-01-15 16:35:26 -0800 (Tue, 15 Jan 2019)
Log Message
[SOUP] Remove usage of NetworkProcess::singleton()
https://bugs.webkit.org/show_bug.cgi?id=193444
Patch by Claudio Saavedra <csaave...@igalia.com> on 2019-01-15
Reviewed by Michael Catanzaro.
* NetworkProcess/soup/NetworkDataTaskSoup.cpp:
(WebKit::NetworkDataTaskSoup::download):
(WebKit::NetworkDataTaskSoup::didWriteDownload):
(WebKit::NetworkDataTaskSoup::didFinishDownload):
(WebKit::NetworkDataTaskSoup::didFailDownload):
* NetworkProcess/soup/NetworkSessionSoup.cpp:
(WebKit::NetworkSessionSoup::NetworkSessionSoup):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (240018 => 240019)
--- trunk/Source/WebKit/ChangeLog 2019-01-16 00:27:00 UTC (rev 240018)
+++ trunk/Source/WebKit/ChangeLog 2019-01-16 00:35:26 UTC (rev 240019)
@@ -1,3 +1,18 @@
+2019-01-15 Claudio Saavedra <csaave...@igalia.com>
+
+ [SOUP] Remove usage of NetworkProcess::singleton()
+ https://bugs.webkit.org/show_bug.cgi?id=193444
+
+ Reviewed by Michael Catanzaro.
+
+ * NetworkProcess/soup/NetworkDataTaskSoup.cpp:
+ (WebKit::NetworkDataTaskSoup::download):
+ (WebKit::NetworkDataTaskSoup::didWriteDownload):
+ (WebKit::NetworkDataTaskSoup::didFinishDownload):
+ (WebKit::NetworkDataTaskSoup::didFailDownload):
+ * NetworkProcess/soup/NetworkSessionSoup.cpp:
+ (WebKit::NetworkSessionSoup::NetworkSessionSoup):
+
2019-01-15 Eric Carlson <eric.carl...@apple.com>
Fix incorrect ASSERT added in r239840
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp (240018 => 240019)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2019-01-16 00:27:00 UTC (rev 240018)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp 2019-01-16 00:35:26 UTC (rev 240019)
@@ -907,7 +907,7 @@
}
m_downloadOutputStream = adoptGRef(G_OUTPUT_STREAM(outputStream.leakRef()));
- auto& downloadManager = NetworkProcess::singleton().downloadManager();
+ auto& downloadManager = m_session->networkProcess().downloadManager();
auto download = std::make_unique<Download>(downloadManager, m_pendingDownloadID, *this, m_session->sessionID(), suggestedFilename());
auto* downloadPtr = download.get();
downloadManager.dataTaskBecameDownloadTask(m_pendingDownloadID, WTFMove(download));
@@ -974,7 +974,7 @@
void NetworkDataTaskSoup::didWriteDownload(gsize bytesWritten)
{
ASSERT(bytesWritten == m_readBuffer.size());
- auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
+ auto* download = m_session->networkProcess().downloadManager().download(m_pendingDownloadID);
ASSERT(download);
download->didReceiveData(bytesWritten);
read();
@@ -1002,7 +1002,7 @@
g_file_set_attributes_async(m_downloadDestinationFile.get(), info.get(), G_FILE_QUERY_INFO_NONE, RunLoopSourcePriority::AsyncIONetwork, nullptr, nullptr, nullptr);
clearRequest();
- auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
+ auto* download = m_session->networkProcess().downloadManager().download(m_pendingDownloadID);
ASSERT(download);
download->didFinish();
}
@@ -1014,7 +1014,7 @@
if (m_client)
dispatchDidCompleteWithError(error);
else {
- auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
+ auto* download = m_session->networkProcess().downloadManager().download(m_pendingDownloadID);
ASSERT(download);
download->didFail(error, IPC::DataReference());
}
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp (240018 => 240019)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp 2019-01-16 00:27:00 UTC (rev 240018)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp 2019-01-16 00:35:26 UTC (rev 240019)
@@ -40,7 +40,7 @@
: NetworkSession(networkProcess, parameters.sessionID)
{
networkStorageSession().setCookieObserverHandler([this] {
- NetworkProcess::singleton().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
+ this->networkProcess().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
});
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
