From 59ede7dc815e53f12001b16d5ff630f0c56999db Mon Sep 17 00:00:00 2001
From: Benjamin VanderSloot <bvandersloot@mozilla.com>
Date: Tue, 3 Jun 2025 09:22:41 -0400
Subject: [PATCH 1/4] Add new environment settings object field for cookie
 layering work

See https://github.com/whatwg/html/issues/9000 for the broader context
---
 docs/index.bs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/index.bs b/docs/index.bs
index bf094df7..3ebf88d0 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -3065,6 +3065,8 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
               :: Return |serviceWorker|'s [=service worker/script url=].
               : The [=environment settings object/origin=]
               :: Return its registering [=/service worker client=]'s [=environment settings object/origin=].
+              : The [=environment settings object/cross site ancestry=]
+              :: Return its registering [=/service worker client=]'s [=environment settings object/cross site ancestry=].
               : The [=environment settings object/policy container=]
               :: Return |workerGlobalScope|'s [=WorkerGlobalScope/policy container=].
               : The [=environment settings object/time origin=]

From e44219a9e58be85fb58f17e286fbf2428943b9e0 Mon Sep 17 00:00:00 2001
From: Benjamin VanderSloot <bvandersloot@mozilla.com>
Date: Fri, 6 Jun 2025 11:50:38 -0400
Subject: [PATCH 2/4] Add a note

---
 docs/index.bs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/index.bs b/docs/index.bs
index 3ebf88d0..b1af47e8 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -3067,6 +3067,9 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
               :: Return its registering [=/service worker client=]'s [=environment settings object/origin=].
               : The [=environment settings object/cross site ancestry=]
               :: Return its registering [=/service worker client=]'s [=environment settings object/cross site ancestry=].
+                <div class="note">
+                  Note: If service workers are not partitioned by the [=environment settings object/cross site ancestry=], clients must include logic to use the initial  [=/http fetch=]'s [=/request=]'s [=request/client=]'s [=environment settings object/cross site ancestry=] when determining the "<code>SameSite</code>" mode.
+                </div>
               : The [=environment settings object/policy container=]
               :: Return |workerGlobalScope|'s [=WorkerGlobalScope/policy container=].
               : The [=environment settings object/time origin=]

From 047ecbd7d95ffa380ee91a9d0c12e7fd6119e882 Mon Sep 17 00:00:00 2001
From: Benjamin VanderSloot <bvandersloot@mozilla.com>
Date: Tue, 29 Jul 2025 14:07:17 -0400
Subject: [PATCH 3/4] Revert "Add a note"

This reverts commit e44219a9e58be85fb58f17e286fbf2428943b9e0.
---
 docs/index.bs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/index.bs b/docs/index.bs
index b1af47e8..3ebf88d0 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -3067,9 +3067,6 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
               :: Return its registering [=/service worker client=]'s [=environment settings object/origin=].
               : The [=environment settings object/cross site ancestry=]
               :: Return its registering [=/service worker client=]'s [=environment settings object/cross site ancestry=].
-                <div class="note">
-                  Note: If service workers are not partitioned by the [=environment settings object/cross site ancestry=], clients must include logic to use the initial  [=/http fetch=]'s [=/request=]'s [=request/client=]'s [=environment settings object/cross site ancestry=] when determining the "<code>SameSite</code>" mode.
-                </div>
               : The [=environment settings object/policy container=]
               :: Return |workerGlobalScope|'s [=WorkerGlobalScope/policy container=].
               : The [=environment settings object/time origin=]

From 433306aa0dad80662e43b3b16b0ab6ade6db4930 Mon Sep 17 00:00:00 2001
From: Benjamin VanderSloot <bvandersloot@mozilla.com>
Date: Tue, 29 Jul 2025 14:08:21 -0400
Subject: [PATCH 4/4] rename eso field

---
 docs/index.bs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.bs b/docs/index.bs
index 3ebf88d0..183a4e35 100644
--- a/docs/index.bs
+++ b/docs/index.bs
@@ -3065,8 +3065,8 @@ spec: storage; urlPrefix: https://storage.spec.whatwg.org/
               :: Return |serviceWorker|'s [=service worker/script url=].
               : The [=environment settings object/origin=]
               :: Return its registering [=/service worker client=]'s [=environment settings object/origin=].
-              : The [=environment settings object/cross site ancestry=]
-              :: Return its registering [=/service worker client=]'s [=environment settings object/cross site ancestry=].
+              : The [=environment settings object/has cross-site ancestor=]
+              :: Return its registering [=/service worker client=]'s [=environment settings object/has cross-site ancestor=].
               : The [=environment settings object/policy container=]
               :: Return |workerGlobalScope|'s [=WorkerGlobalScope/policy container=].
               : The [=environment settings object/time origin=]