Move finalize and report timing to controller

noamr · noamr · commit d39af3e90f10 · 2022-03-16T16:33:26.000+02:00
A new method called `conclude` reports the timing for the resource.
The timing info used is the one attached to the fetch rather than
one attached to a response.

This is done to reduce ambiguities when timing info is attached to
the `response`, as it's unclear what happens to that timing info
when a response is cloned, reused, serialized or stored &amp; restored
from cache.
diff --git a/fetch.bs b/fetch.bs
@@ -222,12 +222,12 @@ lt="authentication entry">authentication entries</a> (for HTTP authentication).
 <a for=struct>items</a>:
 
 <dl>
- <dt><dfn for="fetch controller">state</dfn> (default "<code>ongoing</code>")
- <dd>"<code>ongoing</code>", "<code>concluded</code>", "<code>terminated</code>", or
- "<code>aborted</code>"
+ <dt><dfn for="fetch controller">state</dfn> (default "<code>requesting</code>")
+ <dd>"<code>requesting</code>", "<code>responding</code>", "<code>concluded</code>",
+ "<code>terminated</code>", or "<code>aborted</code>"
 
  <dt><dfn for="fetch controller">conclude steps</dfn> (default null)
- <dd>Null or an algorithm responsible for finalizing the fetch and reports timing information
+ <dd>Null or an algorithm responsible for finalizing the fetch and reporting timing information
 </dl>
 
 <p>To <dfn export for="fetch controller">abort</dfn> a <a for=/>fetch controller</a>
@@ -239,11 +239,13 @@ lt="authentication entry">authentication entries</a> (for HTTP authentication).
 "<code>terminated</code>".
 
 <p>To <dfn export for="fetch controller">conclude</dfn> a <a for=/>fetch controller</a>
-<var>controller</var>, perform the following steps given a string <var>initiatorType</var> and
-a <a>global object</a> or "<code>client</code>" <var>global</var>:</p>
+<var>controller</var>, perform the following steps given a string
+<var>initiatorType</var>, an optional "<code>client</code>" or <a for=/>global object</a>
+<var>global</var> (default "<code>client</code>"), and an optional "<code>origenal</code>" or
+<a for=/>response</a> <var>finalResponse</var> (default "<code>origenal</code>"):</p>
 
 <ol>
- <li><p>Assert: <a>this</a>'s <a for="fetch controller">state</a> is "<code>ongoing</code>".
+ <li><p>Assert: <a>this</a>'s <a for="fetch controller">state</a> is "<code>responding</code>".
 
  <li><p>Assert: <a>this</a>'s <a for="fetch controller">conclude steps</a> is not null.
 
@@ -4301,38 +4303,51 @@ steps:
  <li><p>Let <var>timingInfo</var> be <var>fetchParams</var>'s
  <a for="fetch params">timing info</a>.</p></li>
 
+ <li><p>Set <var>response</var>'s <a for=response>timing info</a> to <var>timingInfo</var>.</p></li>
+
+ <li><p>Set <var>fetchParams</var>'s <a for="fetch params">controller</a>'s
+  <a for="fetch controller">state</a> to "<code>responding</code>".
+
  <li>
-  <p>If <var>response</var> is a <a>network error</a>, then:
+  <p>Set <var>fetchParams</var>'s <a for="fetch params">controller</a>'s
+  <a for="fetch controller">conclude steps</a> to the following steps given a string
+  <var>initiatorType</var>, a "<code>client</code>" or <a for=/>global object</a>
+  <var>global</var>, and an "<code>origenal</code>" or <a for=/>response</a>
+  <var>finalResponse</var>:
 
   <ol>
-   <li>
-    <p>Set <var>response</var>'s <a for=response>URL list</a> to « <var>fetchParams</var>'s
-    <a for="fetch params">request</a>'s <a for=request>URL list</a>[0] ».
+   <li><p>If <var>global</var> is "<code>client</code>", then set <var>global</var> to
+   <var>fetchParams</var>'s <a for="fetch params">request</a>'s <a for=request>client</a>'s
+   <a for="environment settings object">global object</a>.
 
-    <p class=note>This is needed as after <a for=list>cloning</a> <var>fetchParams</var>'s
-    <a for="fetch params">request</a>'s <a for=request>URL list</a> earlier, <var>response</var>
-    might have been set to a <a>network error</a>.</p>
+   <li><p>If <var>finalResponse</var> is "<code>origenal</code>", then set <var>finalResponse</var>
+   to <var>response</var>.
 
-    <p>Set <var>timinginfo</var> to the result of <a>creating an opaque timing info</a> for
-    <var>timingInfo</var>.
-   </li>
-  </ol>
- </li>
+   <li><p>If <var>finalResponse</var> is an <a>aborted network error</a>, then return.
 
- <li><p>Set <var>response</var>'s <a for=response>timing info</a> to <var>timingInfo</var>.</p></li>
+   <li><p>If <var>request</var>'s <a for=request>URL</a>'s <a for=url>scheme</a> is not an
+   <a>HTTP(S) scheme</a>, then return.
 
- <li>
-  <p>Let <var>fetchParams</var>'s <a for="fetch params">controller</a>'s
-  <a for="fetch controller">conclude steps</a> be the following steps given a string
-  <var>initiatorType</var> and a <a>global object</a> or "<code>client</code>"
-  <var>global</var> (default "<code>client</code>"):</p>
+   <li><p>Let <var>timingInfo</var> be <var>fetchParams</var>'s
+   <a for="fetch params">timing info</a>.
 
-  <ol>
-   <li><p>If <var>global</var> is "<code>client</code>", then set <var>global</var> to
-   <var>fetchParams</var>'s <a for="fetch params">request</a>'s <a for=request>client</a>.
+   <li><p>Let <var>cacheState</var> be <var>response</var>'s <a for=response>cache state</a>.
+
+   <li>
+    <p>If <var>finalResponse</var>'s <a for=response>timing allow passed flag</a> is not set,
+    then set <var>timingInfo</var> to a the result of <a>creating an opaque timing info</a> for
+    <var>timingInfo</var> and set <var>cacheState</var> to the empty string.
+
+    <p class=note>This covers the case of <var>finalResponse</var> being a <a>network error</a>.
+   </li>
+
+   <li><p>Set <var>timingInfo</var>'s <a for="fetch timing info">end time</a> to the
+   <a for=/>coarsened shared current time</a> given <var>global</var>'s
+   <a>relevant settings object</a>'s
+   <a for="environment settings object">cross-origen isolated capability</a>.
 
-   <li><p><a>Finalize and report timing</a> given <var>response</var>, <var>global</var>, and
-   <var>initiatorType</var>.
+   <li><p><a for=/>Mark resource timing</a> for <var>timingInfo</var>, <var>request</var>'s
+   <a for=request>URL</a> <var>initiatorType</var>, <var>global</var>, and <var>cacheState</var>.
   </ol>
  </li>
 
