Remove unsubscrube by attributes feature (#998)

Author: OrKoN

index.bs

@@ -1867,12 +1867,9 @@ remove event subscriptions identified by subscription IDs.
 
 #### The session.UnsubscribeByAttributesRequest Type #### {#type-session-UnsubscribeByAttributesRequest}
 
-Note: contexts param is deprecated and will be removed in the future versions.
-
 <pre class="cddl" data-cddl-module="remote-cddl">
 session.UnsubscribeByAttributesRequest = {
   events: [+text],
-  ? contexts: [+browsingContext.BrowsingContext],
 }
 </pre>
 
@@ -2180,9 +2177,6 @@ either globally or for a set of navigables.
 
 Issue: This needs to be generalised to work with realms too.
 
-Note: contexts parameter in UnsubscribeByAttributesRequest is deprecated
-and will be removed in the future versions.
-
 <dl>
    <dt>Command Type</dt>
    <dd>
@@ -2216,26 +2210,10 @@ The [=remote end steps=] with |session| and |command parameters| are:
       let |event names| be the [=set/union=] of |event names| and the result of
       [=trying=] to [=obtain a set of event names=] with |name|.
 
-   1. Let |top-level traversable context ids| be a [=/set=].
-
-   1. Let |input context ids| be [=set/create|create a set=] with |command parameters|[<code>contexts</code>].
-
-   1. If |input context ids| is not empty:
-
-      1. Let |navigables| be the result of [=trying=] to [=get valid navigables by ids=] with |input context ids|.
-
-      1. Set |top-level traversables| be [=get top-level traversables=] with |navigables|.
-
-      1. For each |navigable| in |top-level traversables|:
-
-         1. [=set/Append=] |navigable|'s [=navigable id=] to |top-level traversable context ids|.
-
    1. Let |new subscriptions| to be a [=/list=].
 
    1. Let |matched events| to be a [=/set=].
 
-   1. Let |matched contexts| to be a [=/set=].
-
    1. For each |subscription| of |session|'s [=subscriptions=]:
 
       1. If [=set/intersection=] of |subscription|'s [=subscription/event names=] and |event names| is an empty [=/set=]:
@@ -2244,83 +2222,32 @@ The [=remote end steps=] with |session| and |command parameters| are:
 
          1. [=Continue=].
 
-      1. If |top-level traversable context ids| is an empty [=/set=]:
-
-         1. If |subscription| is not [=subscription/global=]:
-
-            1. [=list/append=] |subscription| to |new subscriptions|.
-
-            1. [=Continue=].
-
-         1. Let |subscription event names| be [=set/clone=] of |subscription|'s [=subscription/event names=].
-
-         1. For each |event name| of |event names|:
-
-            1. If |subscription event names| [=set/contains=] |event name|:
-
-               1. [=list/Append=] |event name| to |matched events|.
+      1. If |subscription| is not [=subscription/global=]:
 
-               1. [=list/Remove=] |event name| from |subscription event names|.
-
-         1. If |subscription event names| is not empty:
-
-            1. Let |cloned subscription| be a [=subscription=] with
-               [=subscription/subscription id=] set to |subscription|'s [=subscription/subscription id=],
-               [=subscription/event names=] set to a new [=/set=] containing |subscription event names|.
-
-            1. [=list/append=] |cloned subscription| to |new subscriptions|.
-
-      1. Otherwise:
-
-        1. If |subscription| is [=subscription/global=]:
-
-          1. [=list/append=] |subscription| to |new subscriptions|.
-
-        1. Otherwise, if |subscription|'s [=subscription/user context ids=] is not empty, [=continue=].
-
-        1. Otherwise:
-
-          Note: unsubscribe by contexts is deprecated and will be removed in the future versions.
-
-          1. Let |event map| be an empty [=/map=].
-
-          1. For each |event name| in |subscription|'s [=subscription/event names=]:
-
-              1. Set |event map|[|event name|] to [=set/clone=] of |subscription|'s [=subscription/top-level traversable ids=].
-
-          1. For each |event name| in |event names|:
-
-              1. If |event map|[|event name|] does not exist,
-                 [=continue=].
-
-              1. For each |top-level traversable id| of |top-level traversable context ids|:
+         1. [=list/append=] |subscription| to |new subscriptions|.
 
-                 1. If |event map|[|event name|] [=set/contains=] |top-level traversable id|:
+         1. [=Continue=].
 
-                    1. [=list/Append=] |top-level traversable id| to |matched contexts|.
+      1. Let |subscription event names| be [=set/clone=] of |subscription|'s [=subscription/event names=].
 
-                    1. [=list/Append=] |event name| to |matched events|.
+      1. For each |event name| of |event names|:
 
-                    1. [=list/Remove=] |top-level traversable id| from |event map|[|event name|].
+         1. If |subscription event names| [=set/contains=] |event name|:
 
-              1. If |event map|[|event name|] is an empty [=/set=],
+            1. [=list/Append=] |event name| to |matched events|.
 
-                1. [=map/Remove=] |event map|[|event name|].
+            1. [=list/Remove=] |event name| from |subscription event names|.
 
-          1. For each |event name| → |remaining top-level traversable ids| in |event map|:
+      1. If |subscription event names| is not empty:
 
-            1. Let |partial subscription| be a [=subscription=] with
-               [=subscription/subscription id=] set to |subscription|'s [=subscription/subscription id=],
-               [=subscription/event names=] set to a new [=/set=] containing |event name|,
-               [=subscription/top-level traversable ids=] set to |remaining top-level traversable ids|.
+         1. Let |cloned subscription| be a [=subscription=] with
+            [=subscription/subscription id=] set to |subscription|'s [=subscription/subscription id=],
+            [=subscription/event names=] set to a new [=/set=] containing |subscription event names|.
 
-            1. [=list/append=] |partial subscription| to |new subscriptions|.
+         1. [=list/append=] |cloned subscription| to |new subscriptions|.
 
    1. If |matched events| is not [=set/equal=] to |event names|, return [=error=] with [=error code=] [=invalid argument=].
 
-   1. If |top-level traversable context ids| is not empty and |matched contexts| is not [=set/equal=] to
-      |top-level traversable context ids|, return [=error=] with [=error code=] [=invalid argument=].
-
    1. Set |session|'s [=subscriptions=] to |new subscriptions|.
 
 1. Otherwise: