[EME] Bug 25595 - Minor changes to definitions for Key Session, Key, and License
--- a/encrypted-media/encrypted-media.html Thu Jul 03 13:41:52 2014 -0700
+++ b/encrypted-media/encrypted-media.html Mon Jul 07 16:30:15 2014 -0700
@@ -104,7 +104,7 @@
<div class="head">
<p><a href="http://www.w3.org/"><img src="https://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48"></a></p>
<h1>Encrypted Media Extensions</h1>
- <h2 id="draft-date">W3C Editor's Draft 2 July 2014</h2>
+ <h2 id="draft-date">W3C Editor's Draft 7 July 2014</h2>
<dl>
<dt>This Version:</dt>
<dd><a href="http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html">http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html</a></dd>
@@ -256,7 +256,7 @@
</p>
<h4 id="key-session">1.1.3. Key Session</h4>
- <p>A Key Session, or simply Session, represents the lifetime of the license(s)/key(s) it contains and associates all messages related to them.
+ <p>A Key Session, or simply Session, provides a context for message exchange with the CDM as a result of which key(s) are made available to be <a href="#cdm">CDM</a>.
Sessions are embodied as <code><a href="#dom-mediakeysession">MediaKeySession</a></code> objects.
Each Key session is associated with a single instance of <a href="#initialization-data">Initialization Data</a> provided in the <code><a href="#dom-createsession">createSession()</a></code> call.
</p>
@@ -278,7 +278,7 @@
<h4 id="decryption-key">1.1.5. Key</h4>
<p>Unless otherwise stated, key refers to a decryption key that can be used to decrypt blocks within <a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-data">media data</a>.
- Each key is uniquely identified by a <a href="#decryption-key-id">key ID</a>.
+ Each such key is uniquely identified by a <a href="#decryption-key-id">key ID</a>.
A key is associated with the <a href="#key-session">session</a> used to provide it to the CDM. (The same key may be present in multiple sessions.)
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>
@@ -294,7 +294,7 @@
</p>
<h4 id="license">1.1.7. License</h4>
- <p>A license is a key system-specific message that includes one or more decryption <a href="#decryption-key">key(s)</a> - each associated with a <a href="#decryption-key-id">key ID</a> - and potentially other information about key usage.</p>
+ <p>A license is key system-specific state information that includes one or more <a href="#decryption-key">key(s)</a> - each associated with a <a href="#decryption-key-id">key ID</a> - and potentially other information about key usage.</p>
<h4 id="initialization-data">1.1.8. Initialization Data</h4>
<p class="non-normative">
--- a/encrypted-media/encrypted-media.xml Thu Jul 03 13:41:52 2014 -0700
+++ b/encrypted-media/encrypted-media.xml Mon Jul 07 16:30:15 2014 -0700
@@ -103,7 +103,7 @@
<div class="head">
<p><a href="http://www.w3.org/"><img src="https://www.w3.org/Icons/w3c_home" alt="W3C" width="72" height="48" /></a></p>
<h1>Encrypted Media Extensions</h1>
- <h2 id="draft-date">W3C Editor's Draft 2 July 2014</h2>
+ <h2 id="draft-date">W3C Editor's Draft 7 July 2014</h2>
<dl>
<dt>This Version:</dt>
<dd><a href="http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html">http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html</a></dd>
@@ -253,7 +253,7 @@
</p>
<h4 id="key-session">1.1.3. Key Session</h4>
- <p>A Key Session, or simply Session, represents the lifetime of the license(s)/key(s) it contains and associates all messages related to them.
+ <p>A Key Session, or simply Session, provides a context for message exchange with the CDM as a result of which key(s) are made available to be <a href="#cdm">CDM</a>.
Sessions are embodied as <coderef>MediaKeySession</coderef> objects.
Each Key session is associated with a single instance of <a href="#initialization-data">Initialization Data</a> provided in the <methodref>createSession</methodref> call.
</p>
@@ -275,7 +275,7 @@
<h4 id="decryption-key">1.1.5. Key</h4>
<p>Unless otherwise stated, key refers to a decryption key that can be used to decrypt blocks within <videoanchor name="media-data">media data</videoanchor>.
- Each key is uniquely identified by a <a href="#decryption-key-id">key ID</a>.
+ Each such key is uniquely identified by a <a href="#decryption-key-id">key ID</a>.
A key is associated with the <a href="#key-session">session</a> used to provide it to the CDM. (The same key may be present in multiple sessions.)
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>
@@ -291,7 +291,7 @@
</p>
<h4 id="license">1.1.7. License</h4>
- <p>A license is a key system-specific message that includes one or more decryption <a href="#decryption-key">key(s)</a> - each associated with a <a href="#decryption-key-id">key ID</a> - and potentially other information about key usage.</p>
+ <p>A license is key system-specific state information that includes one or more <a href="#decryption-key">key(s)</a> - each associated with a <a href="#decryption-key-id">key ID</a> - and potentially other information about key usage.</p>
<h4 id="initialization-data">1.1.8. Initialization Data</h4>
<p class="non-normative">