tor-browser

commit 6ed00c0dbe515e550ac024afd61873c1aa5883fd
parent 00c99c7b32988d3131c6305f991a7947d71833b5
Author: Tooru Fujisawa <arai_a@mac.com>
Date:   Wed, 29 Oct 2025 09:37:23 +0000

Bug 1994617 - Part 1: Remove the redundacheck for inline scripts. r=nbp

Differential Revision: https://phabricator.services.mozilla.com/D270101

Diffstat:
M
dom/script/ScriptLoader.cpp
 | 
2
+-
M
js/loader/ScriptLoadRequest.cpp
 | 
8
--------
M
js/loader/ScriptLoadRequest.h
 | 
2
--

3 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
@@ -3249,7 +3249,7 @@ ScriptLoader::CacheBehavior ScriptLoader::GetCacheBehavior(
     return CacheBehavior::DoNothing;
   }
 
-  if (!aRequest->IsCacheable()) {
+  if (aRequest->ExpirationTime().IsExpired()) {
     return CacheBehavior::Evict;
   }
 
diff --git a/js/loader/ScriptLoadRequest.cpp b/js/loader/ScriptLoadRequest.cpp
@@ -162,14 +162,6 @@ const ModuleLoadRequest* ScriptLoadRequest::AsModuleRequest() const {
   return static_cast<const ModuleLoadRequest*>(this);
 }
 
-bool ScriptLoadRequest::IsCacheable() const {
-  if (HasScriptLoadContext() && GetScriptLoadContext()->mIsInline) {
-    return false;
-  }
-
-  return !mExpirationTime.IsExpired();
-}
-
 void ScriptLoadRequest::CacheEntryFound(LoadedScript* aLoadedScript) {
   MOZ_ASSERT(IsCheckingCache());
 
diff --git a/js/loader/ScriptLoadRequest.h b/js/loader/ScriptLoadRequest.h
@@ -107,8 +107,6 @@ class ScriptLoadRequest : public nsISupports,
   ModuleLoadRequest* AsModuleRequest();
   const ModuleLoadRequest* AsModuleRequest() const;
 
-  bool IsCacheable() const;
-
   CacheExpirationTime ExpirationTime() const { return mExpirationTime; }
 
   void SetMinimumExpirationTime(const CacheExpirationTime& aExpirationTime) {