Attachment 359158 Details for Bug 193444 – Patch

[patch] Patch

bug-193444-20190115162031.patch (text/plain), 4.10 KB, created by Claudio Saavedra on 2019-01-15 06:20:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Claudio Saavedra

Created: 2019-01-15 06:20:32 PST

Size: 4.10 KB

patch

obsolete

>Subversion Revision: 239980
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b1580fc058b537ed1ade5f752e31766fce3bd401..85d9e056c9402d0d80c8ddfc6dff1d30c42d553e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+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 NOBODY (OOPS!).
>+
>+        * 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-14  Alex Christensen  <achristensen@webkit.org>
> 
>         Split headerValueForVary into specialized functions for NetworkProcess and WebProcess/WebKitLegacy
>diff --git a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
>index 8ea35676bf04c993213e7cdbbeff238a13eaa956..a579efa8a6c35adc1621ae5bb28c7cab09feb888 100644
>--- a/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/NetworkDataTaskSoup.cpp
>@@ -907,7 +907,7 @@ void NetworkDataTaskSoup::download()
>     }
>     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::writeDownload()
> 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 @@ void NetworkDataTaskSoup::didFinishDownload()
>     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 @@ void NetworkDataTaskSoup::didFailDownload(const ResourceError& error)
>     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());
>     }
>diff --git a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
>index a475007287562ec551d298f7a0b08bd1b3e4ec70..487221dc523cf4fdc9b7a0d187e57d4d53383569 100644
>--- a/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/NetworkSessionSoup.cpp
>@@ -40,7 +40,7 @@ NetworkSessionSoup::NetworkSessionSoup(NetworkProcess& networkProcess, NetworkSe
>     : NetworkSession(networkProcess, parameters.sessionID)
> {
>     networkStorageSession().setCookieObserverHandler([this] {
>-        NetworkProcess::singleton().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
>+        this->networkProcess().supplement<WebCookieManager>()->notifyCookiesDidChange(m_sessionID);
>     });
> }
>

Flags:

mcatanzaro: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193444: 359158