Diff
Modified: trunk/Source/WebCore/ChangeLog (278848 => 278849)
--- trunk/Source/WebCore/ChangeLog 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/ChangeLog 2021-06-14 21:36:12 UTC (rev 278849)
@@ -1,3 +1,66 @@
+2021-06-14 Alex Christensen <achristen...@webkit.org>
+
+ Pass PAL::SessionID by value instead of reference
+ https://bugs.webkit.org/show_bug.cgi?id=226983
+
+ Reviewed by Geoffrey Garen.
+
+ It's a wrapper around an integer which will pass in a register.
+ There's no reason to pass a pointer to it.
+
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::validatePreflightResponse):
+ * loader/CrossOriginAccessControl.h:
+ * loader/CrossOriginPreflightResultCache.cpp:
+ (WebCore::CrossOriginPreflightResultCache::appendEntry):
+ (WebCore::CrossOriginPreflightResultCache::canSkipPreflight):
+ * loader/CrossOriginPreflightResultCache.h:
+ * loader/EmptyClients.cpp:
+ * loader/cache/CachedApplicationManifest.cpp:
+ (WebCore::CachedApplicationManifest::CachedApplicationManifest):
+ * loader/cache/CachedApplicationManifest.h:
+ * loader/cache/CachedCSSStyleSheet.cpp:
+ (WebCore::CachedCSSStyleSheet::CachedCSSStyleSheet):
+ * loader/cache/CachedCSSStyleSheet.h:
+ * loader/cache/CachedFont.cpp:
+ (WebCore::CachedFont::CachedFont):
+ * loader/cache/CachedFont.h:
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::CachedImage):
+ * loader/cache/CachedImage.h:
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::CachedRawResource):
+ * loader/cache/CachedRawResource.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::CachedResource):
+ * loader/cache/CachedResource.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::createResource):
+ (WebCore::CachedResourceLoader::updateCachedResourceWithCurrentRequest):
+ * loader/cache/CachedResourceLoader.h:
+ * loader/cache/CachedSVGDocument.cpp:
+ (WebCore::CachedSVGDocument::CachedSVGDocument):
+ * loader/cache/CachedSVGDocument.h:
+ * loader/cache/CachedSVGFont.cpp:
+ (WebCore::CachedSVGFont::CachedSVGFont):
+ * loader/cache/CachedSVGFont.h:
+ * loader/cache/CachedScript.cpp:
+ (WebCore::CachedScript::CachedScript):
+ * loader/cache/CachedScript.h:
+ * loader/cache/CachedTextTrack.cpp:
+ (WebCore::CachedTextTrack::CachedTextTrack):
+ * loader/cache/CachedTextTrack.h:
+ * loader/cache/CachedXSLStyleSheet.cpp:
+ (WebCore::CachedXSLStyleSheet::CachedXSLStyleSheet):
+ * loader/cache/CachedXSLStyleSheet.h:
+ * page/DatabaseProvider.h:
+ * platform/WebCoreCrossThreadCopier.cpp:
+ (WTF::PAL::SessionID>::copy):
+ * platform/WebCoreCrossThreadCopier.h:
+ * storage/StorageNamespaceProvider.cpp:
+ (WebCore::StorageNamespaceProvider::setSessionIDForTesting):
+ * storage/StorageNamespaceProvider.h:
+
2021-06-14 Patrick Angle <pan...@apple.com>
Web Inspector: CSS variables not handled as case sensitive
Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -257,7 +257,7 @@
return { };
}
-Expected<void, String> validatePreflightResponse(const PAL::SessionID& sessionID, const ResourceRequest& request, const ResourceResponse& response, StoredCredentialsPolicy storedCredentialsPolicy, const SecurityOrigin& securityOrigin, const CrossOriginAccessControlCheckDisabler* checkDisabler)
+Expected<void, String> validatePreflightResponse(PAL::SessionID sessionID, const ResourceRequest& request, const ResourceResponse& response, StoredCredentialsPolicy storedCredentialsPolicy, const SecurityOrigin& securityOrigin, const CrossOriginAccessControlCheckDisabler* checkDisabler)
{
if (!response.isSuccessful())
return makeUnexpected("Preflight response is not successful"_s);
Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.h (278848 => 278849)
--- trunk/Source/WebCore/loader/CrossOriginAccessControl.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -82,7 +82,7 @@
};
WEBCORE_EXPORT Expected<void, String> passesAccessControlCheck(const ResourceResponse&, StoredCredentialsPolicy, const SecurityOrigin&, const CrossOriginAccessControlCheckDisabler*);
-WEBCORE_EXPORT Expected<void, String> validatePreflightResponse(const PAL::SessionID&, const ResourceRequest&, const ResourceResponse&, StoredCredentialsPolicy, const SecurityOrigin&, const CrossOriginAccessControlCheckDisabler*);
+WEBCORE_EXPORT Expected<void, String> validatePreflightResponse(PAL::SessionID, const ResourceRequest&, const ResourceResponse&, StoredCredentialsPolicy, const SecurityOrigin&, const CrossOriginAccessControlCheckDisabler*);
WEBCORE_EXPORT std::optional<ResourceError> validateCrossOriginResourcePolicy(const SecurityOrigin&, const URL&, const ResourceResponse&);
std::optional<ResourceError> validateRangeRequestedFlag(const ResourceRequest&, const ResourceResponse&);
Modified: trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -121,13 +121,13 @@
return cache;
}
-void CrossOriginPreflightResultCache::appendEntry(const PAL::SessionID& sessionID, const String& origin, const URL& url, std::unique_ptr<CrossOriginPreflightResultCacheItem> preflightResult)
+void CrossOriginPreflightResultCache::appendEntry(PAL::SessionID sessionID, const String& origin, const URL& url, std::unique_ptr<CrossOriginPreflightResultCacheItem> preflightResult)
{
ASSERT(isMainThread());
m_preflightHashMap.set(std::make_tuple(sessionID, origin, url), WTFMove(preflightResult));
}
-bool CrossOriginPreflightResultCache::canSkipPreflight(const PAL::SessionID& sessionID, const String& origin, const URL& url, StoredCredentialsPolicy storedCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders)
+bool CrossOriginPreflightResultCache::canSkipPreflight(PAL::SessionID sessionID, const String& origin, const URL& url, StoredCredentialsPolicy storedCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders)
{
ASSERT(isMainThread());
auto it = m_preflightHashMap.find(std::make_tuple(sessionID, origin, url));
Modified: trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h (278848 => 278849)
--- trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -67,8 +67,8 @@
WTF_MAKE_NONCOPYABLE(CrossOriginPreflightResultCache); WTF_MAKE_FAST_ALLOCATED;
public:
WEBCORE_EXPORT static CrossOriginPreflightResultCache& singleton();
- WEBCORE_EXPORT void appendEntry(const PAL::SessionID&, const String& origin, const URL&, std::unique_ptr<CrossOriginPreflightResultCacheItem>);
- WEBCORE_EXPORT bool canSkipPreflight(const PAL::SessionID&, const String& origin, const URL&, StoredCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders);
+ WEBCORE_EXPORT void appendEntry(PAL::SessionID, const String& origin, const URL&, std::unique_ptr<CrossOriginPreflightResultCacheItem>);
+ WEBCORE_EXPORT bool canSkipPreflight(PAL::SessionID, const String& origin, const URL&, StoredCredentialsPolicy, const String& method, const HTTPHeaderMap& requestHeaders);
WEBCORE_EXPORT void clear();
private:
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -202,7 +202,7 @@
~EmptyIDBConnectionToServerDeletegate() { }
};
- IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const PAL::SessionID&) final
+ IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(PAL::SessionID) final
{
static NeverDestroyed<EmptyIDBConnectionToServerDeletegate> emptyDelegate;
static auto& emptyConnection = IDBClient::IDBConnectionToServer::create(emptyDelegate.get()).leakRef();
Modified: trunk/Source/WebCore/loader/cache/CachedApplicationManifest.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedApplicationManifest.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedApplicationManifest.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -34,7 +34,7 @@
namespace WebCore {
-CachedApplicationManifest::CachedApplicationManifest(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedApplicationManifest::CachedApplicationManifest(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), Type::ApplicationManifest, sessionID, cookieJar)
, m_decoder(TextResourceDecoder::create("application/manifest+json", UTF8Encoding()))
{
Modified: trunk/Source/WebCore/loader/cache/CachedApplicationManifest.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedApplicationManifest.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedApplicationManifest.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -37,7 +37,7 @@
class CachedApplicationManifest final : public CachedResource {
public:
- CachedApplicationManifest(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*);
+ CachedApplicationManifest(CachedResourceRequest&&, PAL::SessionID, const CookieJar*);
std::optional<struct ApplicationManifest> process(const URL& manifestURL, const URL& documentURL, Document* = nullptr);
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -38,7 +38,7 @@
namespace WebCore {
-CachedCSSStyleSheet::CachedCSSStyleSheet(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedCSSStyleSheet::CachedCSSStyleSheet(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), Type::CSSStyleSheet, sessionID, cookieJar)
, m_decoder(TextResourceDecoder::create("text/css", request.charset()))
{
Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -34,7 +34,7 @@
class CachedCSSStyleSheet final : public CachedResource {
public:
- CachedCSSStyleSheet(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*);
+ CachedCSSStyleSheet(CachedResourceRequest&&, PAL::SessionID, const CookieJar*);
virtual ~CachedCSSStyleSheet();
enum class MIMETypeCheckHint { Strict, Lax };
Modified: trunk/Source/WebCore/loader/cache/CachedFont.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedFont.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedFont.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -41,7 +41,7 @@
namespace WebCore {
-CachedFont::CachedFont(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar, Type type)
+CachedFont::CachedFont(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar, Type type)
: CachedResource(WTFMove(request), type, sessionID, cookieJar)
, m_loadInitiated(false)
, m_hasCreatedFontDataWrappingResource(false)
Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedFont.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -29,6 +29,7 @@
#include "CachedResourceClient.h"
#include "Font.h"
#include "TextFlags.h"
+#include <pal/SessionID.h>
namespace WebCore {
@@ -45,7 +46,7 @@
class CachedFont : public CachedResource {
public:
- CachedFont(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*, Type = Type::FontResource);
+ CachedFont(CachedResourceRequest&&, PAL::SessionID, const CookieJar*, Type = Type::FontResource);
virtual ~CachedFont();
void beginLoadIfNeeded(CachedResourceLoader&);
Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -55,7 +55,7 @@
namespace WebCore {
-CachedImage::CachedImage(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedImage::CachedImage(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), Type::ImageResource, sessionID, cookieJar)
, m_updateImageDataCount(0)
, m_isManuallyCached(false)
@@ -65,7 +65,7 @@
setStatus(Unknown);
}
-CachedImage::CachedImage(Image* image, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedImage::CachedImage(Image* image, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(URL(), Type::ImageResource, sessionID, cookieJar)
, m_image(image)
, m_updateImageDataCount(0)
@@ -75,7 +75,7 @@
{
}
-CachedImage::CachedImage(const URL& url, Image* image, const PAL::SessionID& sessionID, const CookieJar* cookieJar, const String& domainForCachePartition)
+CachedImage::CachedImage(const URL& url, Image* image, PAL::SessionID sessionID, const CookieJar* cookieJar, const String& domainForCachePartition)
: CachedResource(url, Type::ImageResource, sessionID, cookieJar)
, m_image(image)
, m_updateImageDataCount(0)
Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedImage.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -47,10 +47,10 @@
friend class MemoryCache;
public:
- CachedImage(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*);
- CachedImage(Image*, const PAL::SessionID&, const CookieJar*);
+ CachedImage(CachedResourceRequest&&, PAL::SessionID, const CookieJar*);
+ CachedImage(Image*, PAL::SessionID, const CookieJar*);
// Constructor to use for manually cached images.
- CachedImage(const URL&, Image*, const PAL::SessionID&, const CookieJar*, const String& domainForCachePartition);
+ CachedImage(const URL&, Image*, PAL::SessionID, const CookieJar*, const String& domainForCachePartition);
virtual ~CachedImage();
WEBCORE_EXPORT Image* image(); // Returns the nullImage() if the image is not available yet.
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -41,7 +41,7 @@
namespace WebCore {
-CachedRawResource::CachedRawResource(CachedResourceRequest&& request, Type type, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedRawResource::CachedRawResource(CachedResourceRequest&& request, Type type, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), type, sessionID, cookieJar)
, m_identifier(0)
, m_allowEncodedDataReplacement(true)
Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedRawResource.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -32,7 +32,7 @@
class CachedRawResource final : public CachedResource {
public:
- CachedRawResource(CachedResourceRequest&&, Type, const PAL::SessionID&, const CookieJar*);
+ CachedRawResource(CachedResourceRequest&&, Type, PAL::SessionID, const CookieJar*);
void setDefersLoading(bool);
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -83,7 +83,7 @@
DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, cachedResourceLeakCounter, ("CachedResource"));
-CachedResource::CachedResource(CachedResourceRequest&& request, Type type, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedResource::CachedResource(CachedResourceRequest&& request, Type type, PAL::SessionID sessionID, const CookieJar* cookieJar)
: m_options(request.options())
, m_resourceRequest(request.releaseResourceRequest())
, m_decodedDataDeletionTimer(*this, &CachedResource::destroyDecodedData, deadDecodedDataDeletionIntervalForResourceType(type))
@@ -121,7 +121,7 @@
}
// FIXME: For this constructor, we should probably mandate that the URL has no fragment identifier.
-CachedResource::CachedResource(const URL& url, Type type, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedResource::CachedResource(const URL& url, Type type, PAL::SessionID sessionID, const CookieJar* cookieJar)
: m_resourceRequest(url)
, m_decodedDataDeletionTimer(*this, &CachedResource::destroyDecodedData, deadDecodedDataDeletionIntervalForResourceType(type))
, m_sessionID(sessionID)
Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedResource.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -103,7 +103,7 @@
static constexpr unsigned bitWidthOfStatus = 3;
static_assert(static_cast<unsigned>(DecodeError) <= ((1ULL << bitWidthOfStatus) - 1));
- CachedResource(CachedResourceRequest&&, Type, const PAL::SessionID&, const CookieJar*);
+ CachedResource(CachedResourceRequest&&, Type, PAL::SessionID, const CookieJar*);
virtual ~CachedResource();
virtual void load(CachedResourceLoader&);
@@ -296,7 +296,7 @@
protected:
// CachedResource constructor that may be used when the CachedResource can already be filled with response data.
- CachedResource(const URL&, Type, const PAL::SessionID&, const CookieJar*);
+ CachedResource(const URL&, Type, PAL::SessionID, const CookieJar*);
void setEncodedSize(unsigned);
void setDecodedSize(unsigned);
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -113,7 +113,7 @@
return makeUnexpected(cachedResource.error());
}
-static CachedResourceHandle<CachedResource> createResource(CachedResource::Type type, CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar, const Settings& settings)
+static CachedResourceHandle<CachedResource> createResource(CachedResource::Type type, CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar, const Settings& settings)
{
switch (type) {
case CachedResource::Type::ImageResource:
@@ -744,7 +744,7 @@
return true;
}
-CachedResourceHandle<CachedResource> CachedResourceLoader::updateCachedResourceWithCurrentRequest(const CachedResource& resource, CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar& cookieJar, const Settings& settings)
+CachedResourceHandle<CachedResource> CachedResourceLoader::updateCachedResourceWithCurrentRequest(const CachedResource& resource, CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar& cookieJar, const Settings& settings)
{
if (!isResourceSuitableForDirectReuse(resource, request)) {
request.setCachingPolicy(CachingPolicy::DisallowCaching);
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -186,7 +186,7 @@
RevalidationPolicy determineRevalidationPolicy(CachedResource::Type, CachedResourceRequest&, CachedResource* existingResource, ForPreload, ImageLoading) const;
bool shouldUpdateCachedResourceWithCurrentRequest(const CachedResource&, const CachedResourceRequest&);
- CachedResourceHandle<CachedResource> updateCachedResourceWithCurrentRequest(const CachedResource&, CachedResourceRequest&&, const PAL::SessionID&, const CookieJar&, const Settings&);
+ CachedResourceHandle<CachedResource> updateCachedResourceWithCurrentRequest(const CachedResource&, CachedResourceRequest&&, PAL::SessionID, const CookieJar&, const Settings&);
bool shouldContinueAfterNotifyingLoadedFromMemoryCache(const CachedResourceRequest&, CachedResource&, ResourceError&);
bool checkInsecureContent(CachedResource::Type, const URL&) const;
Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -28,7 +28,7 @@
namespace WebCore {
-CachedSVGDocument::CachedSVGDocument(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar, const Settings& settings)
+CachedSVGDocument::CachedSVGDocument(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar, const Settings& settings)
: CachedResource(WTFMove(request), Type::SVGDocumentResource, sessionID, cookieJar)
, m_decoder(TextResourceDecoder::create("application/xml"))
, m_settings(settings)
Modified: trunk/Source/WebCore/loader/cache/CachedSVGDocument.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedSVGDocument.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -32,7 +32,7 @@
class CachedSVGDocument final : public CachedResource {
public:
- explicit CachedSVGDocument(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*, const Settings&);
+ explicit CachedSVGDocument(CachedResourceRequest&&, PAL::SessionID, const CookieJar*, const Settings&);
explicit CachedSVGDocument(CachedResourceRequest&&, CachedSVGDocument&);
virtual ~CachedSVGDocument();
Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -41,7 +41,7 @@
namespace WebCore {
-CachedSVGFont::CachedSVGFont(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar, const Settings& settings)
+CachedSVGFont::CachedSVGFont(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar, const Settings& settings)
: CachedFont(WTFMove(request), sessionID, cookieJar, Type::SVGFontResource)
, m_externalSVGFontElement(nullptr)
, m_settings(settings)
Modified: trunk/Source/WebCore/loader/cache/CachedSVGFont.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedSVGFont.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedSVGFont.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -34,7 +34,7 @@
class CachedSVGFont final : public CachedFont {
public:
- CachedSVGFont(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*, const Settings&);
+ CachedSVGFont(CachedResourceRequest&&, PAL::SessionID, const CookieJar*, const Settings&);
CachedSVGFont(CachedResourceRequest&&, CachedSVGFont&);
bool ensureCustomFontData(const AtomString& remoteURI) override;
Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -36,7 +36,7 @@
namespace WebCore {
-CachedScript::CachedScript(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedScript::CachedScript(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), Type::Script, sessionID, cookieJar)
, m_decoder(TextResourceDecoder::create("text/_javascript_"_s, request.charset()))
{
Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedScript.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -33,7 +33,7 @@
class CachedScript final : public CachedResource {
public:
- CachedScript(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*);
+ CachedScript(CachedResourceRequest&&, PAL::SessionID, const CookieJar*);
virtual ~CachedScript();
StringView script();
Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -35,7 +35,7 @@
namespace WebCore {
-CachedTextTrack::CachedTextTrack(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedTextTrack::CachedTextTrack(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), Type::TextTrackResource, sessionID, cookieJar)
{
}
Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -31,7 +31,7 @@
class CachedTextTrack final : public CachedResource {
public:
- CachedTextTrack(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*);
+ CachedTextTrack(CachedResourceRequest&&, PAL::SessionID, const CookieJar*);
private:
bool mayTryReplaceEncodedData() const override { return true; }
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -36,7 +36,7 @@
#if ENABLE(XSLT)
-CachedXSLStyleSheet::CachedXSLStyleSheet(CachedResourceRequest&& request, const PAL::SessionID& sessionID, const CookieJar* cookieJar)
+CachedXSLStyleSheet::CachedXSLStyleSheet(CachedResourceRequest&& request, PAL::SessionID sessionID, const CookieJar* cookieJar)
: CachedResource(WTFMove(request), Type::XSLStyleSheet, sessionID, cookieJar)
, m_decoder(TextResourceDecoder::create("text/xsl"))
{
Modified: trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h (278848 => 278849)
--- trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/loader/cache/CachedXSLStyleSheet.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -35,7 +35,7 @@
class CachedXSLStyleSheet final : public CachedResource {
public:
- CachedXSLStyleSheet(CachedResourceRequest&&, const PAL::SessionID&, const CookieJar*);
+ CachedXSLStyleSheet(CachedResourceRequest&&, PAL::SessionID, const CookieJar*);
virtual ~CachedXSLStyleSheet();
const String& sheet() const { return m_sheet; }
Modified: trunk/Source/WebCore/page/DatabaseProvider.h (278848 => 278849)
--- trunk/Source/WebCore/page/DatabaseProvider.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/page/DatabaseProvider.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -40,7 +40,7 @@
class WEBCORE_EXPORT DatabaseProvider : public RefCounted<DatabaseProvider> {
public:
virtual ~DatabaseProvider();
- virtual IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const PAL::SessionID&) = 0;
+ virtual IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(PAL::SessionID) = 0;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/WebCoreCrossThreadCopier.cpp (278848 => 278849)
--- trunk/Source/WebCore/platform/WebCoreCrossThreadCopier.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/platform/WebCoreCrossThreadCopier.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -36,7 +36,7 @@
namespace WTF {
-CrossThreadCopierBase<false, false, PAL::SessionID>::Type CrossThreadCopierBase<false, false, PAL::SessionID>::copy(const PAL::SessionID& sessionID)
+CrossThreadCopierBase<false, false, PAL::SessionID>::Type CrossThreadCopierBase<false, false, PAL::SessionID>::copy(PAL::SessionID sessionID)
{
return sessionID;
}
Modified: trunk/Source/WebCore/platform/WebCoreCrossThreadCopier.h (278848 => 278849)
--- trunk/Source/WebCore/platform/WebCoreCrossThreadCopier.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/platform/WebCoreCrossThreadCopier.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -45,7 +45,7 @@
template<> struct CrossThreadCopierBase<false, false, PAL::SessionID> {
typedef PAL::SessionID Type;
- static Type copy(const PAL::SessionID&);
+ static Type copy(PAL::SessionID);
};
template<> struct CrossThreadCopierBase<false, false, WebCore::ThreadSafeDataBuffer> {
Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp (278848 => 278849)
--- trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -82,7 +82,7 @@
return *slot;
}
-void StorageNamespaceProvider::setSessionIDForTesting(const PAL::SessionID& newSessionID)
+void StorageNamespaceProvider::setSessionIDForTesting(PAL::SessionID newSessionID)
{
if (m_localStorageNamespace && newSessionID != m_localStorageNamespace->sessionID())
m_localStorageNamespace->setSessionIDForTesting(newSessionID);
Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.h (278848 => 278849)
--- trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -50,7 +50,7 @@
Ref<StorageArea> localStorageArea(Document&);
- WEBCORE_EXPORT void setSessionIDForTesting(const PAL::SessionID&);
+ WEBCORE_EXPORT void setSessionIDForTesting(PAL::SessionID);
protected:
StorageNamespace* optionalLocalStorageNamespace() { return m_localStorageNamespace.get(); }
Modified: trunk/Source/WebKit/ChangeLog (278848 => 278849)
--- trunk/Source/WebKit/ChangeLog 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/ChangeLog 2021-06-14 21:36:12 UTC (rev 278849)
@@ -1,3 +1,44 @@
+2021-06-14 Alex Christensen <achristen...@webkit.org>
+
+ Pass PAL::SessionID by value instead of reference
+ https://bugs.webkit.org/show_bug.cgi?id=226983
+
+ Reviewed by Geoffrey Garen.
+
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::NetworkProcess::newTestingSession):
+ (WebKit::NetworkProcess::ensureSession):
+ (WebKit::NetworkProcess::storageSession const):
+ (WebKit::NetworkProcess::findCacheEngine):
+ (WebKit::NetworkProcess::ensureCacheEngine):
+ (WebKit::NetworkProcess::removeCacheEngine):
+ (WebKit::NetworkProcess::flushCookies):
+ (WebKit::NetworkProcess::platformFlushCookies):
+ (WebKit::NetworkProcess::addWebPageNetworkParameters):
+ (WebKit::NetworkProcess::removeWebPageNetworkParameters):
+ (WebKit::NetworkProcess::countNonDefaultSessionSets):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::shouldLogCookieInformation):
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/NetworkStorageSessionProvider.h:
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::makeUseDecision):
+ * NetworkProcess/cache/NetworkCache.h:
+ (WebKit::NetworkCache::Cache::sessionID const):
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::flushCookies):
+ (WebKit::NetworkProcess::platformFlushCookies):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::configurationForSessionID):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::flushCookies):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebProcessPool.h:
+ * WebProcess/Databases/WebDatabaseProvider.cpp:
+ (WebKit::WebDatabaseProvider::idbConnectionToServerForSession):
+ * WebProcess/Databases/WebDatabaseProvider.h:
+
2021-06-14 Youenn Fablet <you...@apple.com>
Accessing navigator.mediaDevices.enumerateDevices after granting permission
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -451,7 +451,7 @@
functor(*session);
}
-std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::newTestingSession(const PAL::SessionID& sessionID)
+std::unique_ptr<WebCore::NetworkStorageSession> NetworkProcess::newTestingSession(PAL::SessionID sessionID)
{
#if PLATFORM(COCOA)
// 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>).
@@ -469,9 +469,9 @@
}
#if PLATFORM(COCOA)
-void NetworkProcess::ensureSession(const PAL::SessionID& sessionID, bool shouldUseTestingNetworkSession, const String& identifierBase, RetainPtr<CFHTTPCookieStorageRef>&& cookieStorage)
+void NetworkProcess::ensureSession(PAL::SessionID sessionID, bool shouldUseTestingNetworkSession, const String& identifierBase, RetainPtr<CFHTTPCookieStorageRef>&& cookieStorage)
#else
-void NetworkProcess::ensureSession(const PAL::SessionID& sessionID, bool shouldUseTestingNetworkSession, const String& identifierBase)
+void NetworkProcess::ensureSession(PAL::SessionID sessionID, bool shouldUseTestingNetworkSession, const String& identifierBase)
#endif
{
auto addResult = m_networkStorageSessions.add(sessionID, nullptr);
@@ -509,7 +509,7 @@
connection->cookieAcceptPolicyChanged(newPolicy);
}
-WebCore::NetworkStorageSession* NetworkProcess::storageSession(const PAL::SessionID& sessionID) const
+WebCore::NetworkStorageSession* NetworkProcess::storageSession(PAL::SessionID sessionID) const
{
return m_networkStorageSessions.get(sessionID);
}
@@ -2073,17 +2073,17 @@
}
#endif // ENABLE(RESOURCE_LOAD_STATISTICS)
-CacheStorage::Engine* NetworkProcess::findCacheEngine(const PAL::SessionID& sessionID)
+CacheStorage::Engine* NetworkProcess::findCacheEngine(PAL::SessionID sessionID)
{
return m_cacheEngines.get(sessionID);
}
-CacheStorage::Engine& NetworkProcess::ensureCacheEngine(const PAL::SessionID& sessionID, Function<Ref<CacheStorage::Engine>()>&& functor)
+CacheStorage::Engine& NetworkProcess::ensureCacheEngine(PAL::SessionID sessionID, Function<Ref<CacheStorage::Engine>()>&& functor)
{
return m_cacheEngines.ensure(sessionID, WTFMove(functor)).iterator->value;
}
-void NetworkProcess::removeCacheEngine(const PAL::SessionID& sessionID)
+void NetworkProcess::removeCacheEngine(PAL::SessionID sessionID)
{
m_cacheEngines.remove(sessionID);
}
@@ -2528,12 +2528,12 @@
{
}
-void NetworkProcess::flushCookies(const PAL::SessionID&, CompletionHandler<void()>&& completionHandler)
+void NetworkProcess::flushCookies(PAL::SessionID, CompletionHandler<void()>&& completionHandler)
{
completionHandler();
}
-void NetworkProcess::platformFlushCookies(const PAL::SessionID&, CompletionHandler<void()>&& completionHandler)
+void NetworkProcess::platformFlushCookies(PAL::SessionID, CompletionHandler<void()>&& completionHandler)
{
completionHandler();
}
@@ -2794,7 +2794,7 @@
}
#endif
-void NetworkProcess::addWebPageNetworkParameters(const PAL::SessionID& sessionID, WebPageProxyIdentifier pageID, WebPageNetworkParameters&& parameters)
+void NetworkProcess::addWebPageNetworkParameters(PAL::SessionID sessionID, WebPageProxyIdentifier pageID, WebPageNetworkParameters&& parameters)
{
auto session = networkSession(sessionID);
if (!session)
@@ -2803,7 +2803,7 @@
session->addWebPageNetworkParameters(pageID, WTFMove(parameters));
}
-void NetworkProcess::removeWebPageNetworkParameters(const PAL::SessionID& sessionID, WebPageProxyIdentifier pageID)
+void NetworkProcess::removeWebPageNetworkParameters(PAL::SessionID sessionID, WebPageProxyIdentifier pageID)
{
auto session = networkSession(sessionID);
if (!session)
@@ -2812,7 +2812,7 @@
session->removeWebPageNetworkParameters(pageID);
}
-void NetworkProcess::countNonDefaultSessionSets(const PAL::SessionID& sessionID, CompletionHandler<void(size_t)>&& completionHandler)
+void NetworkProcess::countNonDefaultSessionSets(PAL::SessionID sessionID, CompletionHandler<void(size_t)>&& completionHandler)
{
auto session = networkSession(sessionID);
if (!session)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -173,12 +173,12 @@
void forEachNetworkSession(const Function<void(NetworkSession&)>&);
void forEachNetworkStorageSession(const Function<void(WebCore::NetworkStorageSession&)>&);
- WebCore::NetworkStorageSession* storageSession(const PAL::SessionID&) const;
- std::unique_ptr<WebCore::NetworkStorageSession> newTestingSession(const PAL::SessionID&);
+ WebCore::NetworkStorageSession* storageSession(PAL::SessionID) const;
+ std::unique_ptr<WebCore::NetworkStorageSession> newTestingSession(PAL::SessionID);
#if PLATFORM(COCOA)
- void ensureSession(const PAL::SessionID&, bool shouldUseTestingNetworkSession, const String& identifier, RetainPtr<CFHTTPCookieStorageRef>&&);
+ void ensureSession(PAL::SessionID, bool shouldUseTestingNetworkSession, const String& identifier, RetainPtr<CFHTTPCookieStorageRef>&&);
#else
- void ensureSession(const PAL::SessionID&, bool shouldUseTestingNetworkSession, const String& identifier);
+ void ensureSession(PAL::SessionID, bool shouldUseTestingNetworkSession, const String& identifier);
#endif
void processWillSuspendImminentlyForTestingSync(CompletionHandler<void()>&&);
@@ -329,9 +329,9 @@
void ref() const override { ThreadSafeRefCounted<NetworkProcess>::ref(); }
void deref() const override { ThreadSafeRefCounted<NetworkProcess>::deref(); }
- CacheStorage::Engine* findCacheEngine(const PAL::SessionID&);
- CacheStorage::Engine& ensureCacheEngine(const PAL::SessionID&, Function<Ref<CacheStorage::Engine>()>&&);
- void removeCacheEngine(const PAL::SessionID&);
+ CacheStorage::Engine* findCacheEngine(PAL::SessionID);
+ CacheStorage::Engine& ensureCacheEngine(PAL::SessionID, Function<Ref<CacheStorage::Engine>()>&&);
+ void removeCacheEngine(PAL::SessionID);
void requestStorageSpace(PAL::SessionID, const WebCore::ClientOrigin&, uint64_t quota, uint64_t currentSize, uint64_t spaceRequired, CompletionHandler<void(std::optional<uint64_t>)>&&);
void storePrivateClickMeasurement(PAL::SessionID, WebCore::PrivateClickMeasurement&&);
@@ -451,11 +451,11 @@
void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
- void flushCookies(const PAL::SessionID&, CompletionHandler<void()>&&);
+ void flushCookies(PAL::SessionID, CompletionHandler<void()>&&);
- void addWebPageNetworkParameters(const PAL::SessionID&, WebPageProxyIdentifier, WebPageNetworkParameters&&);
- void removeWebPageNetworkParameters(const PAL::SessionID&, WebPageProxyIdentifier);
- void countNonDefaultSessionSets(const PAL::SessionID&, CompletionHandler<void(size_t)>&&);
+ void addWebPageNetworkParameters(PAL::SessionID, WebPageProxyIdentifier, WebPageNetworkParameters&&);
+ void removeWebPageNetworkParameters(PAL::SessionID, WebPageProxyIdentifier);
+ void countNonDefaultSessionSets(PAL::SessionID, CompletionHandler<void(size_t)>&&);
#if USE(SOUP)
void setIgnoreTLSErrors(PAL::SessionID, bool);
@@ -472,7 +472,7 @@
static void setSharedHTTPCookieStorage(const Vector<uint8_t>& identifier);
#endif
- void platformFlushCookies(const PAL::SessionID&, CompletionHandler<void()>&&);
+ void platformFlushCookies(PAL::SessionID, CompletionHandler<void()>&&);
void registerURLSchemeAsSecure(const String&) const;
void registerURLSchemeAsBypassingContentSecurityPolicy(const String&) const;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -1284,7 +1284,7 @@
}
#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
-bool NetworkResourceLoader::shouldLogCookieInformation(NetworkConnectionToWebProcess& connection, const PAL::SessionID& sessionID)
+bool NetworkResourceLoader::shouldLogCookieInformation(NetworkConnectionToWebProcess& connection, PAL::SessionID sessionID)
{
if (auto* session = connection.networkProcess().networkSession(sessionID))
return session->shouldLogCookieInformation();
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -128,7 +128,7 @@
bool isAlwaysOnLoggingAllowed() const;
#if ENABLE(RESOURCE_LOAD_STATISTICS) && !RELEASE_LOG_DISABLED
- static bool shouldLogCookieInformation(NetworkConnectionToWebProcess&, const PAL::SessionID&);
+ static bool shouldLogCookieInformation(NetworkConnectionToWebProcess&, PAL::SessionID);
static void logCookieInformation(NetworkConnectionToWebProcess&, const String& label, const void* loggedObject, const WebCore::NetworkStorageSession&, const URL& firstParty, const WebCore::SameSiteInfo&, const URL&, const String& referrer, std::optional<WebCore::FrameIdentifier>, std::optional<WebCore::PageIdentifier>, std::optional<uint64_t> identifier);
#endif
Modified: trunk/Source/WebKit/NetworkProcess/NetworkStorageSessionProvider.h (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/NetworkStorageSessionProvider.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/NetworkStorageSessionProvider.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -35,10 +35,10 @@
class NetworkStorageSessionProvider final : public WebCore::StorageSessionProvider {
public:
- static Ref<NetworkStorageSessionProvider> create(NetworkProcess& networkProcess, const PAL::SessionID& sessionID) { return adoptRef(*new NetworkStorageSessionProvider(networkProcess, sessionID)); }
+ static Ref<NetworkStorageSessionProvider> create(NetworkProcess& networkProcess, PAL::SessionID sessionID) { return adoptRef(*new NetworkStorageSessionProvider(networkProcess, sessionID)); }
private:
- NetworkStorageSessionProvider(NetworkProcess& networkProcess, const PAL::SessionID& sessionID)
+ NetworkStorageSessionProvider(NetworkProcess& networkProcess, PAL::SessionID sessionID)
: m_networkProcess(makeWeakPtr(networkProcess))
, m_sessionID(sessionID) { }
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -220,7 +220,7 @@
return responseNeedsRevalidation(networkSession, response, timestamp, requestDirectives.maxStale);
}
-static UseDecision makeUseDecision(NetworkProcess& networkProcess, const PAL::SessionID& sessionID, const Entry& entry, const WebCore::ResourceRequest& request)
+static UseDecision makeUseDecision(NetworkProcess& networkProcess, PAL::SessionID sessionID, const Entry& entry, const WebCore::ResourceRequest& request)
{
// The request is conditional so we force revalidation from the network. We merely check the disk cache
// so we can update the cache entry.
Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -203,7 +203,7 @@
void browsingContextRemoved(WebPageProxyIdentifier, WebCore::PageIdentifier, WebCore::FrameIdentifier);
NetworkProcess& networkProcess() { return m_networkProcess.get(); }
- const PAL::SessionID& sessionID() const { return m_sessionID; }
+ PAL::SessionID sessionID() const { return m_sessionID; }
const String& storageDirectory() const { return m_storageDirectory; }
~Cache();
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2021-06-14 21:36:12 UTC (rev 278849)
@@ -212,7 +212,7 @@
}
#endif
-void NetworkProcess::flushCookies(const PAL::SessionID& sessionID, CompletionHandler<void()>&& completionHandler)
+void NetworkProcess::flushCookies(PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
{
platformFlushCookies(sessionID, WTFMove(completionHandler));
}
@@ -227,7 +227,7 @@
}).get()];
}
-void NetworkProcess::platformFlushCookies(const PAL::SessionID& sessionID, CompletionHandler<void()>&& completionHandler)
+void NetworkProcess::platformFlushCookies(PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
{
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
if (auto* networkStorageSession = storageSession(sessionID))
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (278848 => 278849)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2021-06-14 21:36:12 UTC (rev 278849)
@@ -1062,7 +1062,7 @@
static bool sessionsCreated = false;
#endif
-static NSURLSessionConfiguration *configurationForSessionID(const PAL::SessionID& session, bool isFullWebBrowser)
+static NSURLSessionConfiguration *configurationForSessionID(PAL::SessionID session, bool isFullWebBrowser)
{
#if HAVE(LOGGING_PRIVACY_LEVEL)
auto loggingPrivacyLevel = nw_context_privacy_level_sensitive;
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp (278848 => 278849)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -1262,7 +1262,7 @@
}
}
-void NetworkProcessProxy::flushCookies(const PAL::SessionID& sessionID, CompletionHandler<void()>&& completionHandler)
+void NetworkProcessProxy::flushCookies(PAL::SessionID sessionID, CompletionHandler<void()>&& completionHandler)
{
sendWithAsyncReply(Messages::NetworkProcess::FlushCookies(sessionID), WTFMove(completionHandler));
}
Modified: trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h (278848 => 278849)
--- trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/UIProcess/Network/NetworkProcessProxy.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -210,7 +210,7 @@
void setIsHoldingLockedFiles(bool);
- void flushCookies(const PAL::SessionID&, CompletionHandler<void()>&&);
+ void flushCookies(PAL::SessionID, CompletionHandler<void()>&&);
void testProcessIncomingSyncMessagesWhenWaitingForSyncReply(WebPageProxyIdentifier, Messages::NetworkProcessProxy::TestProcessIncomingSyncMessagesWhenWaitingForSyncReplyDelayedReply&&);
void terminateUnresponsiveServiceWorkerProcesses(WebCore::ProcessIdentifier);
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.h (278848 => 278849)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -299,7 +299,7 @@
};
static Statistics& statistics();
- void clearCachedCredentials(const PAL::SessionID&);
+ void clearCachedCredentials(PAL::SessionID);
void terminateNetworkProcess();
void terminateAllWebContentProcesses();
void sendNetworkProcessPrepareToSuspendForTesting(CompletionHandler<void()>&&);
Modified: trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp (278848 => 278849)
--- trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -66,7 +66,7 @@
databaseProviders().remove(m_identifier);
}
-WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToServerForSession(const PAL::SessionID&)
+WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToServerForSession(PAL::SessionID)
{
return WebProcess::singleton().ensureNetworkProcessConnection().idbConnectionToServer().coreConnectionToServer();
}
Modified: trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.h (278848 => 278849)
--- trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKit/WebProcess/Databases/WebDatabaseProvider.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -36,7 +36,7 @@
static Ref<WebDatabaseProvider> getOrCreate(uint64_t identifier);
virtual ~WebDatabaseProvider();
- WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const PAL::SessionID&) final;
+ WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(PAL::SessionID) final;
private:
explicit WebDatabaseProvider(uint64_t identifier);
Modified: trunk/Source/WebKitLegacy/ChangeLog (278848 => 278849)
--- trunk/Source/WebKitLegacy/ChangeLog 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKitLegacy/ChangeLog 2021-06-14 21:36:12 UTC (rev 278849)
@@ -1,3 +1,19 @@
+2021-06-14 Alex Christensen <achristen...@webkit.org>
+
+ Pass PAL::SessionID by value instead of reference
+ https://bugs.webkit.org/show_bug.cgi?id=226983
+
+ Reviewed by Geoffrey Garen.
+
+ * Storage/WebDatabaseProvider.cpp:
+ (WebDatabaseProvider::idbConnectionToServerForSession):
+ * Storage/WebDatabaseProvider.h:
+ * WebCoreSupport/NetworkStorageSessionMap.cpp:
+ (NetworkStorageSessionMap::storageSession):
+ (NetworkStorageSessionMap::ensureSession):
+ (NetworkStorageSessionMap::destroySession):
+ * WebCoreSupport/NetworkStorageSessionMap.h:
+
2021-06-10 Alex Christensen <achristen...@webkit.org>
Move Timing-Allow-Origin checks to the network process
Modified: trunk/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp (278848 => 278849)
--- trunk/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKitLegacy/Storage/WebDatabaseProvider.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -42,7 +42,7 @@
{
}
-WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToServerForSession(const PAL::SessionID& sessionID)
+WebCore::IDBClient::IDBConnectionToServer& WebDatabaseProvider::idbConnectionToServerForSession(PAL::SessionID sessionID)
{
return m_idbServerMap.ensure(sessionID, [&sessionID] {
return sessionID.isEphemeral() ? InProcessIDBServer::create(sessionID) : InProcessIDBServer::create(sessionID, indexedDatabaseDirectoryPath());
Modified: trunk/Source/WebKitLegacy/Storage/WebDatabaseProvider.h (278848 => 278849)
--- trunk/Source/WebKitLegacy/Storage/WebDatabaseProvider.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKitLegacy/Storage/WebDatabaseProvider.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -37,7 +37,7 @@
static WebDatabaseProvider& singleton();
virtual ~WebDatabaseProvider();
- WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const PAL::SessionID&) override;
+ WebCore::IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(PAL::SessionID) override;
void deleteAllDatabases();
Modified: trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp (278848 => 278849)
--- trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.cpp 2021-06-14 21:36:12 UTC (rev 278849)
@@ -46,7 +46,7 @@
return map;
}
-WebCore::NetworkStorageSession* NetworkStorageSessionMap::storageSession(const PAL::SessionID& sessionID)
+WebCore::NetworkStorageSession* NetworkStorageSessionMap::storageSession(PAL::SessionID sessionID)
{
if (sessionID == PAL::SessionID::defaultSessionID())
return &defaultStorageSession();
@@ -77,7 +77,7 @@
#endif
}
-void NetworkStorageSessionMap::ensureSession(const PAL::SessionID& sessionID, const String& identifierBase)
+void NetworkStorageSessionMap::ensureSession(PAL::SessionID sessionID, const String& identifierBase)
{
#if PLATFORM(COCOA) || USE(CFURLCONNECTION)
auto addResult = globalSessionMap().add(sessionID, nullptr);
@@ -108,7 +108,7 @@
#endif
}
-void NetworkStorageSessionMap::destroySession(const PAL::SessionID& sessionID)
+void NetworkStorageSessionMap::destroySession(PAL::SessionID sessionID)
{
globalSessionMap().remove(sessionID);
}
Modified: trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.h (278848 => 278849)
--- trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.h 2021-06-14 20:01:30 UTC (rev 278848)
+++ trunk/Source/WebKitLegacy/WebCoreSupport/NetworkStorageSessionMap.h 2021-06-14 21:36:12 UTC (rev 278849)
@@ -37,9 +37,9 @@
class NetworkStorageSessionMap {
public:
- static WebCore::NetworkStorageSession* storageSession(const PAL::SessionID&);
+ static WebCore::NetworkStorageSession* storageSession(PAL::SessionID);
static WebCore::NetworkStorageSession& defaultStorageSession();
static void switchToNewTestingSession();
- static void ensureSession(const PAL::SessionID&, const String& identifierBase = String());
- static void destroySession(const PAL::SessionID&);
+ static void ensureSession(PAL::SessionID, const String& identifierBase = String());
+ static void destroySession(PAL::SessionID);
};
