Skip to content

Commit 5408e2e

Browse files
Editorial: Rename both controller variables in Handle Fetch algorithm. (#1705)
To make it clearer which controller is which, rename them to fetchController and abortController respectively.
1 parent 8ac9c66 commit 5408e2e

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

docs/index.bs

+8-9
Original file line numberDiff line numberDiff line change
@@ -3153,7 +3153,7 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
31533153

31543154
: Input
31553155
:: |request|, a [=/request=]
3156-
:: |controller|, a [=fetch controller=]
3156+
:: |fetchController|, a [=fetch controller=]
31573157
:: |useHighResPerformanceTimers|, a boolean
31583158
: Output
31593159
:: a [=/response=]
@@ -3217,7 +3217,7 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
32173217
1. Let |queue| be an empty [=queue=] of [=/response=].
32183218
1. Let |raceFetchController| be null.
32193219
1. Let |raceResponse| be a [=race response=] whose [=race response/value=] is "<code>pending</code>".
3220-
1. Run the following substeps [=in parallel=], but [=abort when=] |controller|'s [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>":
3220+
1. Run the following substeps [=in parallel=], but [=abort when=] |fetchController|'s [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>":
32213221
1. Set |raceFetchController| to the result of calling [=fetch=] given |request|, with [=fetch/processResponse=] set to the following steps given a [=/response=] |raceNetworkRequestResponse|:
32223222
1. If |raceNetworkRequestResponse|'s [=response/status=] is [=ok status=], then:
32233223
1. Set |raceResponse|'s [=race response/value=] to |raceNetworkRequestResponse|.
@@ -3244,7 +3244,7 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
32443244
1. [=header list/Append=] to |preloadRequestHeaders| a new [=header=] whose [=header/name=] is \`<code>Service-Worker-Navigation-Preload</code>\` and [=header/value=] is |registration|'s [=navigation preload header value=].
32453245
1. Set |preloadRequest|'s [=service-workers mode=] to "`none`".
32463246
1. Let |preloadFetchController| be null.
3247-
1. Run the following substeps [=in parallel=], but [=abort when=] |controller|'s [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>":
3247+
1. Run the following substeps [=in parallel=], but [=abort when=] |fetchController|'s [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>":
32483248
1. Set |preloadFetchController| to the result of [=Fetch|fetching=] |preloadRequest|.
32493249

32503250
To [=fetch/processResponse=] for |navigationPreloadResponse|, run these substeps:
@@ -3302,8 +3302,8 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
33023302
1. If |raceResponse| is not null, [=map/set=] |activeWorker|'s [=service worker/global object=]'s [=race response map=][|request|] to |raceResponse|.
33033303
1. [=Queue a task=] |task| to run the following substeps:
33043304
1. Let |e| be the result of <a>creating an event</a> with {{FetchEvent}}.
3305-
1. Let |controller| be a [=new=] {{AbortController}} object with |workerRealm|.
3306-
1. Let |requestObject| be the result of [=Request/creating=] a {{Request}} object, given |request|, a new {{Headers}} object's [=guard=] which is "`immutable`", |controller|'s [=AbortController/signal=], and |workerRealm|.
3305+
1. Let |abortController| be a [=new=] {{AbortController}} object with |workerRealm|.
3306+
1. Let |requestObject| be the result of [=Request/creating=] a {{Request}} object, given |request|, a new {{Headers}} object's [=guard=] which is "`immutable`", |abortController|'s [=AbortController/signal=], and |workerRealm|.
33073307
1. Initialize |e|’s {{Event/type}} attribute to {{fetch!!event}}.
33083308
1. Initialize |e|’s {{Event/cancelable}} attribute to true.
33093309
1. Initialize |e|’s {{FetchEvent/request}} attribute to |requestObject|.
@@ -3325,10 +3325,9 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
33253325
1. Else, [=ReadableStream/cancel=] |request|'s [=request/body=] with undefined.
33263326
1. If |response| is not null, then set |response|'s [=response/service worker timing info=] to |timingInfo|.
33273327
1. If |e|'s <a>canceled flag</a> is set, set |eventCanceled| to true.
3328-
1. If |controller| [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>", then:
3329-
1. Let |deserializedError| be a "{{AbortError}}" {{DOMException}}.
3330-
1. If |controller|'s [=fetch controller/serialized abort reason=] is non-null, set |deserializedError| to the result of calling [$StructuredDeserialize$] with |controller|'s [=fetch controller/serialized abort reason=] and |workerRealm|. If that threw an exception or returns undefined, then set |deserializedError| to a "{{AbortError}}" {{DOMException}}.
3331-
1. [=Queue a task=] to [=AbortController/signal abort=] on |controller| with |deserializedError|.
3328+
1. If |fetchController| [=fetch controller/state=] is "<code>terminated</code>" or "<code>aborted</code>", then:
3329+
1. Let |deserializedError| be the result of [=deserialize a serialized abort reason=] given |fetchController|'s [=fetch controller/serialized abort reason=] and |workerRealm|.
3330+
1. [=Queue a task=] to [=AbortController/signal abort=] on |abortController| with |deserializedError|.
33323331

33333332
If |task| is discarded, set |handleFetchFailed| to true.
33343333

0 commit comments

Comments
 (0)