[EME] Bug 25911 - HTMLSourceElement's IDL keysystem attribute should reflect the keysystem content attribute
This also fixes several problems with the previous text around these attributes.
--- a/encrypted-media/encrypted-media.html Fri Jun 13 14:00:12 2014 -0700
+++ b/encrypted-media/encrypted-media.html Fri Jun 13 14:24:45 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 12 June 2014</h2>
+ <h2 id="draft-date">W3C Editor's Draft 13 June 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>
@@ -843,11 +843,17 @@
</ol>
- <p>The <dfn id="dom-sourcekeysystem"><code>keySystem</code></dfn> attribute of <code><a href="#dom-htmlsourceelement">HTMLSourceElement</a></code> specifies the <a href="#key-system">Key System</a> to be used with the <code><a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-resource">media resource</a></code>. The <code><a href="#dom-sourcekeysystem">keySystem</a></code> attribute must be supported by all HTMLSourceElement as both an IDL attribute and also a content attribute named <dfn id="dom-sourcecontentkeysystem"><code>keysystem</code></dfn>.
- The <a href="http://www.w3.org/TR/html5/embedded-content-0.html#concept-media-load-algorithm">resource selection algorithm</a> is modified to check the <code><a href="#dom-sourcekeysystem">keySystem</a></code> attribute after the existing <em>step 5</em> of the <em>Otherwise</em> branch of <em>step 6</em>:
+ <p>The <dfn id="dom-sourcecontentkeysystem"><code>keysystem</code></dfn> content attribute is added to <code><a href="#dom-htmlsourceelement">HTMLSourceElement</a></code>.
+ It specifies the <a href="#key-system">Key System</a> to be used with the <code><a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-resource">media resource</a></code>.
+ </p>
+
+ <p>The <dfn id="dom-sourcekeysystem"><code>keySystem</code></dfn> IDL attribute is added to <code><a href="#dom-htmlsourceelement">HTMLSourceElement</a></code>.
+ It must reflect the <code><a href="#dom-sourcecontentkeysystem">keysystem</a></code> content attribute.
</p>
+
+ <p>The <a href="http://www.w3.org/TR/html5/embedded-content-0.html#concept-media-load-algorithm">resource selection algorithm</a> is modified to check the <code><a href="#dom-sourcecontentkeysystem">keysystem</a></code> attribute after the existing <em>step 5</em> of the <em>Otherwise</em> branch of <em>step 9</em>:</p>
<ol start="6">
- <li><p>⌛ If <var title="">candidate</var> has a <code><a href="#dom-sourcekeysystem">keySystem</a></code> attribute whose value represents a <a href="#key-system">Key System</a> that the user agent knows it cannot use with <code><a href="http://www.w3.org/TR/html5/embedded-content-0.html#attr-source-type">type</a></code>, then end the <a href="http://www.w3.org/TR/html5/webappapis.html#synchronous-section">synchronous section</a>, and jump down to the <i title="">failed</i> step below.</p></li>
+ <li><p>⌛ If <var title="">candidate</var> has a <code><a href="#dom-sourcecontentkeysystem">keysystem</a></code> attribute whose value represents a <a href="#key-system">Key System</a> that the user agent knows it cannot use with <code><a href="http://www.w3.org/TR/html5/embedded-content-0.html#attr-source-type">type</a></code>, then end the <a href="http://www.w3.org/TR/html5/webappapis.html#synchronous-section">synchronous section</a>, and jump down to the <i title="">failed</i> step below.</p></li>
</ol>
<h3 id="exceptions">2.1. Exceptions</h3>
--- a/encrypted-media/encrypted-media.xml Fri Jun 13 14:00:12 2014 -0700
+++ b/encrypted-media/encrypted-media.xml Fri Jun 13 14:24:45 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 12 June 2014</h2>
+ <h2 id="draft-date">W3C Editor's Draft 13 June 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>
@@ -792,11 +792,17 @@
</ol>
<!-- Begin HTMLSourceElement -->
- <p>The <codedfn prefix="source">keySystem</codedfn> attribute of <coderef>HTMLSourceElement</coderef> specifies the <a href="#key-system">Key System</a> to be used with the <videoref name="media-resource">media resource</videoref>. The <coderef prefix="source">keySystem</coderef> attribute must be supported by all HTMLSourceElement as both an IDL attribute and also a content attribute named <codedfn prefix="sourcecontent">keysystem</codedfn>.
- The <resource-selection-algorithm/> is modified to check the <coderef prefix="source">keySystem</coderef> attribute after the existing <em>step 5</em> of the <em>Otherwise</em> branch of <em>step 6</em>:
+ <p>The <codedfn prefix="sourcecontent">keysystem</codedfn> content attribute is added to <coderef>HTMLSourceElement</coderef>.
+ It specifies the <a href="#key-system">Key System</a> to be used with the <videoref name="media-resource">media resource</videoref>.
+ </p>
+
+ <p>The <codedfn prefix="source">keySystem</codedfn> IDL attribute is added to <coderef>HTMLSourceElement</coderef>.
+ It must reflect the <coderef prefix="sourcecontent">keysystem</coderef> content attribute.
</p>
+
+ <p>The <resource-selection-algorithm/> is modified to check the <coderef prefix="sourcecontent">keysystem</coderef> attribute after the existing <em>step 5</em> of the <em>Otherwise</em> branch of <em>step 9</em>:</p>
<ol start="6">
- <li><p>⌛ If <var title="">candidate</var> has a <coderef prefix="source">keySystem</coderef> attribute whose value represents a <a href="#key-system">Key System</a> that the user agent knows it cannot use with <videoref name="attr-source-type">type</videoref>, then end the <synchronous-section/>, and jump down to the <i title="">failed</i> step below.</p></li>
+ <li><p>⌛ If <var title="">candidate</var> has a <coderef prefix="sourcecontent">keysystem</coderef> attribute whose value represents a <a href="#key-system">Key System</a> that the user agent knows it cannot use with <videoref name="attr-source-type">type</videoref>, then end the <synchronous-section/>, and jump down to the <i title="">failed</i> step below.</p></li>
</ol>
<h3 id="exceptions">2.1. Exceptions</h3>