Skip to content

Commit 184be2f

Browse files
hiroshige-gdomenic
authored andcommitted
Use fetch client settings object for fetching dependency modules
Fixes #3757, by plumbing through the appropriate environment settings object into all the algorithms instead of trying to use the module script's settings object.
1 parent c50e528 commit 184be2f

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

source

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24318,8 +24318,8 @@ document.body.appendChild(wbr);</pre>
2431824318
<li><p>Let <var>visited set</var> be « <var>url</var> ».</p></li>
2431924319

2432024320
<li><p><span data-x="fetch the descendants of and instantiate a module script">Fetch the
24321-
descendants of and instantiate</span> <var>result</var> given <var>destination</var> and
24322-
<var>visited set</var>.</p></li>
24321+
descendants of and instantiate</span> <var>result</var> given <var>settings object</var>,
24322+
<var>destination</var>, and <var>visited set</var>.</p></li>
2432324323
</ol>
2432424324

2432524325
<p class="note">Generally, performing these steps will be beneficial for performance, as it
@@ -58217,10 +58217,10 @@ o............A....e
5821758217
script</span> to null and return; <span>the script is ready</span>.</p></li>
5821858218

5821958219
<li><p><span data-x="fetch the descendants of and instantiate a module script">Fetch the
58220-
descendants of and instantiate</span> <var>script</var>, given the destination "<code
58221-
data-x="">script</code>". When this asynchronously completes, set <span
58222-
data-x="concept-script-script">the script's script</span> to the result. At that time,
58223-
<span>the script is ready</span>.</p></li>
58220+
descendants of and instantiate</span> <var>script</var>, given <var>settings object</var>
58221+
and the destination "<code data-x="">script</code>". When this asynchronously completes,
58222+
set <span data-x="concept-script-script">the script's script</span> to the result. At
58223+
that time, <span>the script is ready</span>.</p></li>
5822458224
</ol>
5822558225
</dd>
5822658226
</dl>
@@ -86847,9 +86847,9 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
8684786847

8684886848
<li><p>If the <var>top-level module fetch</var> flag is set, <span data-x="fetch the descendants
8684986849
of and instantiate a module script">fetch the descendants of and instantiate</span>
86850-
<var>result</var> given <var>destination</var> and <var>visited set</var>. Otherwise,
86851-
<span data-x="fetch the descendants of a module script">fetch the descendants of</span>
86852-
<var>result</var> given the same arguments.</p></li>
86850+
<var>result</var> given <var>fetch client settings object</var>, <var>destination</var>, and
86851+
<var>visited set</var>. Otherwise, <span data-x="fetch the descendants of a module script">fetch
86852+
the descendants of</span> <var>result</var> given the same arguments.</p></li>
8685386853

8685486854
<li><p>When the appropriate algorithm asynchronously completes with <var>final result</var>,
8685586855
asynchronously complete this algorithm with <var>final result</var>.</p></li>
@@ -86947,9 +86947,9 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
8694786947
</ol>
8694886948

8694986949
<p>To <dfn>fetch the descendants of a module script</dfn> <var>module script</var>, given a
86950-
<var>destination</var> and a <var>visited set</var>, run these steps. The algorithm will
86951-
asynchronously complete with either null (on failure) or with <var>module script</var> (on
86952-
success).</p>
86950+
<var>fetch client settings object</var>, a <var>destination</var>, and a <var>visited set</var>,
86951+
run these steps. The algorithm will asynchronously complete with either null (on failure) or
86952+
with <var>module script</var> (on success).</p>
8695386953

8695486954
<ol>
8695586955
<li><p>If <var>module script</var>'s <span data-x="concept-script-record">record</span> is null,
@@ -86997,11 +86997,10 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
8699786997
<li>
8699886998
<p><span data-x="list iterate">For each</span> <var>url</var> in <var>urls</var>, perform the
8699986999
<span>internal module script graph fetching procedure</span> given <var>url</var>,
87000-
<var>module script</var>'s <span>settings object</span>, <var>destination</var>,
87001-
<var>options</var>, <var>module script</var>'s <span>settings object</span>,
87002-
<var>visited set</var>, <var>module script</var>'s <span
87003-
data-x="concept-script-base-url">base URL</span>, and with the <var>top-level module fetch</var>
87004-
flag unset. If the caller of this algorithm specified custom <span
87000+
<var>fetch client settings object</var>, <var>destination</var>, <var>options</var>, <var>module
87001+
script</var>'s <span>settings object</span>, <var>visited set</var>, <var>module script</var>'s
87002+
<span data-x="concept-script-base-url">base URL</span>, and with the <var>top-level module
87003+
fetch</var> flag unset. If the caller of this algorithm specified custom <span
8700587004
data-x="fetching-scripts-perform-fetch">perform the fetch</span> steps, pass those along
8700687005
while performing the <span>internal module script graph fetching procedure</span>.</p>
8700787006

@@ -87019,15 +87018,16 @@ interface <dfn>ApplicationCache</dfn> : <span>EventTarget</span> {
8701987018
</ol>
8702087019

8702187020
<p>To <dfn>fetch the descendants of and instantiate a module script</dfn> <var>module
87022-
script</var>, given a <var>destination</var> and an optional <var>visited set</var>, run these
87023-
steps. The algorithm will asynchronously complete with either null (on failure) or with
87024-
<var>module script</var> (on success).</p>
87021+
script</var>, given a <var>fetch client settings object</var>, a <var>destination</var>, and an
87022+
optional <var>visited set</var>, run these steps. The algorithm will asynchronously complete with
87023+
either null (on failure) or with <var>module script</var> (on success).</p>
8702587024

8702687025
<ol>
8702787026
<li><p>If <var>visited set</var> was not given, let it be an empty <span>set</span>.</p></li>
8702887027

8702987028
<li><p><span data-x="fetch the descendants of a module script">Fetch the descendants of</span>
87030-
<var>module script</var>, given <var>destination</var> and <var>visited set</var>.</p></li>
87029+
<var>module script</var>, given <var>fetch client settings object</var>, <var>destination</var>,
87030+
and <var>visited set</var>.</p></li>
8703187031

8703287032
<li><p>Return from this algorithm, and run the following steps when <span data-x="fetch the
8703387033
descendants of a module script">fetching the descendants of a module script</span> asynchronously

0 commit comments

Comments
 (0)