From cedffcba4e21f03ea3067cd5638b07905bf6da30 Mon Sep 17 00:00:00 2001 From: Tooru Fujisawa Date: Tue, 21 Apr 2026 15:54:45 +0000 Subject: [PATCH] Bug 2031200 - Part 11: Repurpose LoadedScript::mReferrerPolicy for the cached case. r=bthrall Same as base URL, the mReferrerPolicy reflects the server response, and it need to be retained for the cached case. The existing consumers use the ScriptFetchInfo field. Differential Revision: https://phabricator.services.mozilla.com/D294343 --- dom/script/ScriptLoader.cpp | 20 +++++++++-------- dom/script/SharedScriptCache.cpp | 2 +- js/loader/LoadedScript.cpp | 26 ++++++++-------------- js/loader/LoadedScript.h | 37 +++++++++++++++----------------- js/loader/ModuleLoadRequest.h | 1 - js/loader/ScriptLoadRequest.cpp | 10 ++++----- js/loader/ScriptLoadRequest.h | 2 +- 7 files changed, 44 insertions(+), 54 deletions(-) diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index 56d1f15d5b1d..6bc77fb4e044 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -1145,9 +1145,9 @@ void ScriptLoader::NotifyObserversForCachedScript( return; } - ScriptHashKey key( - this, aRequest, aRequest->getLoadedScript()->ReferrerPolicy(), - aRequest->FetchOptions(), aRequest->getLoadedScript()->GetURI()); + ScriptHashKey key(this, aRequest, aRequest->ReferrerPolicy(), + aRequest->FetchOptions(), + aRequest->getLoadedScript()->GetURI()); nsAutoCString keyStr; key.ToStringForLookup(keyStr); @@ -1275,7 +1275,8 @@ void ScriptLoader::TryUseCache(ReferrerPolicy aReferrerPolicy, aRequest->mNetworkMetadata = cacheResult.mNetworkMetadata; - MOZ_ASSERT(cacheResult.mCompleteValue->ReferrerPolicy() == aReferrerPolicy); + MOZ_ASSERT(cacheResult.mCompleteValue->CachedReferrerPolicy() == + aReferrerPolicy); mMemoryCacheUsed++; if (!cacheResult.mCompleteValue->IsEverHitFromMemoryCache()) { @@ -3462,9 +3463,9 @@ ScriptLoader::CacheBehavior ScriptLoader::GetCacheBehavior( return CacheBehavior::Insert; } - ScriptHashKey key( - this, aRequest, aRequest->getLoadedScript()->ReferrerPolicy(), - aRequest->FetchOptions(), aRequest->getLoadedScript()->GetURI()); + ScriptHashKey key(this, aRequest, aRequest->ReferrerPolicy(), + aRequest->FetchOptions(), + aRequest->getLoadedScript()->GetURI()); auto cacheResult = mCache->Lookup(*this, key, /* aSyncLoad = */ true); if (cacheResult.mState == CachedSubResourceState::Complete) { @@ -3516,7 +3517,8 @@ void ScriptLoader::TryCacheRequest(ScriptLoadRequest* aRequest) { if (cacheBehavior == CacheBehavior::Insert) { loadedScript->SetSRIMetadata(aRequest->mIntegrity); auto loadData = MakeRefPtr(this, aRequest, loadedScript); - loadedScript->ConvertToCachedStencil(aRequest->BaseURL()); + loadedScript->ConvertToCachedStencil(aRequest->ReferrerPolicy(), + aRequest->BaseURL()); if (loadedScript->mFetchCount == 0) { loadedScript->mFetchCount = 1; } @@ -3527,7 +3529,7 @@ void ScriptLoader::TryCacheRequest(ScriptLoadRequest* aRequest) { TRACE_FOR_TEST(aRequest, "memorycache:saved"); } else { MOZ_ASSERT(cacheBehavior == CacheBehavior::Evict); - ScriptHashKey key(this, aRequest, loadedScript->ReferrerPolicy(), + ScriptHashKey key(this, aRequest, aRequest->ReferrerPolicy(), aRequest->FetchOptions(), loadedScript->GetURI()); mCache->Evict(key); LOG(("ScriptLoader (%p): Evicting in-memory cache for %s.", this, diff --git a/dom/script/SharedScriptCache.cpp b/dom/script/SharedScriptCache.cpp index 24dafb71304e..f74ac77eac8b 100644 --- a/dom/script/SharedScriptCache.cpp +++ b/dom/script/SharedScriptCache.cpp @@ -240,7 +240,7 @@ ScriptLoadData::ScriptLoadData(ScriptLoader* aLoader, JS::loader::LoadedScript* aLoadedScript) : mExpirationTime(aRequest->ExpirationTime()), mLoader(aLoader), - mKey(aLoader, aRequest, aLoadedScript->ReferrerPolicy(), + mKey(aLoader, aRequest, aRequest->ReferrerPolicy(), aRequest->FetchOptions(), aLoadedScript->GetURI()), mLoadedScript(aLoadedScript), mNetworkMetadata(aRequest->mNetworkMetadata) {} diff --git a/js/loader/LoadedScript.cpp b/js/loader/LoadedScript.cpp index 3cf067774a07..0a2dea1bef3e 100644 --- a/js/loader/LoadedScript.cpp +++ b/js/loader/LoadedScript.cpp @@ -143,12 +143,9 @@ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END NS_IMPL_CYCLE_COLLECTING_ADDREF(LoadedScript) NS_IMPL_CYCLE_COLLECTING_RELEASE(LoadedScript) -LoadedScript::LoadedScript(ScriptKind aKind, - mozilla::dom::ReferrerPolicy aReferrerPolicy, - nsIURI* aURI) +LoadedScript::LoadedScript(ScriptKind aKind, nsIURI* aURI) : mDataType(DataType::eUnknown), mKind(aKind), - mReferrerPolicy(aReferrerPolicy), mSerializedStencilOffset(0), mCacheEntryId(InvalidCacheEntryId), mIsDirty(false), @@ -162,7 +159,6 @@ LoadedScript::LoadedScript(ScriptKind aKind, LoadedScript::LoadedScript(const LoadedScript& aOther) : mDataType(DataType::eCachedStencil), mKind(aOther.mKind), - mReferrerPolicy(aOther.mReferrerPolicy), mSerializedStencilOffset(0), mCacheEntryId(aOther.mCacheEntryId), mIsDirty(aOther.mIsDirty), @@ -337,25 +333,22 @@ bool LoadedScript::IsSRIMetadataReusableBy( // EventScript ////////////////////////////////////////////////////////////// -EventScript::EventScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, - nsIURI* aURI) - : LoadedScript(ScriptKind::eEvent, aReferrerPolicy, aURI) {} +EventScript::EventScript(nsIURI* aURI) + : LoadedScript(ScriptKind::eEvent, aURI) {} ////////////////////////////////////////////////////////////// // ClassicScript ////////////////////////////////////////////////////////////// -ClassicScript::ClassicScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, - nsIURI* aURI) - : LoadedScript(ScriptKind::eClassic, aReferrerPolicy, aURI) {} +ClassicScript::ClassicScript(nsIURI* aURI) + : LoadedScript(ScriptKind::eClassic, aURI) {} ////////////////////////////////////////////////////////////// // ImportMapScript ////////////////////////////////////////////////////////////// -ImportMapScript::ImportMapScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, - nsIURI* aURI) - : LoadedScript(ScriptKind::eImportMap, aReferrerPolicy, aURI) {} +ImportMapScript::ImportMapScript(nsIURI* aURI) + : LoadedScript(ScriptKind::eImportMap, aURI) {} ////////////////////////////////////////////////////////////// // ModuleScript @@ -381,9 +374,8 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(ModuleScript, LoadedScript) NS_IMPL_CYCLE_COLLECTION_TRACE_JS_MEMBER_CALLBACK(mErrorToRethrow) NS_IMPL_CYCLE_COLLECTION_TRACE_END -ModuleScript::ModuleScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, - nsIURI* aURI, ScriptFetchInfo* aFetchInfo) - : LoadedScript(ScriptKind::eModule, aReferrerPolicy, aURI), +ModuleScript::ModuleScript(nsIURI* aURI, ScriptFetchInfo* aFetchInfo) + : LoadedScript(ScriptKind::eModule, aURI), mFetchInfoForUpdatingPreload(aFetchInfo) { MOZ_ASSERT(!ModuleRecord()); MOZ_ASSERT(!HasParseError()); diff --git a/js/loader/LoadedScript.h b/js/loader/LoadedScript.h index ec1c8cded98d..dbfa6993721b 100644 --- a/js/loader/LoadedScript.h +++ b/js/loader/LoadedScript.h @@ -135,8 +135,7 @@ class ScriptFetchInfo : public nsISupports { // properly. class LoadedScript : public nsIMemoryReporter { protected: - LoadedScript(ScriptKind aKind, mozilla::dom::ReferrerPolicy aReferrerPolicy, - nsIURI* aURI); + LoadedScript(ScriptKind aKind, nsIURI* aURI); LoadedScript(const LoadedScript& aOther); @@ -175,13 +174,12 @@ class LoadedScript : public nsIMemoryReporter { inline ClassicScript* AsClassicScript(); inline ModuleScript* AsModuleScript(); - mozilla::dom::ReferrerPolicy ReferrerPolicy() const { - return mReferrerPolicy; - } - nsIURI* GetURI() const { return mURI; } nsIURI* CachedBaseURL() const { return mCachedBaseURL; } + mozilla::dom::ReferrerPolicy CachedReferrerPolicy() const { + return mCachedReferrerPolicy; + } public: // =========================================================================== @@ -259,10 +257,12 @@ class LoadedScript : public nsIMemoryReporter { mDataType = DataType::eSerializedStencil; } - void ConvertToCachedStencil(nsIURI* aBaseURL) { + void ConvertToCachedStencil(mozilla::dom::ReferrerPolicy aReferrerPolicy, + nsIURI* aBaseURL) { MOZ_ASSERT(HasStencil()); SetUnknownDataType(); mDataType = DataType::eCachedStencil; + mCachedReferrerPolicy = aReferrerPolicy; mCachedBaseURL = aBaseURL; } @@ -475,10 +475,12 @@ class LoadedScript : public nsIMemoryReporter { private: const ScriptKind mKind; - protected: - // The referrer policy used for the initial fetch and for fetching any - // imported modules - mozilla::dom::ReferrerPolicy mReferrerPolicy; + // The final ScriptFetchInfo::mReferrerPolicy value o the + // initial request. + // This field is set before this LoadedScript is stored into the + // SharedScriptCache, and then propagated to the ScriptFetchInfo + // for the request that uses this cache. + mozilla::dom::ReferrerPolicy mCachedReferrerPolicy; public: // Offset of the serialized Stencil in mSRIAndSerializedStencil. @@ -694,7 +696,7 @@ class ClassicScript final : public LoadedScript { private: // Scripts can be created only by ScriptLoadRequest::NoCacheEntryFound. - ClassicScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, nsIURI* aURI); + explicit ClassicScript(nsIURI* aURI); friend class ScriptLoadRequest; }; @@ -703,14 +705,14 @@ class EventScript final : public LoadedScript { ~EventScript() = default; public: - EventScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, nsIURI* aURI); + explicit EventScript(nsIURI* aURI); }; class ImportMapScript final : public LoadedScript { ~ImportMapScript() = default; public: - ImportMapScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, nsIURI* aURI); + explicit ImportMapScript(nsIURI* aURI); }; // A single module script. May be used to satisfy multiple load requests. @@ -740,8 +742,7 @@ class ModuleScript final : public LoadedScript { private: // Scripts can be created only by ScriptLoadRequest::NoCacheEntryFound. - ModuleScript(mozilla::dom::ReferrerPolicy aReferrerPolicy, nsIURI* aURI, - ScriptFetchInfo* aFetchInfo); + ModuleScript(nsIURI* aURI, ScriptFetchInfo* aFetchInfo); ModuleScript(const LoadedScript& other, ScriptFetchInfo* aFetchInfo); @@ -779,10 +780,6 @@ class ModuleScript final : public LoadedScript { friend void CheckModuleScriptPrivate(LoadedScript*, const Value&); - void UpdateReferrerPolicy(mozilla::dom::ReferrerPolicy aReferrerPolicy) { - mReferrerPolicy = aReferrerPolicy; - } - bool HasPreloadedResolvedSet() { return !!mPreloadedResolvedSet; } ResolvedModuleSet* GetPreloadedResolvedSet(); void ReleasePreloadedResolvedSet() { mPreloadedResolvedSet = nullptr; } diff --git a/js/loader/ModuleLoadRequest.h b/js/loader/ModuleLoadRequest.h index 2d6c3b090e66..5ec9cc31d461 100644 --- a/js/loader/ModuleLoadRequest.h +++ b/js/loader/ModuleLoadRequest.h @@ -115,7 +115,6 @@ class ModuleLoadRequest final : public ScriptLoadRequest { } void UpdateReferrerPolicy(mozilla::dom::ReferrerPolicy aReferrerPolicy) { - getLoadedScript()->AsModuleScript()->UpdateReferrerPolicy(aReferrerPolicy); FetchInfo()->UpdateReferrerPolicy(aReferrerPolicy); } diff --git a/js/loader/ScriptLoadRequest.cpp b/js/loader/ScriptLoadRequest.cpp index d3b5f01c5e0b..1d6b55bf3f47 100644 --- a/js/loader/ScriptLoadRequest.cpp +++ b/js/loader/ScriptLoadRequest.cpp @@ -180,8 +180,8 @@ void ScriptLoadRequest::CacheEntryRevived(LoadedScript* aLoadedScript) { void ScriptLoadRequest::SetCacheEntry(LoadedScript* aLoadedScript, ScriptFetchOptions* aFetchOptions) { mFetchInfo = - new ScriptFetchInfo(mKind, aLoadedScript->ReferrerPolicy(), aFetchOptions, - aLoadedScript->CachedBaseURL()); + new ScriptFetchInfo(mKind, aLoadedScript->CachedReferrerPolicy(), + aFetchOptions, aLoadedScript->CachedBaseURL()); switch (mKind) { case ScriptKind::eClassic: @@ -230,13 +230,13 @@ void ScriptLoadRequest::NoCacheEntryFound( // provide. switch (mKind) { case ScriptKind::eClassic: - mLoadedScript = new ClassicScript(aReferrerPolicy, aURI); + mLoadedScript = new ClassicScript(aURI); break; case ScriptKind::eImportMap: - mLoadedScript = new ImportMapScript(aReferrerPolicy, aURI); + mLoadedScript = new ImportMapScript(aURI); break; case ScriptKind::eModule: - mLoadedScript = new ModuleScript(aReferrerPolicy, aURI, mFetchInfo); + mLoadedScript = new ModuleScript(aURI, mFetchInfo); break; case ScriptKind::eEvent: MOZ_ASSERT_UNREACHABLE("EventScripts are not using ScriptLoadRequest"); diff --git a/js/loader/ScriptLoadRequest.h b/js/loader/ScriptLoadRequest.h index 7dca2f8ee280..ef85f855b3ea 100644 --- a/js/loader/ScriptLoadRequest.h +++ b/js/loader/ScriptLoadRequest.h @@ -153,7 +153,7 @@ class ScriptLoadRequest : public nsISupports, } mozilla::dom::ReferrerPolicy ReferrerPolicy() const { - return getLoadedScript()->ReferrerPolicy(); + return FetchInfo()->ReferrerPolicy(); } nsIURI* BaseURL() const { return FetchInfo()->BaseURL(); }