diff --git a/index.bs b/index.bs index ea638529..8d545ea0 100644 --- a/index.bs +++ b/index.bs @@ -3086,23 +3086,7 @@ To get the navigable info given |navigable|,
-To await a navigation given |navigable|, |request|, |wait condition|, and optionally -|history handling| (default: "default") and |ignore cache| (default: false): - -1. Let |navigation id| be the string representation of a - [[!RFC9562|UUID]] based on truly random, or pseudo-random numbers. - -1. [=Navigate=] |navigable| with resource |request|, and using - |navigable|'s [=active document=] as the source - {{Document}}, with [=navigation id=] |navigation id|, and [=history - handling behavior=] |history handling|. If |ignore cache| is true, - the navigation must not load resources from the HTTP cache. - - Issue: property specify how the |ignore cache| flag works. This needs to - consider whether only the first load of a resource bypasses the cache - (i.e. whether this is like initially clearing the cache and proceeding like - normal), or whether resources not directly loaded by the HTML parser - (e.g. loads initiated by scripts or stylesheets) also bypass the cache. +To await a navigation given |navigation id| and |wait condition|: 1. Let (|event received|, |navigate status|) be [=await=] given «"navigation started", "navigation failed", @@ -4384,10 +4368,14 @@ The [=remote end steps=] with session and |command parameters| 1. If |url record| is failure, return [=error=] with [=error code=] [=invalid argument=]. -1. Let |request| be a new [=/request=] whose URL is |url record|. +1. Run [=navigate=] |navigable| to [=/URL=] |url| using + |navigable|'s [=active document=] as the source + {{Document}} with userInvolvement "browser UI" + until a [=navigation id=] |navigation id| is generated + and pause the [=Navigate=] algorithm until the [=await a navigation=] + steps are invoked. -1. Return the result of [=await a navigation=] with |navigable|, |request| and - |wait condition|. +1. Return the result of [=await a navigation=] with |navigation id| and |wait condition|.
@@ -4586,15 +4574,28 @@ The [=remote end steps=] with |command parameters| are: 1. Let |wait condition| be the value of the wait field of |command parameters| if present, or "none" otherwise. -1. Let |document| be |navigable|'s [=active document=]. +1. Let |url| be |navigable|'s [=active document=]'s URL. + +1. Run [=navigate=] |navigable| to [=/URL=] |url| using + |navigable|'s [=active document=] as the source + {{Document}} with userInvolvement "browser UI" + until a [=navigation id=] |navigation id| is generated + and pause the [=Navigate=] algorithm until the [=await a navigation=] + steps are invoked. -1. Let |url| be |document|'s URL. + If |ignore cache| is true, the navigation must not load resources from the HTTP cache. + + Issue: property specify how the |ignore cache| flag works. This needs to + consider whether only the first load of a resource bypasses the cache + (i.e. whether this is like initially clearing the cache and proceeding like + normal), or whether resources not directly loaded by the HTML parser + (e.g. loads initiated by scripts or stylesheets) also bypass the cache. -1. Let |request| be a new [=/request=] whose URL is |url|. + Issue: we should probably call the reload algorithm in the HTML spec + but it is missing required integration steps for WebDriver BiDi. -1. Return the result of [=await a navigation=] with |navigable|, |request|, |wait - condition|, history handling "reload", and ignore - cache |ignore cache|. +1. Return the result of [=await a navigation=] with |navigation id| and + |wait condition|.