--- a/encrypted-media/encrypted-media.html	Fri May 02 13:04:22 2014 -0700
+++ b/encrypted-media/encrypted-media.html	Fri May 02 13:12:44 2014 -0700
@@ -332,7 +332,7 @@
   readonly attribute <a href="#dom-mediawaitingfor">MediaWaitingFor</a> <a href="#dom-waitingfor">waitingFor</a>;
 };
 
-enum <dfn id="dom-enumistypesupported">IsTypeSupported</dfn> { "<dfn id="dom-istypesupportedempty"></dfn>" /* empty string */, "<dfn id="dom-istypesupportedmaybe">maybe</dfn>", "<dfn id="dom-istypesupportedprobably">probably</dfn>" };
+enum <dfn id="dom-istypesupportedresult">IsTypeSupportedResult</dfn> { "<dfn id="dom-istypesupportedresultempty"></dfn>" /* empty string */, "<dfn id="dom-istypesupportedresultmaybe">maybe</dfn>", "<dfn id="dom-istypesupportedresultprobably">probably</dfn>" };
 enum <dfn id="dom-sessiontype">SessionType</dfn> { "<dfn id="dom-sessiontypetemporary">temporary</dfn>", "<dfn id="dom-sessiontypepersistent">persistent</dfn>" };
 interface <dfn id="dom-mediakeys">MediaKeys</dfn> {
   readonly attribute DOMString <a href="#dom-keysystem">keySystem</a>;
@@ -342,7 +342,7 @@
   Promise&lt;any&gt; <a href="#dom-setservercertificate">setServerCertificate</a>(Uint8Array serverCertificate);
 
   static Promise&lt;<a href="#dom-mediakeys">MediaKeys</a>&gt; <a href="#dom-create">create</a>(DOMString <a href="#key-system">keySystem</a>)
-  static <a href="#dom-enumistypesupported">IsTypeSupported</a> <a href="#dom-istypesupported">isTypeSupported</a>(DOMstring <a href="#key-system">keySystem</a>, optional DOMString <a href="#initialization-data-type">initDataType</a>, optional DOMString contentType, optional DOMString capability);
+  static <a href="#dom-istypesupportedresult">IsTypeSupportedResult</a> <a href="#dom-istypesupported">isTypeSupported</a>(DOMstring <a href="#key-system">keySystem</a>, optional DOMString <a href="#initialization-data-type">initDataType</a>, optional DOMString contentType, optional DOMString capability);
 };
 
 interface <dfn id="dom-mediakeysession">MediaKeySession</dfn> : <a href="http://www.w3.org/TR/dom/#eventtarget">EventTarget</a> {
@@ -613,10 +613,10 @@
         <dl class="switch">
           <dt>If <var title="true">keySystem</var> is a value that may be successfully passed to <code><a href="#dom-create">create()</a></code>
 </dt>
-          <dd>Let <var title="true">probably result</var> be "<code><a href="#dom-istypesupportedprobably">probably</a></code>".</dd>
+          <dd>Let <var title="true">probably result</var> be "<code><a href="#dom-istypesupportedresultprobably">probably</a></code>".</dd>
           <dt>Otherwise <span class="non-normative">(as may be the case for strings that are only used for discovery)</span>
 </dt>
-          <dd>Let <var title="true">probably result</var> be "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Let <var title="true">probably result</var> be "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
         </dl>
       </li>
       
@@ -624,7 +624,7 @@
 <p>If <var title="true">initDataType</var> was not provided, follow the steps for the first matching condition from the following list and abort these steps:</p>
         <dl class="switch">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation is available and usable</dt>
-          <dd>Return "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Return "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -637,7 +637,7 @@
 <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">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is available and usable</dt>
-          <dd>Return "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Return "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -654,10 +654,10 @@
         <dl class="switch">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is available and usable to decrypt and enable playback of support playback of encrypted <a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-data">media data</a> for all <var title="true">media types</var>
 </dt>
-          <dd>Return "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Return "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
           <dt>If the user agent is <em>not</em> did not recognize one or more <var title="true">parameters</var>
 </dt>
-          <dd>Return "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Return "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -670,10 +670,10 @@
         <dl class="switch">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is available and usable to decrypt and enable playback of support playback of encrypted <a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-data">media data</a> for all <var title="true">media types</var> as specified by <var title="true">capability</var>
 </dt>
-          <dd>Return "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Return "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
           <dt>If the user agent is <em>not</em> did not recognize one or more <var title="true">parameters</var>
 </dt>
-          <dd>Return "<code><a href="#dom-istypesupportedmaybe">maybe</a></code>".</dd>
+          <dd>Return "<code><a href="#dom-istypesupportedresultmaybe">maybe</a></code>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -1628,7 +1628,7 @@
     <p class="exampledescription">This example requests a persistent license for future use and stores it. It also provides functions for later retrieving the license and for destroying it.</p>
 
     <div class="issue">
-<div class="issue-title"><span>Issue 7</span></div>There could be a race condition between a CDM-triggered close and setting <var>releaseRequested</var>. Fix this in the spec.</div>
+<div class="issue-title"><span>Issue 7</span></div>There could be a race condition between a CDM-triggered close and setting <var>releaseRequested</var>. This needs to be fixed in the spec. See <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=25536">Bug 25536</a>.</div>
     <div class="example">
       <pre class="code">
 &lt;script&gt;

--- a/encrypted-media/encrypted-media.xml	Fri May 02 13:04:22 2014 -0700
+++ b/encrypted-media/encrypted-media.xml	Fri May 02 13:12:44 2014 -0700
@@ -329,7 +329,7 @@
   readonly attribute <precoderef>MediaWaitingFor</precoderef> <precoderef>waitingFor</precoderef>;
 };
 
-enum <precodedfn prefix="enum">IsTypeSupported</precodedfn> { "<precodedfn prefix="istypesupportedempty"></precodedfn>" /* empty string */, "<precodedfn prefix="istypesupported">maybe</precodedfn>", "<precodedfn prefix="istypesupported">probably</precodedfn>" };
+enum <precodedfn>IsTypeSupportedResult</precodedfn> { "<precodedfn prefix="istypesupportedresultempty"></precodedfn>" /* empty string */, "<precodedfn prefix="istypesupportedresult">maybe</precodedfn>", "<precodedfn prefix="istypesupportedresult">probably</precodedfn>" };
 enum <precodedfn>SessionType</precodedfn> { "<precodedfn prefix="sessiontype">temporary</precodedfn>", "<precodedfn prefix="sessiontype">persistent</precodedfn>" };
 interface <precodedfn>MediaKeys</precodedfn> {
   readonly attribute DOMString <precoderef>keySystem</precoderef>;
@@ -339,7 +339,7 @@
   Promise&lt;any&gt; <premethodref>setServerCertificate</premethodref>(Uint8Array serverCertificate);
 
   static Promise&lt;<precoderef>MediaKeys</precoderef>&gt; <premethodref>create</premethodref>(DOMString <a href="#key-system">keySystem</a>)
-  static <precoderef prefix="enum">IsTypeSupported</precoderef> <premethodref>isTypeSupported</premethodref>(DOMstring <a href="#key-system">keySystem</a>, optional DOMString <a href="#initialization-data-type">initDataType</a>, optional DOMString contentType, optional DOMString capability);
+  static <precoderef>IsTypeSupportedResult</precoderef> <premethodref>isTypeSupported</premethodref>(DOMstring <a href="#key-system">keySystem</a>, optional DOMString <a href="#initialization-data-type">initDataType</a>, optional DOMString contentType, optional DOMString capability);
 };
 
 interface <precodedfn>MediaKeySession</precodedfn> : <dom4ref name="eventtarget">EventTarget</dom4ref> {
@@ -585,16 +585,16 @@
       <li><p>Follow the steps for the first matching condition from the following list:</p>
         <dl class="switch">
           <dt>If <var title="true">keySystem</var> is a value that may be successfully passed to <methodref>create</methodref></dt>
-          <dd>Let <var title="true">probably result</var> be "<coderef prefix="istypesupported">probably</coderef>".</dd>
+          <dd>Let <var title="true">probably result</var> be "<coderef prefix="istypesupportedresult">probably</coderef>".</dd>
           <dt>Otherwise <span class="non-normative">(as may be the case for strings that are only used for discovery)</span></dt>
-          <dd>Let <var title="true">probably result</var> be "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Let <var title="true">probably result</var> be "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
         </dl>
       </li>
       
       <li><p>If <var title="true">initDataType</var> was not provided, follow the steps for the first matching condition from the following list and abort these steps:</p>
         <dl class="switch">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation is available and usable</dt>
-          <dd>Return "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Return "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -606,7 +606,7 @@
       <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">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is available and usable</dt>
-          <dd>Return "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Return "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -621,9 +621,9 @@
       <li><p>If <var title="true">capability</var> was not provided, follow the steps for the first matching condition from the following list and abort these steps:</p>
         <dl class="switch">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is available and usable to decrypt and enable playback of support playback of encrypted <videoanchor name="media-data">media data</videoanchor> for all <var title="true">media types</var></dt>
-          <dd>Return "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Return "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
           <dt>If the user agent is <em>not</em> did not recognize one or more <var title="true">parameters</var></dt>
-          <dd>Return "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Return "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -634,9 +634,9 @@
       <li><p>Follow the steps for the first matching condition from the following list:</p>
         <dl class="switch">
           <dt>If the user agent is <em>not</em> confident that the <var title="true">keySystem</var> implementation supporting <var title="true">initDataType</var> is available and usable to decrypt and enable playback of support playback of encrypted <videoanchor name="media-data">media data</videoanchor> for all <var title="true">media types</var> as specified by <var title="true">capability</var></dt>
-          <dd>Return "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Return "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
           <dt>If the user agent is <em>not</em> did not recognize one or more <var title="true">parameters</var></dt>
-          <dd>Return "<coderef prefix="istypesupported">maybe</coderef>".</dd>
+          <dd>Return "<coderef prefix="istypesupportedresult">maybe</coderef>".</dd>
           <dt>Otherwise</dt>
           <dd>Return <var title="true">probably result</var>.</dd>
         </dl>
@@ -1558,7 +1558,7 @@
     <h3 id="example-stored-license" class="exampleheader">8.5. Stored License</h3>
     <p class="exampledescription">This example requests a persistent license for future use and stores it. It also provides functions for later retrieving the license and for destroying it.</p>
 
-    <div class="issue"><div class="issue-title"><span>Issue 7</span></div>There could be a race condition between a CDM-triggered close and setting <var>releaseRequested</var>. Fix this in the spec.</div>
+    <div class="issue"><div class="issue-title"><span>Issue 7</span></div>There could be a race condition between a CDM-triggered close and setting <var>releaseRequested</var>. This needs to be fixed in the spec. See <a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=25536">Bug 25536</a>.</div>
     <div class="example">
       <pre class="code">
 &lt;script&gt;