tor-browser

commit 2cb4e84b914e3a552015fbf9cbffa46f46a88d8a
parent 25350f05abd9ae7b5b426da4f02214b019122c47
Author: Tooru Fujisawa <arai_a@mac.com>
Date:   Tue,  2 Dec 2025 01:25:52 +0000

Bug 2002199 - Part 3: Remove LoadedScriptDelegate::ConvertToCachedStencil. r=bthrall

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

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

2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
@@ -3343,12 +3343,12 @@ void ScriptLoader::TryCacheRequest(ScriptLoadRequest* aRequest) {
     cacheBehavior = CacheBehavior::Evict;
   }
 
+  LoadedScript* loadedScript = aRequest->getLoadedScript();
   if (cacheBehavior == CacheBehavior::Insert) {
-    auto loadData =
-        MakeRefPtr<ScriptLoadData>(this, aRequest, aRequest->getLoadedScript());
-    aRequest->ConvertToCachedStencil();
-    if (aRequest->getLoadedScript()->mFetchCount == 0) {
-      aRequest->getLoadedScript()->mFetchCount = 1;
+    auto loadData = MakeRefPtr<ScriptLoadData>(this, aRequest, loadedScript);
+    loadedScript->ConvertToCachedStencil();
+    if (loadedScript->mFetchCount == 0) {
+      loadedScript->mFetchCount = 1;
     }
     mCache->Insert(*loadData);
     LOG(("ScriptLoader (%p): Inserting in-memory cache for %s.", this,
@@ -3356,7 +3356,7 @@ void ScriptLoader::TryCacheRequest(ScriptLoadRequest* aRequest) {
     TRACE_FOR_TEST(aRequest, "memorycache:saved");
   } else {
     MOZ_ASSERT(cacheBehavior == CacheBehavior::Evict);
-    ScriptHashKey key(this, aRequest, aRequest->getLoadedScript());
+    ScriptHashKey key(this, aRequest, loadedScript);
     mCache->Evict(key);
     LOG(("ScriptLoader (%p): Evicting in-memory cache for %s.", this,
          aRequest->URI()->GetSpecOrDefault().get()));
diff --git a/js/loader/LoadedScript.h b/js/loader/LoadedScript.h
@@ -506,8 +506,6 @@ class LoadedScriptDelegate {
 
   void SetSerializedStencil() { GetLoadedScript()->SetSerializedStencil(); }
 
-  void ConvertToCachedStencil() { GetLoadedScript()->ConvertToCachedStencil(); }
-
   bool IsUTF16Text() const { return GetLoadedScript()->IsUTF16Text(); }
   bool IsUTF8Text() const { return GetLoadedScript()->IsUTF8Text(); }