tor-browser

commit da2d987339663c20b4512fe7387f7fb060f4380d
parent dee0f66355afa91c2540e289c946141e20e79ecd
Author: Tooru Fujisawa <arai_a@mac.com>
Date:   Wed, 26 Nov 2025 04:10:51 +0000

Bug 1907011 - Part 3: Rename LoadedScript::DropBytecode to LoadedScript::DropSRIOrSRIAndSerializedStencil. r=nbp

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

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

3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp
@@ -593,7 +593,7 @@ void ScriptLoader::RunScriptWhenSafe(ScriptLoadRequest* aRequest) {
 }
 
 nsresult ScriptLoader::RestartLoad(ScriptLoadRequest* aRequest) {
-  aRequest->DropBytecode();
+  aRequest->DropSRIOrSRIAndSerializedStencil();
   TRACE_FOR_TEST(aRequest, "load:fallback");
 
   // Notify preload restart so that we can register this preload request again.
@@ -2538,7 +2538,7 @@ nsresult ScriptLoader::ProcessRequest(ScriptLoadRequest* aRequest) {
     // We received bytecode as input, thus we were decoding, and we will not be
     // encoding the bytecode once more. We can safely clear the content of this
     // buffer.
-    aRequest->DropBytecode();
+    aRequest->DropSRIOrSRIAndSerializedStencil();
   }
 
   return rv;
@@ -3667,20 +3667,20 @@ void ScriptLoader::UpdateDiskCache() {
     if (!EncodeAndCompress(fc, loadedScript, loadedScript->GetStencil(),
                            loadedScript->SRI(), compressed)) {
       loadedScript->DropDiskCacheReference();
-      loadedScript->DropBytecode();
+      loadedScript->DropSRIOrSRIAndSerializedStencil();
       TRACE_FOR_TEST(loadedScript, "diskcache:failed");
       continue;
     }
 
     if (!SaveToDiskCache(loadedScript, compressed)) {
       loadedScript->DropDiskCacheReference();
-      loadedScript->DropBytecode();
+      loadedScript->DropSRIOrSRIAndSerializedStencil();
       TRACE_FOR_TEST(loadedScript, "diskcache:failed");
       continue;
     }
 
     loadedScript->DropDiskCacheReference();
-    loadedScript->DropBytecode();
+    loadedScript->DropSRIOrSRIAndSerializedStencil();
     TRACE_FOR_TEST(loadedScript, "diskcache:saved");
   }
   mDiskCacheQueue.Clear();
@@ -3791,7 +3791,7 @@ void ScriptLoader::GiveUpDiskCaching() {
     TRACE_FOR_TEST(loadedScript, "diskcache:giveup");
 
     loadedScript->DropDiskCacheReference();
-    loadedScript->DropBytecode();
+    loadedScript->DropSRIOrSRIAndSerializedStencil();
   }
   mDiskCacheQueue.Clear();
 
diff --git a/dom/script/SharedScriptCache.cpp b/dom/script/SharedScriptCache.cpp
@@ -360,19 +360,19 @@ void SharedScriptCache::SaveToDiskCache() {
   for (const auto& item : mEncodeItems) {
     if (item.mCompressed.empty()) {
       item.mLoadedScript->DropDiskCacheReference();
-      item.mLoadedScript->DropBytecode();
+      item.mLoadedScript->DropSRIOrSRIAndSerializedStencil();
       TRACE_FOR_TEST(item.mLoadedScript, "diskcache:failed");
       continue;
     }
 
     if (!ScriptLoader::SaveToDiskCache(item.mLoadedScript, item.mCompressed)) {
       item.mLoadedScript->DropDiskCacheReference();
-      item.mLoadedScript->DropBytecode();
+      item.mLoadedScript->DropSRIOrSRIAndSerializedStencil();
       TRACE_FOR_TEST(item.mLoadedScript, "diskcache:failed");
     }
 
     item.mLoadedScript->DropDiskCacheReference();
-    item.mLoadedScript->DropBytecode();
+    item.mLoadedScript->DropSRIOrSRIAndSerializedStencil();
     TRACE_FOR_TEST(item.mLoadedScript, "diskcache:saved");
   }
 
diff --git a/js/loader/LoadedScript.h b/js/loader/LoadedScript.h
@@ -282,7 +282,7 @@ class LoadedScript : public nsIMemoryReporter {
     return mSRIAndBytecode.empty();
   }
 
-  void DropBytecode() {
+  void DropSRIOrSRIAndSerializedStencil() {
     MOZ_ASSERT(CanHaveSRIOnly() || CanHaveSRIAndSerializedStencil());
     mSRIAndBytecode.clearAndFree();
   }
@@ -565,7 +565,9 @@ class LoadedScriptDelegate {
     GetLoadedScript()->SetSRILength(sriLength);
   }
 
-  void DropBytecode() { GetLoadedScript()->DropBytecode(); }
+  void DropSRIOrSRIAndSerializedStencil() {
+    GetLoadedScript()->DropSRIOrSRIAndSerializedStencil();
+  }
 
   bool HasStencil() const { return GetLoadedScript()->HasStencil(); }
   Stencil* GetStencil() const { return GetLoadedScript()->GetStencil(); }