[selectors] Now that scoped stylesheets are gone, we can kill scope-contained. DOM is the only consumer of scope-filtered, and they don't want the scoping element included, so fix that too.

Author: tabatkins

selectors/Overview.bs

@@ -633,35 +633,24 @@ Scoped Selectors</h3>
 	and may be either a true element (the <dfn export>scoping element</dfn>)
 	or a <dfn export lt="virtual scoping root">virtual</dfn> one (such as a <a interface>DocumentFragment</a>).
 
-	There are two <dfn export lt="scoping method | selector scoping method">scoping methods</dfn> for selectors:
-
-	<dl>
-		<dt><dfn export id="scope-contained" lt="scope-contained | scope-contained selector">scope-contained</dfn>
-		<dd>
-			With this method of scoping, selectors match as if
-			the <a>scoping root</a> were the root of the document:
-			all <a>compound selectors</a> must be represented within the scope.
-			(The '':root'' pseudo-class, however,
-			still only matches the actual root of the document.)
-
-		<dt><dfn export id="scope-filtered" lt="scope-filtered | scope-filtered selector">scope-filtered</dfn>
-		<dd>
-			With this method of scoping, a selector matches an element only if the element is within the scope,
-			even if other components of the selector are outside the scope.
-			(A <a>scoping element</a> is considered to be in scope.)
-	</dl>
+	When a selector is <a>scoped</a>,
+	it matches an element only if the element is a descendant of the <a>scoping root</a>.
+	(The rest of the selector can match unrestricted;
+	it's only the final matched elements that must be within the scope.)
 
 	<div class='example'>
 		For example,
 		the <code>element.querySelector()</code> function defined in [[DOM]]
-		allows the author to define a <a>scope-filtered</a> selector.
+		allows the author to evalute a <a>scoped</a> selector
+		relative to the <code>element</code> it's called on.
 
-		On the other hand, the selectors within an [[HTML5]] scoped stylesheet
-		define <a>scope-contained</a> selectors.
+		A call like <code highlight=js>widget.querySelector("a")</code>
+		will thus only find <{a}> elements inside of the <code>widget</code> element,
+		ignoring any other <{a}>s that might be scattered throughout the document.
 	</div>
 
-	Note: If there are no <a>:scope elements</a> when a selector is evaluated,
-	the <a>scoping root</a> acts like a <a>:scope element</a>.
+	Note: If the context does not explicitly define any <a>:scope elements</a> for the selector,
+	the <a>scoping root</a> is a <a>:scope element</a>.
 
 <h3 id="relative">
 Relative Selectors</h3>
@@ -677,7 +666,7 @@ Relative Selectors</h3>
 	However, it must be <a href="#absolutize">absolutized</a> before matching.
 
 	Relative selectors, once absolutized,
-	can additionally be <a>scope-contained</a> or <a>scope-filtered</a>.
+	can additionally be <a>scoped</a>.
 
 <h4 id='absolutizing'>
 Absolutizing a Relative Selector</h4>
@@ -3177,7 +3166,8 @@ Evaluating a Selector</h3>
 
 	<ul>
 		<li>
-			a <a>scoping method</a> and <a>scoping root</a>.
+			a <a>scoping root</a>,
+			indicating that the selector is <a>scoped</a>.
 			If not specified, the selector defaults to being unscoped.
 
 		<li>
@@ -3205,25 +3195,14 @@ Evaluating a Selector</h3>
 	provided to the algorithm,
 	and all their <a>descendants</a>.
 
-	If the selector is <a>scope-contained</a>,
-	the <a>selector match list</a> is immediately filtered
-	to contain only elements that are either the <a>scoping root</a>
-	or <a>descendants</a> of the <a>scoping root</a>.
-
 	The selector is processed from left to right in order,
 	with <a>simple selectors</a> filtering the <a>selector match list</a>,
 	and <a>combinators</a> and <a>pseudo-elements</a> changing the <a>selector match list</a> into something new.
-	If the selector is <a>scope-contained</a>
-	then after each <a>combinator</a>
-	the <a>selector match list</a> must be filtered
-	to contain only elements that are either the <a>scoping root</a>
-	or <a>descendants</a> of the <a>scoping root</a>.
 
 	If the selector is <a>scope-filtered</a>,
 	then after the selector is finished processing,
 	the <a>selector match list</a> must be filtered
-	to contain only elements that are either the <a>scoping root</a>
-	or <a>descendants</a> of the <a>scoping root</a>.
+	to contain only elements that are <a>descendants</a> of the <a>scoping root</a>.
 
 	After the selector is finished matching,
 	the <a>selector match list</a> must be filtered
@@ -3326,7 +3305,8 @@ Match a Selector Against A Tree</h3>
 
 	<ul>
 		<li>
-			A <a>scoping method</a> and <a>scoping root</a>.
+			A <a>scoping root</a>
+			indicating the selector is <a>scoped</a>.
 			If not specified,
 			the <var>selector</var> defaults to being unscoped.