Revert to the 'activated reader objects' internal slot and allow multiple readers

Signed-off-by: Zoltan Kis <[email protected]>

Author: zolkis

index.html

@@ -2079,11 +2079,10 @@ <h2>The <dfn>record type</dfn> string</h2>
       </td>
      </tr>
      <tr>
-      <td><dfn>[[\PendingRead]]</dfn></td>
+      <td><dfn>[[\ActivatedReaderList]]</dfn></td>
       <td>empty <a>set</a></td>
       <td>
-        A &lt;|promise:Promise|, |reader:NDEFReader|&gt; tuple where |promise|
-        holds a {{Promise}} and |reader| holds an {{NDEFReader}}.
+        A <a>set</a> of {{NDEFReader}} instances.
       </td>
      </tr>
      <tr>
@@ -2097,8 +2096,8 @@ <h2>The <dfn>record type</dfn> string</h2>
     </tbody>
   </table>
   <p>
-    The <dfn>pending read tuple</dfn> is the value of the
-    <a>[[\PendingRead]]</a> internal slot.
+    The <dfn>activated reader objects</dfn> is the value of the
+    <a>[[\ActivatedReaderList]]</a> internal slot.
   </p>
   <p>
     The <dfn>pending write tuple</dfn> is the value of the
@@ -2225,31 +2224,6 @@ <h2>The <dfn>record type</dfn> string</h2>
   </div>
   </section>
 
-  <section><h3>Aborting pending scan operation</h3>
-  <div>
-    To attempt to <dfn>abort a pending scan operation</dfn>,
-    run the following steps:
-    <ol class=algorithm>
-      <li>
-        If there is no <a>pending read tuple</a> |tuple|, abort these steps.
-      </li>
-      <li>
-        If |tuple|'s reader has already initiated an ongoing NFC data transfer,
-        abort these steps.
-      </li>
-      <li>
-        Reject |tuple|'s promise with an {{"InvalidStateError"}} {{DOMException}}.
-      </li>
-      <li>
-        Stop the <a>dispatch NFC content</a> steps.
-      </li>
-      <li>
-        Clear the <a>pending read tuple</a>.
-      </li>
-    </ol>
-  </div>
-  </section>
-
   <section><h3>Releasing NFC</h3>
   <p>
     To <dfn>release NFC</dfn> on an <a>environment settings object</a>,
@@ -2263,7 +2237,7 @@ <h2>The <dfn>record type</dfn> string</h2>
       Attempt to <a>abort a pending write operation</a>.
     </li>
     <li>
-      Attempt to <a>abort a pending scan operation</a>.
+      Clear the <a>activated reader objects</a>.
     </li>
     <li>
       Release the NFC resources on the underlying platform.
@@ -3418,9 +3392,9 @@ <h3><dfn>Writing content</dfn></h3>
       accessible to the client.
     </p>
     <p>
-      If there is a  <a>pending read tuple</a> whose |reader| is an
-      {{NDEFReader}} instance, then the <a>UA</a> MUST listen to
-      <a>NDEF message</a>s on all connected NFC adapters.
+      If there are any {{NDEFReader}} instances in <a>activated reader objects</a>
+      then the <a>UA</a> MUST listen to <a>NDEF message</a>s on all connected
+      NFC adapters.
     </p>
 
     <section> <h3>The <strong>scan()</strong> method</h3>
@@ -3440,15 +3414,6 @@ <h3><dfn>Writing content</dfn></h3>
             browsing context</a>, then reject |p| with an
             {{"InvalidStateError"}} {{DOMException}} and return |p|.
           </li>
-          <li>
-            If there is a <a>pending read tuple</a> |tuple|, then reject |p|
-            with an {{"InvalidStateError"}} {{DOMException}} and return |p|.
-            <p class="note">
-              Note that scans need to be explicitly aborted before a new scan
-              could be done, and this behavior is different from writes, which
-              automatically abort and replace pending writes.
-            </p>
-          </li>
           <li>
             Let |reader:NDEFReader| be the {{NDEFReader}} instance.
           </li>
@@ -3466,23 +3431,25 @@ <h3><dfn>Writing content</dfn></h3>
           <li>
             If |signal| is not `null`, then
             <a data-cite="dom#abortsignal-abort-algorithms">
-            add the following abort steps</a> to |signal|:
-              <ol>
-                <li>
-                  Clear the <a>pending read tuple</a> .
-                </li>
-                <li>
-                  Make a request to stop listening to <a>NDEF message</a>s
-                  on all <a>NFC adapter</a>s.
-                </li>
-              </ol>
+            add the following <dfn>abort the pending scans</dfn> steps</a>
+            to |signal|:
+            <ol>
+              <li>
+                Remove |reader| from the <a>activated reader objects</a>.
+              </li>
+              <li>
+                If the <a>activated reader objects</a> [= list/is empty =],
+                then make a request to stop listening to <a>NDEF message</a>s
+                on all <a>NFC adapter</a>s.
+              </li>
+            </ol>
           </li>
           <li>
             [=promise/React=] to |p|:
             <ol>
               <li>
-                If |p| was settled (fulfilled or rejected), then clear the
-                <a>pending read tuple</a>.
+                If |p| was settled (fulfilled or rejected), then
+                <a>abort the pending scans</a>.
               </li>
             </ol>
           </li>
@@ -3507,7 +3474,7 @@ <h3><dfn>Writing content</dfn></h3>
                 and abort these steps.
               </li>
               <li>
-                Set the <a>pending read tuple</a> to (|p|, |reader|).
+                Add |reader| to the <a>activated reader objects</a>.
               </li>
               <li>
                 Resolve |p|.
@@ -3532,10 +3499,14 @@ <h3><dfn>Writing content</dfn></h3>
         If the <a>NFC tag</a> in proximity range does not expose <a>NDEF</a>
         technology for reading or formatting, run the following sub-steps:
         <ol>
-          <li>
-            If there is a <a>pending read tuple</a> whose |reader| is an
-            {{NDEFReader}} instance, fire an event</a> named "`readingerror`" at
-            |reader|.
+          <li>[= list/For each =]
+            {{NDEFReader}} instance |reader:NDEFReader| in the
+            <a>activated reader objects</a>, run the following sub-steps:
+            <ol>
+              <li>
+                <a>Fire an event</a> named "`error`" at |reader|.
+              </li>
+            </ol>
           </li>
           <li>
             Abort these steps.
@@ -3602,11 +3573,16 @@ <h3><dfn>Writing content</dfn></h3>
     </p>
     <ol class=algorithm>
       <li>
-        If there is a <a>pending read tuple</a> whose |reader| is an
-        {{NDEFReader}} instance, <a>fire an event</a> named "`reading`" at
-        |reader| using <a>NDEFReadingEvent</a> with its <a>serialNumber</a>
-        attribute initialized to |serialNumber| and <a>message</a> attribute
-        initialized to |message|.
+        [= list/For each =] {{NDEFReader}} instance |reader:NDEFReader| in
+        the <a>activated reader objects</a>,
+        <ol>
+          <li>
+            <a>fire an event</a> named "`reading`" at |reader| using
+            <a>NDEFReadingEvent</a> with its <a>serialNumber</a> attribute
+            initialized to |serialNumber| and its <a>message</a> attribute
+            initialized to |message|.
+          </li>
+        </ol>
       </li>
     </ol>
     </section>