[EME] Make the definition of a usable key normative.
authorDavid Dorwin <ddorwin@google.com>
Tue, 01 Jul 2014 18:40:03 -0700
changeset 362 e3c023b6970e
parent 361 75051d4bb6a7
child 363 a38c961e1ab0
[EME] Make the definition of a usable key normative.

Also, replace "associated media element(s)" with more explicit wording.
encrypted-media/encrypted-media.html
encrypted-media/encrypted-media.xml
--- a/encrypted-media/encrypted-media.html	Tue Jul 01 18:38:47 2014 -0700
+++ b/encrypted-media/encrypted-media.html	Tue Jul 01 18:40:03 2014 -0700
@@ -283,7 +283,7 @@
     Such keys may only be provided to the <a href="#cdm">CDM</a> via an <code><a href="#dom-update">update()</a></code> call. (They may later be loaded by <code><a href="#dom-loadsession">loadSession()</a></code> as part of the stored session data.)
     </p>
     
-    <p class="non-normative">A key is considered <em>usable</em> if it is currently usable for decryption as determined by the CDM. <span class="non-normative">For example, a key is not usable if its license has expired.</span></p>
+    <p>A key is considered <em>usable</em> if the CDM is certain the key is currently usable for decryption. <span class="non-normative">For example, a key is not usable if its license has expired.</span></p>
         
     <h4 id="decryption-key-id">1.1.6. Key ID</h4>
     <p>A <a href="#decryption-key">key</a> is associated with a key ID, which uniquely identifies a key.
@@ -1287,7 +1287,7 @@
       <li><p>Let the <var title="true">session</var> be the associated <code><a href="#dom-mediakeysession">MediaKeySession</a></code> object.</p></li>
       <li><p><a href="http://www.w3.org/TR/html5/webappapis.html#queue-a-task">Queue a task</a> to <a href="http://www.w3.org/TR/html5/webappapis.html#fire-a-simple-event">fire a simple event</a> named <code><a href="#dom-eventkeyschange">keyschange</a></code> at the <var title="true">session</var>.</p></li>
       <li>
-<p>Run the <a href="#algorithms-resume-playback">Attempt to Resume Playback If Necessary</a> algorithm on each of the associated <a href="#media-element">media element(s)</a>.</p>
+<p>Run the <a href="#algorithms-resume-playback">Attempt to Resume Playback If Necessary</a> algorithm on each of the <a href="#media-element">media element(s)</a> whose <code><a href="#dom-attrmediakeys">mediaKeys</a></code> attribute is the MediaKeys object that created the <var title="true">session</var>.</p>
         <p>The user agent may choose to skip this step if it knows resuming will fail <span class="non-normative">(i.e. no additional keys became available)</span>.</p>
       </li>
     </ol>
--- a/encrypted-media/encrypted-media.xml	Tue Jul 01 18:38:47 2014 -0700
+++ b/encrypted-media/encrypted-media.xml	Tue Jul 01 18:40:03 2014 -0700
@@ -280,7 +280,7 @@
     Such keys may only be provided to the <a href="#cdm">CDM</a> via an <methodref>update</methodref> call. (They may later be loaded by <methodref>loadSession</methodref> as part of the stored session data.)
     </p>
     
-    <p class="non-normative">A key is considered <em>usable</em> if it is currently usable for decryption as determined by the CDM. <span class="non-normative">For example, a key is not usable if its license has expired.</span></p>
+    <p>A key is considered <em>usable</em> if the CDM is certain the key is currently usable for decryption. <span class="non-normative">For example, a key is not usable if its license has expired.</span></p>
         
     <h4 id="decryption-key-id">1.1.6. Key ID</h4>
     <p>A <a href="#decryption-key">key</a> is associated with a key ID, which uniquely identifies a key.
@@ -1212,7 +1212,7 @@
     <ol>
       <li><p>Let the <var title="true">session</var> be the associated <coderef>MediaKeySession</coderef> object.</p></li>
       <li><p><Queue-a-task/> to <fire-a-simple-event/> named <coderef prefix="event">keyschange</coderef> at the <var title="true">session</var>.</p></li>
-      <li><p>Run the <a href="#algorithms-resume-playback">Attempt to Resume Playback If Necessary</a> algorithm on each of the associated <a href="#media-element">media element(s)</a>.</p>
+      <li><p>Run the <a href="#algorithms-resume-playback">Attempt to Resume Playback If Necessary</a> algorithm on each of the <a href="#media-element">media element(s)</a> whose <coderef prefix="attr">mediaKeys</coderef> attribute is the MediaKeys object that created the <var title="true">session</var>.</p>
         <p>The user agent may choose to skip this step if it knows resuming will fail <span class="non-normative">(i.e. no additional keys became available)</span>.</p>
       </li>
     </ol>