[css-navigation-1] Allow urlpattern() in addition to route names.

(This is part of importing the history from WICG/declarative-partial-updates.)

Author: dbaron

css-navigation-1/Overview.bs

@@ -70,8 +70,9 @@ with <<route-condition>> defined as:
 	                     | <<route-in-parens>> [ and <<route-in-parens>> ]*
 	                     | <<route-in-parens>> [ or <<route-in-parens>> ]*
 	<dfn><<route-in-parens>></dfn> = ( <<route-condition>> ) | ( <<route-test>> ) | <<general-enclosed>>
-	<dfn><<route-test>></dfn> = <<route-name>> | <<route-keyword>> : <<route-name>>
+	<dfn><<route-test>></dfn> = <<route-location>> | <<route-keyword>> : <<route-location>>
 	<dfn><<route-keyword>></dfn> = at | from | to
+	<dfn><<route-location>></dfn> = <<route-name>> | <<urlpattern()>>
 	<!-- TODO(dbaron): Should this be <<ident>> or <<custom-ident>> ? -->
 	<dfn><<route-name>></dfn> = <<custom-ident>>
 </pre>
@@ -112,34 +113,31 @@ as follows:
 :: The result is the result of the child subexpression.
 
 : <<route-test>>
-::	: <<route-name>>
-	: at: <<route-name>>
+::	: <<route-location>>
+	: at: <<route-location>>
 	:: The result is true if
 		the document's [=Document/URL=] [=URL pattern/match|matches=]
-		the URL pattern of a route named <<route-name>>
-		declared in a <code highlight=html>&lt;script type=routemap></code>.
+		the [=route location URL pattern=] of <<route-location>>.
 
-	: from: <<route-name>>
+	: from: <<route-location>>
 	:: The result is true if
 		the [=document's navigation API=] of the document
 		is non-null,
 		its [=transition=] is non-null,
 		its [=from entry=]'s {{NavigationHistoryEntry/url}}
 		is non-null and
 		[=URL pattern/match|matches=]
-		the URL pattern of a route named <<route-name>>
-		declared in a <code highlight=html>&lt;script type=routemap></code>.
+		the [=route location URL pattern=] of <<route-location>>.
 
-	: to: <<route-name>>
+	: to: <<route-location>>
 	:: The result is true if
 		the [=document's navigation API=] of the document
 		is non-null,
 		its [=ongoing navigate event=] is non-null,
 		and its {{NavigateEvent/destination}}'s
 		{{NavigationDestination/url}}
 		[=URL pattern/match|matches=]
-		the URL pattern of a route named <<route-name>>
-		declared in a <code highlight=html>&lt;script type=routemap></code>.
+		the [=route location URL pattern=] of <<route-location>>.
 
 		<!--
 
@@ -160,10 +158,6 @@ as follows:
 	if you start a same-document navigation (e.g., with {{History/pushState}})
 	in the middle of a cross-document navigation.
 
-	ISSUE: Once routemaps are defined more formally,
-	this should be defined in terms of the routemap definition
-	instead of referring directly to URLPattern.
-
 : <<general-enclosed>>
 ::
 	The result is false.
@@ -172,7 +166,23 @@ as follows:
 	<span class='note'>It exists only for future-compatibility,
 	so that new syntax additions do not invalidate too much of a <<route-condition>> in older user agents.</span>
 
-Define a <dfn>document's navigation API</dfn> as the result of the following steps on <var>document</var>:
+The <dfn>route location URL pattern</dfn> of a <<route-location>>
+depends on the type of <<route-location>>:
+
+: <<route-name>>
+::	the URL pattern of a route named <<route-name>>
+	declared in a <code highlight=html>&lt;script type=routemap></code>.
+
+	ISSUE: Once routemaps are defined more formally,
+	this should be defined in terms of the routemap definition
+	instead of referring directly to URLPattern.
+
+: <<urlpattern()>>
+::	The [=URL pattern=] represented by the function; see
+	[=create a URL pattern for urlpattern()=].
+
+A <dfn>document's navigation API</dfn> is
+the result of the following steps on <var>document</var>:
 
 1. Let <var>window</var> be the {{Window}} whose [=associated Document=] is <var>document</var>, or null if there is no such {{Window}}.
 
@@ -183,3 +193,35 @@ Define a <dfn>document's navigation API</dfn> as the result of the following ste
 The condition of the ''@route'' rule
 is the result of the <<route-condition>> in its prelude.
 
+<h2 id="urlpattern-function">The ''urlpattern()'' function</h2>
+
+<!--
+
+NOTE:  We may eventually want to move this to css-values.
+
+If we do, the definition of "style resource base URL" probably doesn't need to be
+exported any more, since it was exported for this definition.
+
+-->
+
+The <dfn function>urlpattern()</dfn> function represents a [=URL pattern=],
+which can be used to match URLs.
+
+<pre class="prod def">
+<<urlpattern()>> = urlpattern( <<string>> )
+</pre>
+
+This function represents a [=URL pattern=] that can be created
+using the steps of the <dfn>create a URL pattern for urlpattern()</dfn> algorithm:
+
+1. Let <var>arg</var> be the <<string>> argument to the ''urlpattern()'' function.
+
+1. Let <var>baseURL</var> be the [=style resource base URL=] of
+	the rule or declaration block containing the ''urlpattern()'' function.
+
+1. Return the result of [=URL pattern/create|create a URL pattern=] given
+	<var>arg</var>, <var>baseURL</var>, and an empty [=map=].
+
+NOTE:  This function requires that its argument is quoted.
+This differs from the ''url()'' function,
+which allows its argument to be quoted or unquoted.