Attachment 359851 Details for Bug 193708 – Patch

[patch] Patch

bug-193708-20190122234127.patch (text/plain), 7.21 KB, created by Michael Catanzaro on 2019-01-22 21:41:28 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-01-22 21:41:28 PST

Size: 7.21 KB

patch

obsolete

>Subversion Revision: 240317
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index ad3bd102453dfda6b6c59b2e4e2ab76c16b4aff2..d0aab6d801a6238373a3d1cec8b759cbb60900b1 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-01-22  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        Minor improvements to NetworkProcess
>+        https://bugs.webkit.org/show_bug.cgi?id=193708
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::switchToNewTestingSession): Fix a spelling error.
>+        (WebKit::NetworkProcess::ensureSession): Add useful assertion.
>+        (WebKit::NetworkProcess::defaultStorageSession const): Split into platform functions.
>+        (WebKit::NetworkProcess::destroySession): Add useful assertion.
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
>+        (WebKit::NetworkProcess::platformCreateDefaultStorageSession const):
>+        * NetworkProcess/curl/NetworkProcessCurl.cpp:
>+        (WebKit::NetworkProcess::platformCreateDefaultStorageSession const):
>+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
>+        (WebKit::NetworkProcess::platformCreateDefaultStorageSession const):
>+
> 2019-01-22  Michael Catanzaro  <mcatanzaro@igalia.com>
> 
>         Unreviewed attempt to fix GTK/WPE bots
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.cpp b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>index 607201129bff0726d5e45a53bc6fc131afbfcd42..dc411c6089b479f661d09df3c1c21283c0663ae3 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.cpp
>@@ -475,7 +475,7 @@ void NetworkProcess::addWebsiteDataStore(WebsiteDataStoreParameters&& parameters
> void NetworkProcess::switchToNewTestingSession()
> {
> #if PLATFORM(COCOA)
>-    // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>).
>+    // Session name should be short enough for shared memory region name to be under the limit, otherwise sandbox rules won't work (see <rdar://problem/13642852>).
>     String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getCurrentProcessID()));
> 
>     auto session = adoptCF(WebCore::createPrivateStorageSession(sessionName.createCFString().get()));
>@@ -499,6 +499,8 @@ void NetworkProcess::ensureSession(const PAL::SessionID& sessionID, const String
> void NetworkProcess::ensureSession(const PAL::SessionID& sessionID, const String& identifierBase)
> #endif
> {
>+    ASSERT(sessionID != PAL::SessionID::defaultSessionID());
>+
>     auto addResult = m_networkStorageSessions.add(sessionID, nullptr);
>     if (!addResult.isNewEntry)
>         return;
>@@ -532,19 +534,10 @@ WebCore::NetworkStorageSession* NetworkProcess::storageSession(const PAL::Sessio
> 
> WebCore::NetworkStorageSession& NetworkProcess::defaultStorageSession() const
> {
>-    if (m_defaultNetworkStorageSession)
>-      return *m_defaultNetworkStorageSession;
>-
>-#if PLATFORM(COCOA)
>-    m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
>-#elif USE(SOUP)
>-    m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), std::make_unique<SoupNetworkSession>(PAL::SessionID::defaultSessionID()));
>-#elif USE(CURL)
>-    m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), CurlContext::singleton());
>-#else
>-#error Implement me
>-#endif
>-
>+    if (!m_defaultNetworkStorageSession) {
>+        platformCreateDefaultStorageSession();
>+        ASSERT(m_defaultNetworkStorageSession);
>+    }
>     return *m_defaultNetworkStorageSession;
> }
> 
>@@ -567,6 +560,8 @@ void NetworkProcess::setSession(const PAL::SessionID& sessionID, Ref<NetworkSess
> 
> void NetworkProcess::destroySession(const PAL::SessionID& sessionID)
> {
>+    ASSERT(sessionID != PAL::SessionID::defaultSessionID());
>+
>     if (auto session = m_networkSessions.take(sessionID))
>         session->get().invalidateAndCancel();
>     m_networkStorageSessions.remove(sessionID);
>diff --git a/Source/WebKit/NetworkProcess/NetworkProcess.h b/Source/WebKit/NetworkProcess/NetworkProcess.h
>index afbebbde179e9c32e08f9bbd004a7de691f9a585..d5158b5fe5d2fdeb28538ed157c019a55325bda9 100644
>--- a/Source/WebKit/NetworkProcess/NetworkProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkProcess.h
>@@ -289,6 +289,7 @@ private:
>     NetworkProcess();
> 
>     void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&);
>+    void platformCreateDefaultStorageSession() const;
> 
>     void terminate() override;
>     void platformTerminate();
>diff --git a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>index 839b4a505e55e983e007c2a80b52f18cdf314eda..92d3fb9385f9652144fcdaee5d64576753304a34 100644
>--- a/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>+++ b/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>@@ -130,6 +130,11 @@ void NetworkProcess::platformInitializeNetworkProcessCocoa(const NetworkProcessC
>     [NSURLCache setSharedURLCache:urlCache.get()];
> }
> 
>+void NetworkProcess::platformCreateDefaultStorageSession() const
>+{
>+    m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
>+}
>+
> RetainPtr<CFDataRef> NetworkProcess::sourceApplicationAuditData() const
> {
> #if USE(SOURCE_APPLICATION_AUDIT_DATA)
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>index ab00a8c34b44a7f0c5ba248da63895114c035570..db1e43e5fe388cd9641c50d3b937d9e8529cf9f5 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp
>@@ -39,6 +39,11 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati
> {
> }
> 
>+void NetworkProcess::platformCreateDefaultStorageSession() const
>+{
>+    m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), CurlContext::singleton());
>+}
>+
> void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
> {
>     notImplemented();
>diff --git a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>index c7ce1d27a001bfedded26224e8737acb409cb9bc..bf9bd580c8e73e3e26d6a2b5ecf90f671209fb89 100644
>--- a/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>+++ b/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp
>@@ -133,6 +133,11 @@ void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreati
>     setIgnoreTLSErrors(parameters.ignoreTLSErrors);
> }
> 
>+void NetworkProcess::platformCreateDefaultStorageSession() const
>+{
>+    m_defaultNetworkStorageSession = std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), std::make_unique<SoupNetworkSession>(PAL::SessionID::defaultSessionID()));
>+}
>+
> void NetworkProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
> {
>     SoupNetworkSession::setShouldIgnoreTLSErrors(ignoreTLSErrors);

Flags:

achristensen: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193708: 359851