From 80043ef46f931e2273432ddc4c069dc5fd4967f3 Mon Sep 17 00:00:00 2001
From: Noam Rosenthal <noamr@users.noreply.github.com>
Date: Wed, 21 Jul 2021 12:27:53 +0100
Subject: [PATCH] Update marking of navigation timing to include service worker
 timing

Amend the parameters passed when creating the navigation timing info entry to include the service worker timing info. Also, pass 0 for redirectCount When cross-origin redirects occurred as part of the navigation.

See also https://github.com/w3c/navigation-timing/pull/143 and https://github.com/w3c/ServiceWorker/pull/1575.
---
 source | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/source b/source
index 1446967470d..c8e8092079b 100644
--- a/source
+++ b/source
@@ -2508,6 +2508,7 @@ a.setAttribute('href', 'https://example.com/'); // change the content attribute
        <li><dfn data-x="concept-internal-response" data-x-href="https://fetch.spec.whatwg.org/#concept-internal-response">internal response</dfn></li>
        <li><dfn data-x="concept-response-location-url" data-x-href="https://fetch.spec.whatwg.org/#concept-response-location-url">location URL</dfn></li>
        <li><dfn data-x="concept-response-timing-info" data-x-href="https://fetch.spec.whatwg.org/#concept-response-timing-info">timing info</dfn></li>
+       <li><dfn data-x="concept-response-service-worker-timing-info" data-x-href="https://fetch.spec.whatwg.org/#response-service-worker-timing-info">service worker timing info</dfn></li>
       </ul>
      </li>
      <li>
@@ -87437,12 +87438,17 @@ interface <dfn interface>Location</dfn> { // but see also <a href="#the-location
     </dl>
    </li>
 
+   <li><p>Let <var>redirectCount</var> be 0 if <var>navigationParams</var>'s <span
+   data-x="navigation-params-has-cross-origin-redirects">has cross-origin redirects</span> is true;
+   otherwise <var>navigationParams</var>'s <span data-x="navigation-params-request">request</span>'s
+   <span data-x="concept-request-redirect-count">redirect count</span>.
+
    <li><p><span>Create the navigation timing entry</span> for <var>document</var>, with
    <var>navigationParams</var>'s <span data-x="navigation-params-response">response</span>'s <span
-   data-x="concept-response-timing-info">timing info</span>, <var>navigationParams</var>'s <span
-   data-x="navigation-params-request">request</span>'s <span
-   data-x="concept-request-redirect-count">redirect count</span>, and
-   <var>navigationType</var>.</p></li>
+   data-x="concept-response-timing-info">timing info</span>,
+   <span data-x="navigation-params-response">response</span>'s <span
+   data-x="concept-response-service-worker-timing-info">service worker timing info</span>,
+   <var>redirectCount</var>, and <var>navigationType</var>.</p></li>
 
    <li>
     <p>If <var>navigationParams</var>'s <span data-x="navigation-params-response">response</span>