[EME] More minor fixes for Bug 24323 - Rename "First Time a Key Reference is Encountered" algorithm and remove key ID checks from Container Guidelines subsections
authorDavid Dorwin <ddorwin@google.com>
Mon, 28 Apr 2014 17:38:59 -0700
changeset 295 de0a073d6c16
parent 294 782a76af27a4
child 296 97f675a78a34
[EME] More minor fixes for Bug 24323 - Rename "First Time a Key Reference is Encountered" algorithm and remove key ID checks from Container Guidelines subsections
encrypted-media/encrypted-media.html
encrypted-media/encrypted-media.xml
--- a/encrypted-media/encrypted-media.html	Mon Apr 28 14:56:55 2014 -0700
+++ b/encrypted-media/encrypted-media.html	Mon Apr 28 17:38:59 2014 -0700
@@ -1000,13 +1000,13 @@
     <h2 id="algorithms">4. Algorithms</h2>
 
     <h3 id="algorithms-initdata-encountered">4.1. Initialization Data Encountered</h3>
-    <p>The following steps are run when the <a href="#media-element">media element</a> encounters a source that may contain encrypted blocks or streams during the <a href="http://www.w3.org/TR/html5/embedded-content-0.html#concept-media-load-resource">resource fetch algorithm</a>:</p>
+    <p>The following steps are run when the <a href="#media-element">media element</a> encounters <a href="#initialization-data">Initialization Data</a> in the <a href="http://www.w3.org/TR/html5/embedded-content-0.html#media-data">media data</a> during the <a href="http://www.w3.org/TR/html5/embedded-content-0.html#concept-media-load-resource">resource fetch algorithm</a>:</p>
 
     <ol>
       <li><p>Let <var title="">initDataType</var> be the empty string.</p></li>
       <li><p>Let <var title="">initData</var> be null.</p></li>
       <li>
-        <p>If <a href="#initialization-data">Initialization Data</a> was encountered and 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>, run the following steps:</p>
+        <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>, run the following steps:</p>
         <ol>
           <li><p>Let <var title="">initDataType</var> be the string representing the <a href="#initialization-data-type">initialization data type</a> of that initialization data.</p></li>
           <li><p>Let <var title="">initData</var> be that initialization data.</p></li>
--- a/encrypted-media/encrypted-media.xml	Mon Apr 28 14:56:55 2014 -0700
+++ b/encrypted-media/encrypted-media.xml	Mon Apr 28 17:38:59 2014 -0700
@@ -942,13 +942,13 @@
     <h2 id="algorithms">4. Algorithms</h2>
 
     <h3 id="algorithms-initdata-encountered">4.1. Initialization Data Encountered</h3>
-    <p>The following steps are run when the <a href="#media-element">media element</a> encounters a source that may contain encrypted blocks or streams during the <resource-fetch-algorithm/>:</p>
+    <p>The following steps are run when the <a href="#media-element">media element</a> encounters <a href="#initialization-data">Initialization Data</a> in the <videoanchor name="media-data">media data</videoanchor> during the <resource-fetch-algorithm/>:</p>
 
     <ol>
       <li><p>Let <var title="">initDataType</var> be the empty string.</p></li>
       <li><p>Let <var title="">initData</var> be null.</p></li>
       <li>
-        <p>If <a href="#initialization-data">Initialization Data</a> was encountered and if the <videoanchor name="media-data">media data</videoanchor> is <cors-same-origin/>, run the following steps:</p>
+        <p>If the <videoanchor name="media-data">media data</videoanchor> is <cors-same-origin/>, run the following steps:</p>
         <ol>
           <li><p>Let <var title="">initDataType</var> be the string representing the <a href="#initialization-data-type">initialization data type</a> of that initialization data.</p></li>
           <li><p>Let <var title="">initData</var> be that initialization data.</p></li>