[EME] Move the steps to wait for MediaKeys initialization to the beginning of the createSession() task.
authorDavid Dorwin <ddorwin@google.com>
Fri, 24 Jan 2014 17:02:55 -0800
changeset 238 b24748c3d28a
parent 237 1a2d27b2171b
child 239 2e9c25eede16
[EME] Move the steps to wait for MediaKeys initialization to the beginning of the createSession() task.
encrypted-media/encrypted-media.html
encrypted-media/encrypted-media.xml
--- a/encrypted-media/encrypted-media.html	Fri Jan 24 16:54:04 2014 -0800
+++ b/encrypted-media/encrypted-media.html	Fri Jan 24 17:02:55 2014 -0800
@@ -396,13 +396,13 @@
 <p>Schedule a task to initialize the session, providing <var title="true">contentType</var>, <var title="true">initData</var>, and the new object.</p>
         <p>The user agent will asynchronously execute the following steps in the task:</p>
         <ol>
-          <li><p>Let <var title="true">request</var> be null.</p></li>
-          <li><p>Let <var title="true">defaultURL</var> be null.</p></li>
           <li><p>Wait for the <a href="#dom-media-keys-constructor"><code>MediaKeys</code> constructor</a> task to complete.</p></li>
           <li><p>
             If there is a <code><a href="#dom-mediakeyerror">MediaKeyError</a></code> stored with the <code><a href="#dom-mediakeys">MediaKeys</a></code> object that occurred because of an error during the  loading the <a href="#dom-media-keys-constructor"><code>MediaKeys</code> constructor</a> task
             then <a href="http://www.w3.org/TR/html5/webappapis.html#queue-a-task">queue a task</a> to <a href="http://www.w3.org/TR/html5/webappapis.html#fire-a-simple-event">fire a simple event</a> named <code><a href="#dom-eventerror">error</a></code> at the <code><a href="#dom-mediakeysession">MediaKeySession</a></code> object and abort these steps.
           </p></li>
+          <li><p>Let <var title="true">request</var> be null.</p></li>
+          <li><p>Let <var title="true">defaultURL</var> be null.</p></li>
           <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>
           <li>
 <p>Use <var title="true">cdm</var> to execute the following steps:</p>
--- a/encrypted-media/encrypted-media.xml	Fri Jan 24 16:54:04 2014 -0800
+++ b/encrypted-media/encrypted-media.xml	Fri Jan 24 17:02:55 2014 -0800
@@ -391,13 +391,13 @@
       <li><p>Schedule a task to initialize the session, providing <var title="true">contentType</var>, <var title="true">initData</var>, and the new object.</p>
         <p>The user agent will asynchronously execute the following steps in the task:</p>
         <ol>
-          <li><p>Let <var title="true">request</var> be null.</p></li>
-          <li><p>Let <var title="true">defaultURL</var> be null.</p></li>
           <li><p>Wait for the <a href="#dom-media-keys-constructor"><code>MediaKeys</code> constructor</a> task to complete.</p></li>
           <li><p>
             If there is a <coderef>MediaKeyError</coderef> stored with the <coderef>MediaKeys</coderef> object that occurred because of an error during the  loading the <a href="#dom-media-keys-constructor"><code>MediaKeys</code> constructor</a> task
             then <queue-a-task/> to <fire-a-simple-event/> named <coderef prefix="event">error</coderef> at the <coderef>MediaKeySession</coderef> object and abort these steps.
           </p></li>
+          <li><p>Let <var title="true">request</var> be null.</p></li>
+          <li><p>Let <var title="true">defaultURL</var> be null.</p></li>
           <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>
           <li><p>Use <var title="true">cdm</var> to execute the following steps:</p>
             <ol>