Title: [240350] trunk/Source/WebKit
- Revision
- 240350
- Author
- [email protected]
- Date
- 2019-01-23 11:18:59 -0800 (Wed, 23 Jan 2019)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (240349 => 240350)
--- trunk/Source/WebKit/ChangeLog 2019-01-23 19:14:55 UTC (rev 240349)
+++ trunk/Source/WebKit/ChangeLog 2019-01-23 19:18:59 UTC (rev 240350)
@@ -1,3 +1,23 @@
+2019-01-23 Michael Catanzaro <[email protected]>
+
+ 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 <[email protected]>
Fix the Apple Internal build. See <rdar://problem/47486758>.
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (240349 => 240350)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-23 19:14:55 UTC (rev 240349)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2019-01-23 19:18:59 UTC (rev 240350)
@@ -475,7 +475,7 @@
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& identifierBase)
#endif
{
+ ASSERT(sessionID != PAL::SessionID::defaultSessionID());
+
auto addResult = m_networkStorageSessions.add(sessionID, nullptr);
if (!addResult.isNewEntry)
return;
@@ -532,19 +534,8 @@
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;
}
@@ -567,6 +558,8 @@
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);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (240349 => 240350)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-23 19:14:55 UTC (rev 240349)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-01-23 19:18:59 UTC (rev 240350)
@@ -289,6 +289,7 @@
NetworkProcess();
void platformInitializeNetworkProcess(const NetworkProcessCreationParameters&);
+ std::unique_ptr<WebCore::NetworkStorageSession> platformCreateDefaultStorageSession() const;
void terminate() override;
void platformTerminate();
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (240349 => 240350)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-01-23 19:14:55 UTC (rev 240349)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-01-23 19:18:59 UTC (rev 240350)
@@ -130,6 +130,11 @@
[NSURLCache setSharedURLCache:urlCache.get()];
}
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
+{
+ return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID());
+}
+
RetainPtr<CFDataRef> NetworkProcess::sourceApplicationAuditData() const
{
#if USE(SOURCE_APPLICATION_AUDIT_DATA)
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp (240349 => 240350)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2019-01-23 19:14:55 UTC (rev 240349)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkProcessCurl.cpp 2019-01-23 19:18:59 UTC (rev 240350)
@@ -39,6 +39,11 @@
{
}
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::platformCreateDefaultStorageSession() const
+{
+ return std::make_unique<WebCore::NetworkStorageSession>(PAL::SessionID::defaultSessionID(), CurlContext::singleton());
+}
+
void NetworkProcess::allowSpecificHTTPSCertificateForHost(const CertificateInfo& certificateInfo, const String& host)
{
notImplemented();
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (240349 => 240350)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2019-01-23 19:14:55 UTC (rev 240349)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2019-01-23 19:18:59 UTC (rev 240350)
@@ -132,6 +132,11 @@
setIgnoreTLSErrors(parameters.ignoreTLSErrors);
}
+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)
{
SoupNetworkSession::setShouldIgnoreTLSErrors(ignoreTLSErrors);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
