From e91668d7f969bef6e88ee1a4fee881a40e6819b3 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Thu, 13 Jun 2019 18:09:44 -0700 Subject: [PATCH 1/3] Restore override URL concept for javascript: URLs This concept was deleted in 6440ccae73 along with "overridden overload", but it was discovered in #3989 that correct handling for javascript: URLs still depend on this concept. The spec around this area has changed quite a bit since then due to intermediate cleanups such as e13762fb62, so this is not a simple revert. Also, fix ungrammatical "append URL URL list" that was accidentally introduced in e13762fb62. Addresses some concern raised in #3989. --- source | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/source b/source index f3320584f81..ddf42d413cb 100644 --- a/source +++ b/source @@ -83493,9 +83493,11 @@ interface Location { // but see also Append the browsingContext's active - document's URL URL list.

+

  • Let address be browsingContext's active document's + URL.

    • + +

  • Append address to request's + URL list.

  • Let settings be browsingContext's active document's relevant settings object.

    • @@ -83527,6 +83529,9 @@ interface Location { // but see also     response body is not yet specified, pending further investigation into user agent behavior. See issue #1129.

    + +

    When it comes time to initialize the Document object, use + address as the override URL.

    @@ -83582,9 +83587,17 @@ interface Location { // but see also

    If request is non-null, then set - document's URL to request's - current URL.

    +
  • +

    If an override URL is set for this navigation, then set document's + URL to the override URL.

    + +

    An override URL is set when executing a javascript: URL request.

    +
    • + +

  • Otherwise, if request is non-null, then set document's URL to request's current URL.

  • Otherwise, set document's URL to response's URL.

    • From ee02d632a53bd22cb76cd8a4dd0065385b0570cb Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 30 Jun 2019 23:09:03 -0700 Subject: [PATCH 2/3] Revert "Restore override URL concept for javascript: URLs" This reverts commit e91668d7f969bef6e88ee1a4fee881a40e6819b3. --- source | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/source b/source index ddf42d413cb..f3320584f81 100644 --- a/source +++ b/source @@ -83493,11 +83493,9 @@ interface Location { // but see also     URL.

    - -

  • Append address to request's - URL list.

    • +

  • Append the browsingContext's active + document's URL URL list.

  • Let settings be browsingContext's active document's relevant settings object.

    • @@ -83529,9 +83527,6 @@ interface Location { // but see also     response body is not yet specified, pending further investigation into user agent behavior. See issue #1129.

    - -

    When it comes time to initialize the Document object, use - address as the override URL.

    @@ -83587,17 +83582,9 @@ interface Location { // but see also -

    If an override URL is set for this navigation, then set document's - URL to the override URL.

    - -

    An override URL is set when executing a javascript: URL request.

    - - -

  • Otherwise, if request is non-null, then set document's URL to request's current URL.

    • +

  • If request is non-null, then set + document's URL to request's + current URL.

  • Otherwise, set document's URL to response's URL.

    • From 6989167b4f8d13531b495357a1a14c1b8fceb11e Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 30 Jun 2019 23:06:36 -0700 Subject: [PATCH 3/3] Fix document URL setting for javascript: URLs A series of changes starting with 6440ccae73 which removed the override URL concept as well as intermediate cleanups such as e13762fb62 eroded the correctness of javascript: document URLs. Now it seems to be the case that fixing this typo restores the correct handling for such URLs. Addresses some concern raised in #3989. --- source | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source b/source index f3320584f81..c47807f5faf 100644 --- a/source +++ b/source @@ -83493,8 +83493,8 @@ interface Location { // but see also     Append the browsingContext's active - document's URL

    Append browsingContext's active + document's URL to request's URL list.

  • Let settings be browsingContext's active document's