Changeset 240350 in webkit

Timestamp:

Jan 23, 2019 11:18:59 AM (5 years ago)

Author:

Michael Catanzaro

Message:

Minor improvements to NetworkProcess
​https://bugs.webkit.org/show_bug.cgi?id=193708

Reviewed by Alex Christensen.

• 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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkProcess.cpp (modified) (4 diffs)
• NetworkProcess/NetworkProcess.h (modified) (1 diff)
• NetworkProcess/cocoa/NetworkProcessCocoa.mm (modified) (1 diff)
• NetworkProcess/curl/NetworkProcessCurl.cpp (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-01-23  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        Minor improvements to NetworkProcess
+        https://bugs.webkit.org/show_bug.cgi?id=193708
+
+        Reviewed by Alex Christensen.
+
+        * 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-23  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -476 +476 @@
 {
 #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()));
 
@@ -500 +500 @@
 #endif
 {
+    ASSERT(sessionID != PAL::SessionID::defaultSessionID());
+
     auto addResult = m_networkStorageSessions.add(sessionID, nullptr);
     if (!addResult.isNewEntry)
@@ -533 +535 @@
 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)
+        m_defaultNetworkStorageSession = platformCreateDefaultStorageSession();
     return *m_defaultNetworkStorageSession;
 }
@@ -568 +559 @@
 void NetworkProcess::destroySession(const PAL::SessionID& sessionID)
 {
+    ASSERT(sessionID != PAL::SessionID::defaultSessionID());
+
     if (auto session = m_networkSessions.take(sessionID))
         session->get().invalidateAndCancel();

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -290 +290 @@
 
     void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&);
+    std::unique_ptr<WebCore::NetworkStorageSession> platformCreateDefaultStorageSession() const;
 
     void terminate() override;

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

@@ -131 +131 @@
 }
 
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
+{
+    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
+}
+
 RetainPtr<CFDataRef> NetworkProcess::sourceApplicationAuditData() const
 {

trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp

@@ -38 +38 @@
 void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters&)
 {
+}
+
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
+{
+    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), CurlContext::singleton());
 }
 

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

@@ -133 +133 @@
 }
 
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
+{
+    return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), std::make_unique<SoupNetworkSession>(PAL::SessionID::defaultSessionID()));
+}
+
 void NetworkProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
 {