--- a/encrypted-media/encrypted-media.html Tue Nov 05 12:58:26 2013 -0800
+++ b/encrypted-media/encrypted-media.html Tue Nov 05 13:48:39 2013 -0800
@@ -277,7 +277,7 @@
readonly attribute DOMString <a href="#dom-sessionid">sessionId</a>;
// session operations
- void <a href="#dom-update">update</a>(Uint8Array key);
+ void <a href="#dom-update">update</a>(Uint8Array response);
void <a href="#dom-close">close</a>();
};
@@ -471,17 +471,15 @@
<p>The <dfn id="dom-sessionid"><code>sessionId</code></dfn> attribute is the <a href="#session-id">Session ID</a> for this object and the associated key(s) or license(s).</p>
- <p>The <dfn id="dom-update"><code>update(key)</code></dfn> method must run the following steps:</p>
- <p class="non-normative">Note: The contents of <var title="true">key</var> are <var title="true"><a href="#key-system">keySystem</a></var>-specific.
- It may be a raw key or a license containing a key.
- The contents may also vary depending on the container, key length, etc.</p>
+ <p>The <dfn id="dom-update"><code>update(response)</code></dfn> method must run the following steps:</p>
+ <p class="non-normative">Note: The contents of <var title="true">response</var> are <var title="true"><a href="#key-system">keySystem</a></var>-specific.</p>
<ol>
<li><p>If the argument is null or an empty array, throw an <code><a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-domexception-invalid_access_err">INVALID_ACCESS_ERR</a></code>.</p></li>
<li><p>If the session is not in the <code><a href="#dom-statepending">PENDING</a></code> state, throw an <code><a href="https://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#dom-domexception-invalid_state_err">INVALID_STATE_ERR</a></code>.</p></li>
<li>
-<p>Schedule a task to handle the call, providing <var title="true">key</var>.</p>
+<p>Schedule a task to handle the call, providing <var title="true">response</var>.</p>
<p>The user agent will asynchronously execute the following steps in the task:</p>
<ol>
<li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in the <a href="#dom-media-keys-constructor"><code>MediaKeys</code> constructor</a>.</p></li>
@@ -491,11 +489,11 @@
<p>Use <var title="true">cdm</var> to execute the following steps:</p>
<ol>
<li>
-<p>Process <var title="true">key</var>.</p>
- <p class="non-normative">Note: For some <a href="#key-system">Key Systems</a>, <var title="true">key</var> may be a license or other structure containing multiple keys.</p>
+<p>Process <var title="true">response</var>.</p>
+ <p class="non-normative">Note: For some <a href="#key-system">Key Systems</a>, <var title="true">response</var> may be a license or other structure containing multiple keys.</p>
</li>
<li>
-<p>For each <var title="true">individual key</var> in <var title="true">key</var>, store the <var title="true">individual key</var>.</p>
+<p>For each <var title="true">individual key</var> in <var title="true">response</var>, store the <var title="true">individual key</var>.</p>
<ol>
<li><p>Let <var title="true">key ID</var> be the key ID associated with the <var title="true">individual key</var>.</p></li>
<li>
@@ -1006,7 +1004,7 @@
<code><a href="#dom-destinationurl">destinationURL</a></code> = value of the default URL if present in the <a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-data">media data</a> and null otherwise.
</li></ul>
- <p>The <var title="true">key</var> parameter of <code><a href="#dom-update">update()</a></code> should be a JSON Web Key (JWK) representation of the symmetric key to be used for decryption, as defined in the <a href="http://tools.ietf.org/html/draft-ietf-jose-json-web-key">IETF Internet-draft JSON Web Key (JWK) specification</a>. The JSON string is encoded into the Uint8Array parameter using <a href="http://www.w3.org/TR/html5/infrastructure.html#ascii-compatible-character-encoding">ASCII-compatible character encoding</a>.</p>
+ <p>The <var title="true">response</var> parameter of <code><a href="#dom-update">update()</a></code> should be a JSON Web Key (JWK) representation of the symmetric key to be used for decryption, as defined in the <a href="http://tools.ietf.org/html/draft-ietf-jose-json-web-key">IETF Internet-draft JSON Web Key (JWK) specification</a>. The JSON string is encoded into the Uint8Array parameter using <a href="http://www.w3.org/TR/html5/infrastructure.html#ascii-compatible-character-encoding">ASCII-compatible character encoding</a>.</p>
<p>When the JWK 'key type' ("kty") member value is 'octet sequence' ("oct"), the 'key value' ("k") member will be a base64 encoding of the octet sequence containing the symmetric key value.</p>
<p>For example, the following contains a single symmetric key represented as a JWK, designated as being for use with the AES Key Wrap algorithm (line breaks for readability, only).</p>
--- a/encrypted-media/encrypted-media.xml Tue Nov 05 12:58:26 2013 -0800
+++ b/encrypted-media/encrypted-media.xml Tue Nov 05 13:48:39 2013 -0800
@@ -274,7 +274,7 @@
readonly attribute DOMString <precoderef>sessionId</precoderef>;
// session operations
- void <premethodref>update</premethodref>(Uint8Array key);
+ void <premethodref>update</premethodref>(Uint8Array response);
void <premethodref>close</premethodref>();
};
@@ -458,16 +458,14 @@
<p>The <codedfn>sessionId</codedfn> attribute is the <a href="#session-id">Session ID</a> for this object and the associated key(s) or license(s).</p>
- <p>The <methoddfn name="update">update(<var title="true">key</var>)</methoddfn> method must run the following steps:</p>
- <p class="non-normative">Note: The contents of <var title="true">key</var> are <var title="true"><a href="#key-system">keySystem</a></var>-specific.
- It may be a raw key or a license containing a key.
- The contents may also vary depending on the container, key length, etc.</p>
+ <p>The <methoddfn name="update">update(<var title="true">response</var>)</methoddfn> method must run the following steps:</p>
+ <p class="non-normative">Note: The contents of <var title="true">response</var> are <var title="true"><a href="#key-system">keySystem</a></var>-specific.</p>
<ol>
<li><p>If the argument is null or an empty array, throw an <invalid-access-err/>.</p></li>
<li><p>If the session is not in the <coderef prefix="state">PENDING</coderef> state, throw an <invalid-state-err/>.</p></li>
- <li><p>Schedule a task to handle the call, providing <var title="true">key</var>.</p>
+ <li><p>Schedule a task to handle the call, providing <var title="true">response</var>.</p>
<p>The user agent will asynchronously execute the following steps in the task:</p>
<ol>
<li><p>Let <var title="true">cdm</var> be the <var title="true">cdm</var> loaded in the <a href="#dom-media-keys-constructor"><code>MediaKeys</code> constructor</a>.</p></li>
@@ -475,10 +473,10 @@
<li><p>Let <var title="true">request</var> be null.</p></li>
<li><p>Use <var title="true">cdm</var> to execute the following steps:</p>
<ol>
- <li><p>Process <var title="true">key</var>.</p>
- <p class="non-normative">Note: For some <a href="#key-system">Key Systems</a>, <var title="true">key</var> may be a license or other structure containing multiple keys.</p>
+ <li><p>Process <var title="true">response</var>.</p>
+ <p class="non-normative">Note: For some <a href="#key-system">Key Systems</a>, <var title="true">response</var> may be a license or other structure containing multiple keys.</p>
</li>
- <li><p>For each <var title="true">individual key</var> in <var title="true">key</var>, store the <var title="true">individual key</var>.</p>
+ <li><p>For each <var title="true">individual key</var> in <var title="true">response</var>, store the <var title="true">individual key</var>.</p>
<ol>
<li><p>Let <var title="true">key ID</var> be the key ID associated with the <var title="true">individual key</var>.</p></li>
<li><p>Run the following to store the <var title="true">individual key</var>:</p>
@@ -952,7 +950,7 @@
<coderef>destinationURL</coderef> = value of the default URL if present in the <videoanchor name="media-data">media data</videoanchor> and null otherwise.
</li></ul>
- <p>The <var title="true">key</var> parameter of <methodref>update</methodref> should be a JSON Web Key (JWK) representation of the symmetric key to be used for decryption, as defined in the <a href="http://tools.ietf.org/html/draft-ietf-jose-json-web-key">IETF Internet-draft JSON Web Key (JWK) specification</a>. The JSON string is encoded into the Uint8Array parameter using <ascii-encoding />.</p>
+ <p>The <var title="true">response</var> parameter of <methodref>update</methodref> should be a JSON Web Key (JWK) representation of the symmetric key to be used for decryption, as defined in the <a href="http://tools.ietf.org/html/draft-ietf-jose-json-web-key">IETF Internet-draft JSON Web Key (JWK) specification</a>. The JSON string is encoded into the Uint8Array parameter using <ascii-encoding />.</p>
<p>When the JWK 'key type' ("kty") member value is 'octet sequence' ("oct"), the 'key value' ("k") member will be a base64 encoding of the octet sequence containing the symmetric key value.</p>
<p>For example, the following contains a single symmetric key represented as a JWK, designated as being for use with the AES Key Wrap algorithm (line breaks for readability, only).</p>