tor-browser

commit 8bbc0555146c22a734be9b56040b77a671e07338
parent 8d56d54bd397c7533da83c40ff8e7a25542ff7a3
Author: Tooru Fujisawa <arai_a@mac.com>
Date:   Wed,  5 Nov 2025 04:09:45 +0000

Bug 1853173 - Part 2: Add tests for mixing cache for classic vs module. r=nbp

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

Diffstat:
M
dom/base/test/browser_script_loader_js_cache.js
 | 
248
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-

1 file changed, 247 insertions(+), 1 deletion(-)
diff --git a/dom/base/test/browser_script_loader_js_cache.js b/dom/base/test/browser_script_loader_js_cache.js
@@ -87,7 +87,7 @@ async function contentTask(test, item) {
 
   const script = content.document.createElement("script");
   script.id = "watchme";
-  if (test.module) {
+  if (test.module || item.module) {
     script.type = "module";
   }
   script.src = item.file;
@@ -810,3 +810,249 @@ add_task(async function testMemoryCache_modules() {
 
   await SpecialPowers.popPrefEnv();
 });
+
+add_task(async function testDiskCache_classicVsModules() {
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.expose_test_interfaces", true],
+      ["dom.script_loader.bytecode_cache.enabled", true],
+      ["dom.script_loader.bytecode_cache.strategy", 0],
+      ["dom.script_loader.experimental.navigation_cache", false],
+    ],
+  });
+
+  await runTests([
+    // A classic script's disk cache shouldn't be used by module.
+    // A large module file should be saved to the disk.
+    {
+      title: "classic script disk cache vs module",
+      items: [
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:disabled", "file_js_cache_large.js"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:disabled", "file_js_cache_large.js"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:disabled", "file_js_cache_large.js"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:register", "file_js_cache_large.js"),
+            ev("diskcache:saved", "file_js_cache_large.js", false),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            // This should load source.
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:register", "file_js_cache_large.js"),
+            ev("diskcache:saved", "file_js_cache_large.js", false),
+          ],
+        },
+      ],
+    },
+
+    {
+      title: "module script disk cache vs classic",
+      items: [
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:disabled", "file_js_cache_large.js"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:disabled", "file_js_cache_large.js"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:disabled", "file_js_cache_large.js"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:register", "file_js_cache_large.js"),
+            ev("diskcache:saved", "file_js_cache_large.js", false),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            // This should load source.
+            ev("load:source", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:register", "file_js_cache_large.js"),
+            ev("diskcache:saved", "file_js_cache_large.js", false),
+          ],
+        },
+      ],
+    },
+  ]);
+
+  await SpecialPowers.popPrefEnv();
+});
+
+add_task(async function testMemoryCache_classicVsModules() {
+  if (!AppConstants.NIGHTLY_BUILD) {
+    todo(false, "navigation cache is not yet enabled on non-nightly");
+    return;
+  }
+
+  await SpecialPowers.pushPrefEnv({
+    set: [
+      ["dom.expose_test_interfaces", true],
+      ["dom.script_loader.bytecode_cache.enabled", true],
+      ["dom.script_loader.bytecode_cache.strategy", 0],
+      ["dom.script_loader.experimental.navigation_cache", true],
+    ],
+  });
+
+  await runTests([
+    // A classic script's disk cache shouldn't be used by module.
+    // A large module file should be saved to the disk.
+    {
+      title: "classic script disk cache vs module",
+      items: [
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("memorycache:saved", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:memorycache", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:memorycache", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:memorycache", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:saved", "file_js_cache_large.js", false),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            // Memory cached item is classic.
+            // Module load should immediately fetch source from necko.
+            ev("load:source", "file_js_cache_large.js"),
+            // and save a separate item.
+            ev("memorycache:saved", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+      ],
+    },
+
+    {
+      title: "module script disk cache vs script",
+      items: [
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("memorycache:saved", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:memorycache", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:memorycache", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          module: true,
+          events: [
+            ev("load:memorycache", "file_js_cache_large.js"),
+            ev("evaluate:module", "file_js_cache_large.js"),
+            ev("diskcache:saved", "file_js_cache_large.js", false),
+          ],
+        },
+        {
+          file: "file_js_cache_large.js",
+          events: [
+            ev("load:source", "file_js_cache_large.js"),
+            ev("memorycache:saved", "file_js_cache_large.js"),
+            ev("evaluate:classic", "file_js_cache_large.js"),
+            ev("diskcache:noschedule"),
+          ],
+        },
+      ],
+    },
+  ]);
+
+  await SpecialPowers.popPrefEnv();
+});