From e01444f47a724bcabf0868c4f126799c878a3aae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= <nribaudo@igalia.com>
Date: Mon, 24 Jul 2023 08:15:05 +0200
Subject: [PATCH] Use correct settings object for modules imported in workers

Fixes #9535.
---
 source | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/source b/source
index 8b2539c3849..6d034b2e13a 100644
--- a/source
+++ b/source
@@ -103380,7 +103380,7 @@ document.querySelector("button").addEventListener("click", bound);
 
   <p>To <dfn data-x="fetch the descendants of and link a module script">fetch the descendants of and
   link</dfn> a <span>module script</span> <var>moduleScript</var>, given an <span>environment
-  settings object</span> <var>settingsObject</var>, a <span
+  settings object</span> <var>fetchClient</var>, a <span
   data-x="concept-request-destination">destination</span> <var>destination</var>, an
   algorithm <var>onComplete</var>, and an optional <span
   data-x="fetching-scripts-perform-fetch">perform the fetch hook</span> <var>performFetch</var>, run
@@ -103405,7 +103405,7 @@ document.querySelector("button").addEventListener("click", bound);
    </li>
 
    <li><p>Let <var>state</var> be <span>Record</span> { [[ParseError]]: null, [[Destination]]:
-   <var>destination</var>, [[PerformFetch]]: null, [[SettingsObject]]: <var>settingsObject</var>
+   <var>destination</var>, [[PerformFetch]]: null, [[FetchClient]]: <var>fetchClient</var>
    }.</p></li>
 
    <li><p>If <var>performFetch</var> was given, set <var>state</var>.[[PerformFetch]] to
@@ -103598,9 +103598,10 @@ document.querySelector("button").addEventListener("click", bound);
   </ol>
 
   <p>To <dfn>fetch a single imported module script</dfn>, given a <span>URL</span> <var>url</var>,
-  an <span>environment settings object</span> <var>settingsObject</var>, a <span
+  an <span>environment settings object</span> <var>fetchClient</var>, a <span
   data-x="concept-request-destination">destination</span> <var>destination</var>, a <span>script
-  fetch options</span> <var>options</var>, a <span data-x="concept-request-referrer">referrer</span>
+  fetch options</span> <var>options</var>, <span>environment settings object</span>
+  <var>settingsObject</var>, a <span data-x="concept-request-referrer">referrer</span>
   <var>referrer</var>, a <span>ModuleRequest Record</span> <var>moduleRequest</var>, an
   algorithm <var>onComplete</var>, and an optional <span
   data-x="fetching-scripts-perform-fetch">perform the fetch hook</span> <var>performFetch</var>, run
@@ -103620,7 +103621,7 @@ document.querySelector("button").addEventListener("click", bound);
    <var>moduleType</var> and <var>settingsObject</var> is false, then run <var>onComplete</var>
    given null, and return.</p></li>
 
-   <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>settingsObject</var>,
+   <li><p><span>Fetch a single module script</span> given <var>url</var>, <var>fetchClient</var>,
    <var>destination</var>, <var>options</var>, <var>settingsObject</var>, <var>referrer</var>,
    <var>moduleRequest</var>, false, and <var>onComplete</var>. If <var>performFetch</var> was given,
    pass it along as well.</p></li>
@@ -105858,21 +105859,23 @@ import "https://example.com/foo/../module2.mjs";</code></pre>
 
    <li><p>Let <var>destination</var> be <code data-x="">"script"</code>.</p></li>
 
+   <li><p>Let <var>fetchClient</var> be <var>settingsObject</var>.</p></li>
+
    <li>
     <p>If <var>loadState</var> is not undefined, then:</p>
 
     <ol>
      <li><p>Set <var>destination</var> to <var>loadState</var>.[[Destination]].</p></li>
 
-     <li><p>Set <var>settingsObject</var> <var>loadState</var>.[[SettingsObject]].</p></li>
+     <li><p>Set <var>fetchClient</var> <var>loadState</var>.[[FetchClient]].</p></li>
     </ol>
    </li>
 
    <li>
     <p><span>Fetch a single imported module script</span> given <var>url</var>,
-    <var>settingsObject</var>, <var>destination</var>, <var>fetchOptions</var>,
-    <var>fetchReferrer</var>, <var>moduleRequest</var>, and <var>onSingleFetchComplete</var> as
-    defined below. If <var>loadState</var> is not undefined and
+    <var>fetchClient</var>, <var>destination</var>, <var>fetchOptions</var>,
+    <var>settingsObject</var> <var>fetchReferrer</var>, <var>moduleRequest</var>, and
+    <var>onSingleFetchComplete</var> as defined below. If <var>loadState</var> is not undefined and
     <var>loadState</var>.[[PerformFetch]] is not null, pass <var>loadState</var>.[[PerformFetch]]
     along as well.</p>