From d5008434d03d1e95672b91828df0cb8913d0ce6d Mon Sep 17 00:00:00 2001 From: Alex Rudenko Date: Mon, 13 Jan 2025 13:17:12 +0100 Subject: [PATCH 1/5] Consistently use navigables for integration with WebDriver BiDi --- source | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/source b/source index 53c89f6498a..3cf812dac4c 100644 --- a/source +++ b/source @@ -100154,7 +100154,7 @@ location.href = '#foo';

  • If navigable's active document's unload counter is greater than 0, then invoke WebDriver BiDi navigation - failed with a WebDriver BiDi navigation status whose with navigable a WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and params given navigable.

  • Invoke WebDriver BiDi navigation started with - targetBrowsingContext, and a new WebDriver BiDi navigation status whose + navigable, and a new WebDriver BiDi navigation status whose id is navigationId, status is "pending", and

    1. Invoke WebDriver BiDi navigation failed with - targetBrowsingContext and a new WebDriver BiDi navigation status whose + navigable and a new WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and

      1. Invoke WebDriver BiDi navigation failed with - targetBrowsingContext and a new WebDriver BiDi navigation status + navigable and a new WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and navigable, historyEntry, entryToReplace, historyHandling, and userInvolvement.

        2. -

      2. Invoke WebDriver BiDi fragment navigated with navigable's active browsing context and a new WebDriver BiDi navigation - status whose id is navigationId, +

      3. Invoke WebDriver BiDi fragment navigated with navigable + and a new WebDriver BiDi navigation status whose + id is navigationId, url is url, and status is "complete".

        4. @@ -102038,7 +102038,7 @@ location.href = '#foo'; data-x="navigation-params-reserved-environment">reserved environment.

      4. Invoke WebDriver BiDi navigation failed with - currentBrowsingContext and a new WebDriver BiDi navigation status + navigable and a new WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and data-x="navigation-params-response">response as a download.

      5. Invoke WebDriver BiDi download started with - currentBrowsingContext and a new WebDriver BiDi navigation status + navigable and a new WebDriver BiDi navigation status whose id is navigationId, status is "complete", and is non-null, then:

          -

        1. Invoke WebDriver BiDi navigation aborted with document's browsing context, and a new WebDriver BiDi navigation - status whose id is - document's during-loading navigation +

        2. Invoke WebDriver BiDi navigation aborted with navigable, + and a new WebDriver BiDi navigation status whose + id is document's + during-loading navigation ID for WebDriver BiDi, status is "canceled", and url is document's Date: Tue, 14 Jan 2025 17:03:11 +0100 Subject: [PATCH 2/5] add missing and --- source | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source b/source index 3cf812dac4c..1a3efd5ed1c 100644 --- a/source +++ b/source @@ -100154,8 +100154,8 @@ location.href = '#foo';

        3. If navigable's active document's unload counter is greater than 0, then invoke WebDriver BiDi navigation - failed with navigable a WebDriver BiDi navigation status whose id is navigationId, with navigable, and a WebDriver BiDi navigation status + whose id is navigationId, status is "canceled", and url is url, and return.

          4. From f170077e6e347fd9c46b95e2ea110089880d8e85 Mon Sep 17 00:00:00 2001 From: Alex Rudenko Date: Tue, 14 Jan 2025 17:05:02 +0100 Subject: [PATCH 3/5] make commas consistent --- source | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source b/source index 1a3efd5ed1c..235494fdb07 100644 --- a/source +++ b/source @@ -100154,7 +100154,7 @@ location.href = '#foo';

        4. If navigable's active document's unload counter is greater than 0, then invoke WebDriver BiDi navigation - failed with navigable, and a WebDriver BiDi navigation status + failed with navigable and a WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and params given navigable.

        5. Invoke WebDriver BiDi navigation started with - navigable, and a new WebDriver BiDi navigation status whose + navigable and a new WebDriver BiDi navigation status whose id is navigationId, status is "pending", and is non-null, then:

            -

          1. Invoke WebDriver BiDi navigation aborted with navigable, +

          2. Invoke WebDriver BiDi navigation aborted with navigable and a new WebDriver BiDi navigation status whose id is document's during-loading navigation From a65618bd8b110ce6ef88f9cf35f70240b9054f91 Mon Sep 17 00:00:00 2001 From: Alex Rudenko Date: Wed, 15 Jan 2025 09:14:26 +0100 Subject: [PATCH 4/5] fix unused vars and undefined navigable --- source | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/source b/source index 235494fdb07..8b6d62f11c7 100644 --- a/source +++ b/source @@ -100228,9 +100228,6 @@ location.href = '#foo'; navigable's is delaying load events to true.

            3. -

          3. Let targetBrowsingContext be navigable's active browsing context.

            4. -

          4. Let targetSnapshotParams be the result of snapshotting target snapshot params given navigable.

            5. @@ -101860,9 +101857,6 @@ location.href = '#foo'; navigationParams's response is non-null.

            -

          5. Let currentBrowsingContext be navigable's active browsing context.

            6. -

          6. Let documentResource be entry's document state's resource.

            7. @@ -106046,9 +106040,9 @@ new PaymentRequest(…); // Allowed to use navigation ID for WebDriver BiDi is non-null, then:

              -

            1. Invoke WebDriver BiDi navigation aborted with navigable - and a new WebDriver BiDi navigation status whose - id is document's +

            2. Invoke WebDriver BiDi navigation aborted with + document's node navigable and a new WebDriver BiDi navigation status + whose id is document's during-loading navigation ID for WebDriver BiDi, status is "canceled", and Date: Wed, 15 Jan 2025 17:34:56 +0900 Subject: [PATCH 5/5] Run specfmt --- source | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/source b/source index 8b6d62f11c7..29986f3c91e 100644 --- a/source +++ b/source @@ -100154,8 +100154,8 @@ location.href = '#foo';

            3. If navigable's active document's unload counter is greater than 0, then invoke WebDriver BiDi navigation - failed with navigable and a WebDriver BiDi navigation status - whose id is navigationId, with navigable and a WebDriver BiDi navigation status whose + id is navigationId, status is "canceled", and url is url, and return.

              4. @@ -100231,10 +100231,9 @@ location.href = '#foo';

            4. Let targetSnapshotParams be the result of snapshotting target snapshot params given navigable.

              5. -

            5. Invoke WebDriver BiDi navigation started with - navigable and a new WebDriver BiDi navigation status whose - id is navigationId, status is "

              Invoke WebDriver BiDi navigation started with navigable and a new + WebDriver BiDi navigation status whose id + is navigationId, status is "pending", and url is url.

              6. @@ -100243,9 +100242,9 @@ location.href = '#foo'; data-x="">traversal", then:

                -

              1. Invoke WebDriver BiDi navigation failed with - navigable and a new WebDriver BiDi navigation status whose - id is navigationId,

                Invoke WebDriver BiDi navigation failed with navigable and a new + WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and url is url.

                2. @@ -100348,9 +100347,9 @@ location.href = '#foo'; navigation is no longer navigationId, then:

                  -

                1. Invoke WebDriver BiDi navigation failed with - navigable and a new WebDriver BiDi navigation status - whose id is navigationId,

                  Invoke WebDriver BiDi navigation failed with navigable and a + new WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and url is url.

                  2. @@ -101046,10 +101045,10 @@ location.href = '#foo'; navigable, historyEntry, entryToReplace, historyHandling, and userInvolvement.

                  -

                2. Invoke WebDriver BiDi fragment navigated with navigable - and a new WebDriver BiDi navigation status whose - id is navigationId, - url is url, and

                  Invoke WebDriver BiDi fragment navigated with navigable and a + new WebDriver BiDi navigation status whose id is navigationId, url is url, and status is "complete".

                @@ -102031,9 +102030,9 @@ location.href = '#foo'; steps for navigationParams's reserved environment.

                -

              2. Invoke WebDriver BiDi navigation failed with - navigable and a new WebDriver BiDi navigation status - whose id is navigationId,

                Invoke WebDriver BiDi navigation failed with navigable and a + new WebDriver BiDi navigation status whose id is navigationId, status is "canceled", and url is navigationParams's

              3. Handle navigationParams's response as a download.

                4. -

              4. Invoke WebDriver BiDi download started with - navigable and a new WebDriver BiDi navigation status - whose id is navigationId,

                Invoke WebDriver BiDi download started with navigable and a + new WebDriver BiDi navigation status whose id is navigationId, status is "complete", and url is navigationParams's is non-null, then:

                  -

                1. Invoke WebDriver BiDi navigation aborted with - document's node navigable and a new WebDriver BiDi navigation status - whose id is document's - during-loading navigation - ID for WebDriver BiDi, status is "

                  Invoke WebDriver BiDi navigation aborted with document's + node navigable and a new WebDriver BiDi navigation status whose id is document's during-loading navigation ID for WebDriver BiDi, + status is "canceled", and url is document's URL.