Diff
Modified: trunk/Source/WebKit/ChangeLog (284055 => 284056)
--- trunk/Source/WebKit/ChangeLog 2021-10-12 23:16:41 UTC (rev 284055)
+++ trunk/Source/WebKit/ChangeLog 2021-10-12 23:30:38 UTC (rev 284056)
@@ -1,3 +1,18 @@
+2021-10-12 Chris Dumez <[email protected]>
+
+ Stop passing RegistrableDomain by value in NetworkSessionCocoa
+ https://bugs.webkit.org/show_bug.cgi?id=231633
+
+ Reviewed by Alex Christensen.
+
+ * NetworkProcess/NetworkSession.h:
+ (WebKit::NetworkSession::hasIsolatedSession const):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::isolatedSession):
+ (WebKit::SessionSet::isolatedSession):
+ (WebKit::NetworkSessionCocoa::hasIsolatedSession const):
+
2021-10-12 Alex Christensen <[email protected]>
Rename AdAttributionDaemon to adattributiond
Modified: trunk/Source/WebKit/NetworkProcess/NetworkSession.h (284055 => 284056)
--- trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2021-10-12 23:16:41 UTC (rev 284055)
+++ trunk/Source/WebKit/NetworkProcess/NetworkSession.h 2021-10-12 23:30:38 UTC (rev 284056)
@@ -108,7 +108,7 @@
void logDiagnosticMessageWithValue(const String& message, const String& description, unsigned value, unsigned significantFigures, WebCore::ShouldSample);
bool enableResourceLoadStatisticsLogTestingEvent() const { return m_enableResourceLoadStatisticsLogTestingEvent; }
void setResourceLoadStatisticsLogTestingEvent(bool log) { m_enableResourceLoadStatisticsLogTestingEvent = log; }
- virtual bool hasIsolatedSession(const WebCore::RegistrableDomain) const { return false; }
+ virtual bool hasIsolatedSession(const WebCore::RegistrableDomain&) const { return false; }
virtual void clearIsolatedSessions() { }
void setShouldDowngradeReferrerForTesting(bool);
bool shouldDowngradeReferrer() const;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h (284055 => 284056)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2021-10-12 23:16:41 UTC (rev 284055)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2021-10-12 23:30:38 UTC (rev 284056)
@@ -79,7 +79,7 @@
return adoptRef(*new SessionSet);
}
- SessionWrapper& isolatedSession(WebCore::StoredCredentialsPolicy, const WebCore::RegistrableDomain, NavigatingToAppBoundDomain, NetworkSessionCocoa&);
+ SessionWrapper& isolatedSession(WebCore::StoredCredentialsPolicy, const WebCore::RegistrableDomain&, NavigatingToAppBoundDomain, NetworkSessionCocoa&);
SessionWrapper& initializeEphemeralStatelessSessionIfNeeded(NavigatingToAppBoundDomain, NetworkSessionCocoa&);
HashMap<WebCore::RegistrableDomain, std::unique_ptr<IsolatedSession>> isolatedSessions;
@@ -123,7 +123,7 @@
CFDictionaryRef proxyConfiguration() const { return m_proxyConfiguration.get(); }
- bool hasIsolatedSession(const WebCore::RegistrableDomain) const override;
+ bool hasIsolatedSession(const WebCore::RegistrableDomain&) const override;
void clearIsolatedSessions() override;
#if ENABLE(APP_BOUND_DOMAINS)
@@ -142,7 +142,7 @@
void invalidateAndCancel() override;
void clearCredentials() override;
bool shouldLogCookieInformation() const override { return m_shouldLogCookieInformation; }
- SessionWrapper& isolatedSession(WebPageProxyIdentifier, WebCore::StoredCredentialsPolicy, const WebCore::RegistrableDomain, NavigatingToAppBoundDomain);
+ SessionWrapper& isolatedSession(WebPageProxyIdentifier, WebCore::StoredCredentialsPolicy, const WebCore::RegistrableDomain&, NavigatingToAppBoundDomain);
#if ENABLE(APP_BOUND_DOMAINS)
SessionWrapper& appBoundSession(WebPageProxyIdentifier, WebCore::StoredCredentialsPolicy);
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (284055 => 284056)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-10-12 23:16:41 UTC (rev 284055)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-10-12 23:30:38 UTC (rev 284056)
@@ -1462,12 +1462,12 @@
}
#endif
-SessionWrapper& NetworkSessionCocoa::isolatedSession(WebPageProxyIdentifier webPageProxyID, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, const WebCore::RegistrableDomain firstPartyDomain, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain)
+SessionWrapper& NetworkSessionCocoa::isolatedSession(WebPageProxyIdentifier webPageProxyID, WebCore::StoredCredentialsPolicy storedCredentialsPolicy, const WebCore::RegistrableDomain& firstPartyDomain, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain)
{
return sessionSetForPage(webPageProxyID).isolatedSession(storedCredentialsPolicy, firstPartyDomain, isNavigatingToAppBoundDomain, *this);
}
-SessionWrapper& SessionSet::isolatedSession(WebCore::StoredCredentialsPolicy storedCredentialsPolicy, const WebCore::RegistrableDomain firstPartyDomain, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain, NetworkSessionCocoa& session)
+SessionWrapper& SessionSet::isolatedSession(WebCore::StoredCredentialsPolicy storedCredentialsPolicy, const WebCore::RegistrableDomain& firstPartyDomain, NavigatingToAppBoundDomain isNavigatingToAppBoundDomain, NetworkSessionCocoa& session)
{
auto addResult = isolatedSessions.ensure(firstPartyDomain, [this, &session, isNavigatingToAppBoundDomain] {
auto newEntry = makeUnique<IsolatedSession>();
@@ -1502,7 +1502,7 @@
return sessionWrapper;
}
-bool NetworkSessionCocoa::hasIsolatedSession(const WebCore::RegistrableDomain domain) const
+bool NetworkSessionCocoa::hasIsolatedSession(const WebCore::RegistrableDomain& domain) const
{
if (m_defaultSessionSet->isolatedSessions.contains(domain))
return true;
