--- a/encrypted-media/encrypted-media-respec.html Mon Oct 13 11:40:39 2014 -0700
+++ b/encrypted-media/encrypted-media-respec.html Mon Oct 13 12:14:02 2014 -0700
@@ -232,9 +232,9 @@
<p>
The format of the initialization data depends upon the type of container, and containers MAY support more than one format
- of initialization data. The <dfn id="initialization-data-type">initialization data type</dfn> is a string that indicates what
- format the initialization data is provided in. Initialization data type strings are always matched case-sensitively. It is
- RECOMMENDED that initialization data type strings are lower-case ASCII strings.
+ of initialization data. The <dfn id="initialization-data-type">Initialization Data Type</dfn> is a string that indicates what
+ format the initialization data is provided in. Initialization Data Type strings are always matched case-sensitively. It is
+ RECOMMENDED that Initialization Data Type strings are lower-case ASCII strings.
</p>
<p>
@@ -1389,7 +1389,7 @@
</ul>
</li>
<li><p>The <a def-id="getUsableKeyIds"></a> method always returns all key IDs that have been provided via <a def-id="update"></a>.</p></li>
- <li><p><a def-id="initialization-data"></a>: Implementations MAY support any combination of registered Initialization Data types [[EME-REGISTRY]].
+ <li><p><a def-id="initialization-data"></a>: Implementations MAY support any combination of registered Initialization Data Types [[EME-REGISTRY]].
Implementations SHOULD support the <code><a href="keyids-format.html">"keyids"</a></code> type and other types appropriate for content types supported by the user agent.
</p></li>
</ul>
--- a/encrypted-media/encrypted-media.html Mon Oct 13 11:40:39 2014 -0700
+++ b/encrypted-media/encrypted-media.html Mon Oct 13 12:14:02 2014 -0700
@@ -445,7 +445,7 @@
</p>
<h1 class="title p-name" id="title" property="dcterms:title">Encrypted Media Extensions</h1>
- <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-10-13T18:38:12.000Z" id="w3c-editor-s-draft-13-october-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-10-13">13 October 2014</time></h2>
+ <h2 property="dcterms:issued" datatype="xsd:dateTime" content="2014-10-13T19:13:29.000Z" id="w3c-editor-s-draft-13-october-2014"><abbr title="World Wide Web Consortium">W3C</abbr> Editor's Draft <time class="dt-published" datetime="2014-10-13">13 October 2014</time></h2>
<dl>
<dt>This version:</dt>
@@ -713,9 +713,9 @@
<p>
The format of the initialization data depends upon the type of container, and containers <em class="rfc2119" title="MAY">MAY</em> support more than one format
- of initialization data. The <dfn id="initialization-data-type">initialization data type</dfn> is a string that indicates what
- format the initialization data is provided in. Initialization data type strings are always matched case-sensitively. It is
- <em class="rfc2119" title="RECOMMENDED">RECOMMENDED</em> that initialization data type strings are lower-case ASCII strings.
+ of initialization data. The <dfn id="initialization-data-type">Initialization Data Type</dfn> is a string that indicates what
+ format the initialization data is provided in. Initialization Data Type strings are always matched case-sensitively. It is
+ <em class="rfc2119" title="RECOMMENDED">RECOMMENDED</em> that Initialization Data Type strings are lower-case ASCII strings.
</p>
<p>
@@ -836,15 +836,15 @@
<p>Returns whether the Some System <a href="#key-system">Key System</a> may be supported. Specific containers and codecs may or may not be supported with Some System.</p>
<div class="example">MediaKeys.isTypeSupported("com.example.somesystem")</div>
</li><li>
- <p>Returns whether the Some System <a href="#key-system">Key System</a> may be supported and is capable of parsing the <a href="#initialization-data">Initialization Data</a> format "keyids". Specific containers and codecs may or may not be supported with Some System.</p>
+ <p>Returns whether the Some System <a href="#key-system">Key System</a> may be supported and is capable of parsing the <a href="#initialization-data-type">Initialization Data Type</a> format "keyids". Specific containers and codecs may or may not be supported with Some System.</p>
<div class="example">MediaKeys.isTypeSupported("com.example.somesystem", "keyids")</div>
</li>
<li>
- <p>Returns whether the Some System <a href="#key-system">Key System</a> may be supported and is capable of parsing the <a href="#initialization-data">Initialization Data</a> format <var title="true">initDataType</var>, the user agent is capable of demuxing the container specified by <var title="true">mimeType</var>, and the codec(s) specified by <var title="true">mimeType</var> are supported, all as specified by capability "foo".</p>
+ <p>Returns whether the Some System <a href="#key-system">Key System</a> may be supported and is capable of parsing the <a href="#initialization-data-type">Initialization Data Type</a> format <var title="true">initDataType</var>, the user agent is capable of demuxing the container specified by <var title="true">mimeType</var>, and the codec(s) specified by <var title="true">mimeType</var> are supported, all as specified by capability "foo".</p>
<div class="example">MediaKeys.isTypeSupported("com.example.somesystem", <var title="true">initDataType</var>, <var title="true">mimeType</var>, "foo")</div>
</li>
<li>
- <p>Returns whether the user agent <em>probably</em> supports <a href="#clear-key">Clear Key</a> using the <a href="#initialization-data">Initialization Data</a> format <var title="true">initDataType</var> and the container and codec(s) specified by <var title="true">mimeType</var>.</p>
+ <p>Returns whether the user agent <em>probably</em> supports <a href="#clear-key">Clear Key</a> using the <a href="#initialization-data-type">Initialization Data Type</a> format <var title="true">initDataType</var> and the container and codec(s) specified by <var title="true">mimeType</var>.</p>
<div class="example">"probably" == MediaKeys.isTypeSupported("org.w3.clearkey", <var title="true">initDataType</var>, <var title="true">mimeType</var>)</div>
</li>
</ul>
@@ -873,8 +873,8 @@
</dl>
</li>
- <li><p>If <var title="true">initDataType</var> is an empty string or contains an unrecognized or unsupported <a href="#initialization-data">Initialization Data</a>, return <code><a href="#idl-def-IsTypeSupportedResult.empty-string">""</a></code> and abort these steps. String comparison is case-sensitive.</p></li>
- <li><p>If <var title="true">initDataType</var> is not an <a href="#initialization-data">Initialization Data</a> supported by the <var title="true">keySystem</var> implementation, return <code><a href="#idl-def-IsTypeSupportedResult.empty-string">""</a></code> and abort these steps.</p></li>
+ <li><p>If <var title="true">initDataType</var> is an empty string or contains an unrecognized or unsupported <a href="#initialization-data-type">Initialization Data Type</a>, return <code><a href="#idl-def-IsTypeSupportedResult.empty-string">""</a></code> and abort these steps. String comparison is case-sensitive.</p></li>
+ <li><p>If <var title="true">initDataType</var> is not an <a href="#initialization-data-type">Initialization Data Type</a> supported by the <var title="true">keySystem</var> implementation, return <code><a href="#idl-def-IsTypeSupportedResult.empty-string">""</a></code> and abort these steps.</p></li>
<li><p>If the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is not available and usable, return <code><a href="#idl-def-IsTypeSupportedResult.empty-string">""</a></code> and abort these steps.</p></li>
<li><p>If <var title="true">contentType</var> was not provided, follow the steps for the first matching condition from the following list and abort these steps:</p>
<dl class="switch">
@@ -995,7 +995,7 @@
</ol></dd><dt id="widl-MediaKeySession-generateRequest-Promise-void--DOMString-initDataType-ArrayBuffer-ArrayBufferView-initData"><code>generateRequest</code></dt><dd>
<p>Generates a request based on the <var title="true">initData</var>.</p>
<p><var title="true">initData</var> is <a href="#initialization-data">Initialization Data</a>, and
- <var title="true">initDataType</var> is an <a href="#initialization-data">Initialization Data</a> that indicates how to interpret <var title="true">initData</var>.
+ <var title="true">initDataType</var> is an <a href="#initialization-data-type">Initialization Data Type</a> that indicates how to interpret <var title="true">initData</var>.
</p>
@@ -1005,7 +1005,7 @@
<li><p>If <var title="true">initDataType</var> is an empty string, return a promise rejected with a new <code><a href="http://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> whose name is <code><a href="#dfn-InvalidAccessError">InvalidAccessError</a></code>.</p></li>
<li><p>If <var title="true">initData</var> is an empty array, return a promise rejected with a new <code><a href="http://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> whose name is <code><a href="#dfn-InvalidAccessError">InvalidAccessError</a></code>.</p></li>
<li><p>Let <var title="true">media keys</var> be the <code><a href="#idl-def-MediaKeys">MediaKeys</a></code> object that created this object.</p></li>
- <li><p>If the <a href="#cdm">CDM</a> corresponding to <var title="true">media keys</var>'s <code><a href="#widl-MediaKeys-keySystem">keySystem</a></code> attribute does not support <var title="true">initDataType</var> as an <a href="#initialization-data">Initialization Data</a>, return a promise rejected with a new <code><a href="http://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> whose name is <code><a href="#dfn-NotSupportedError">NotSupportedError</a></code>. String comparison is case-sensitive.</p></li>
+ <li><p>If the <a href="#cdm">CDM</a> corresponding to <var title="true">media keys</var>'s <code><a href="#widl-MediaKeys-keySystem">keySystem</a></code> attribute does not support <var title="true">initDataType</var> as an <a href="#initialization-data-type">Initialization Data Type</a>, return a promise rejected with a new <code><a href="http://heycam.github.io/webidl/#dfn-DOMException">DOMException</a></code> whose name is <code><a href="#dfn-NotSupportedError">NotSupportedError</a></code>. String comparison is case-sensitive.</p></li>
<li><p>Let <var>init data</var> be a copy of the contents of the <var title="true">initData</var> parameter.</p></li>
<li><p>Let <var title="true">session type</var> be this object's <var title="true">session type</var>.</p></li>
<li><p>Let <var>promise</var> be a new promise.</p></li>
@@ -1542,7 +1542,7 @@
<table class="parameters"><tbody><tr><th>Parameter</th><th>Type</th><th>Nullable</th><th>Optional</th><th>Description</th></tr><tr><td class="prmName">type</td><td class="prmType"><code>DOMString</code></td><td class="prmNullFalse"><span role="img" aria-label="False">✘</span></td><td class="prmOptFalse"><span role="img" aria-label="False">✘</span></td><td class="prmDesc"></td></tr><tr><td class="prmName">eventInitDict</td><td class="prmType"><code><a href="#idl-def-MediaEncryptedEventInit" class="idlType"><code>MediaEncryptedEventInit</code></a></code></td><td class="prmNullFalse"><span role="img" aria-label="False">✘</span></td><td class="prmOptTrue"><span role="img" aria-label="True">✔</span></td><td class="prmDesc"></td></tr></tbody></table></dd></dl></section><section id="attributes-4"><h4 role="heading" id="h4_attributes-4"><span class="secno">4.3.2 </span>Attributes</h4><dl class="attributes"><dt id="widl-MediaEncryptedEvent-initData"><code>initData</code> of type <span class="idlAttrType">ArrayBuffer</span>, readonly , nullable</dt><dd>
The <a href="#initialization-data">Initialization Data</a> for the event.
</dd><dt id="widl-MediaEncryptedEvent-initDataType"><code>initDataType</code> of type <span class="idlAttrType">DOMString</span>, readonly </dt><dd>
- Indicates the <a href="#initialization-data">Initialization Data</a> of the <a href="#initialization-data">Initialization Data</a> contained in the <code><a href="#widl-MediaEncryptedEventInit-initData">initData</a></code> attribute.
+ Indicates the <a href="#initialization-data-type">Initialization Data Type</a> of the <a href="#initialization-data">Initialization Data</a> contained in the <code><a href="#widl-MediaEncryptedEventInit-initData">initData</a></code> attribute.
</dd></dl></section>
<section id="mediaencryptedeventinit">
@@ -1553,7 +1553,7 @@
};</span></pre><section id="dictionary-mediaencryptedeventinit-members"><h5 role="heading" id="h5_dictionary-mediaencryptedeventinit-members"><span class="secno">4.3.3.1 </span>Dictionary <a class="idlType" href="#idl-def-MediaEncryptedEventInit"><code>MediaEncryptedEventInit</code></a> Members</h5><dl class="dictionary-members"><dt id="widl-MediaEncryptedEventInit-initData"><code>initData</code> of type <span class="idlMemberType">ArrayBuffer</span>, nullable, defaulting to <code>null</code></dt><dd>
The <a href="#initialization-data">Initialization Data</a>.
</dd><dt id="widl-MediaEncryptedEventInit-initDataType"><code>initDataType</code> of type <span class="idlMemberType">DOMString</span>, defaulting to <code>""</code></dt><dd>
- The <a href="#initialization-data">Initialization Data</a>.
+ The <a href="#initialization-data-type">Initialization Data Type</a>.
</dd></dl></section>
</section>
</section>
@@ -1596,7 +1596,7 @@
<li>
<p>If the <a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-data">media data</a> is <a href="http://www.w3.org/TR/html5/infrastructure.html#cors-same-origin">CORS-same-origin</a> and <em>not</em> <a href="#mixed-content">mixed content</a>, run the following steps:</p>
<ol>
- <li><p>Let <var title="">initDataType</var> be the string representing the <a href="#initialization-data">Initialization Data</a> of the Initialization Data.</p></li>
+ <li><p>Let <var title="">initDataType</var> be the string representing the <a href="#initialization-data-type">Initialization Data Type</a> of the Initialization Data.</p></li>
<li><p>Let <var title="">initData</var> be the Initialization Data.</p></li>
</ol>
<div class="note"><div class="note-title" aria-level="3" role="heading" id="h_note_35"><span>Note</span></div><p class="">While the media element may allow loading of "Optionally-blockable Content" [MIXED-CONTENT], the user agent <em class="rfc2119" title="MUST NOT">MUST NOT</em> expose Initialization Data from such media data to the application.</p></div>
@@ -1810,7 +1810,7 @@
</ul>
</li>
<li><p>The <code><a href="#widl-MediaKeySession-getUsableKeyIds-Promise-sequence-ArrayBuffer">getUsableKeyIds()</a></code> method always returns all key IDs that have been provided via <code><a href="#widl-MediaKeySession-update-Promise-void--ArrayBuffer-ArrayBufferView-response">update()</a></code>.</p></li>
- <li><p><a href="#initialization-data">Initialization Data</a>: Implementations <em class="rfc2119" title="MAY">MAY</em> support any combination of registered Initialization Data types [<cite><a class="bibref" href="#bib-EME-REGISTRY">EME-REGISTRY</a></cite>].
+ <li><p><a href="#initialization-data">Initialization Data</a>: Implementations <em class="rfc2119" title="MAY">MAY</em> support any combination of registered Initialization Data Types [<cite><a class="bibref" href="#bib-EME-REGISTRY">EME-REGISTRY</a></cite>].
Implementations <em class="rfc2119" title="SHOULD">SHOULD</em> support the <code><a href="keyids-format.html">"keyids"</a></code> type and other types appropriate for content types supported by the user agent.
</p></li>
</ul>
--- a/encrypted-media/encrypted-media.js Mon Oct 13 11:40:39 2014 -0700
+++ b/encrypted-media/encrypted-media.js Mon Oct 13 12:14:02 2014 -0700
@@ -154,7 +154,7 @@
'keysystem': { func: term_helper, fragment: 'key-system', link_text: 'Key System' },
'keysystems': { func: term_helper, fragment: 'key-system', link_text: 'Key Systems' },
'initialization-data': { func: term_helper, fragment: 'initialization-data', link_text: 'Initialization Data' },
- 'initialization-data-type': { func: term_helper, fragment: 'initialization-data', link_text: 'Initialization Data' },
+ 'initialization-data-type': { func: term_helper, fragment: 'initialization-data-type', link_text: 'Initialization Data Type' },
'session-id': { func: term_helper, fragment: 'session-id', link_text: 'Session Id' },
'sessiontype': { func: idlref_helper, fragment: 'idl-def-SessionType', link_text: 'SessionType', },