Changeset 240019 in webkit

Timestamp:

Jan 15, 2019 4:35:26 PM (5 years ago)

Author:

achristensen@apple.com

Message:

[SOUP] Remove usage of NetworkProcess::singleton()
​https://bugs.webkit.org/show_bug.cgi?id=193444

Patch by Claudio Saavedra <Claudio Saavedra> 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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/soup/NetworkDataTaskSoup.cpp (modified) (4 diffs)
• NetworkProcess/soup/NetworkSessionSoup.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-15  Claudio Saavedra  <csaavedra@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.carlson@apple.com>
 

trunk/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp

@@ -908 +908 @@
     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();
@@ -975 +975 @@
 {
     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);
@@ -1003 +1003 @@
 
     clearRequest();
-    auto* download = NetworkProcess::singleton().downloadManager().download(m_pendingDownloadID);
+    auto* download = m_session->networkProcess().downloadManager().download(m_pendingDownloadID);
     ASSERT(download);
     download->didFinish();
@@ -1015 +1015 @@
         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());

trunk/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp

@@ -41 +41 @@
 {
     networkStorageSession().setCookieObserverHandler([this] {
-        NetworkProcess::singleton().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
+        this->networkProcess().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
     });
 }