hixie: Simplify the load() algorithm a bunch. (whatwg r4264)

hixie: Simplify the load() algorithm a bunch. (whatwg r4264)

http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.3406&r2=1.3407&f=h
http://html5.org/tools/web-apps-tracker?from=4263&to=4264

===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.3406
retrieving revision 1.3407
diff -u -d -r1.3406 -r1.3407
--- Overview.html 21 Oct 2009 12:03:10 -0000 1.3406
+++ Overview.html 21 Oct 2009 12:08:06 -0000 1.3407
@@ -19561,11 +19561,7 @@
   the <code title="dom-media-load"><a href="#dom-media-load">load()</a></code> method itself is
   invoked again.</p>
 
-  <ol><li><p>If the <code title="dom-media-load"><a href="#dom-media-load">load()</a></code> method for
-   this element is already being invoked, then abort these
-   steps.</li>
-
-   <li><p>Abort any already-running instance of the <a href="#concept-media-load-algorithm" title="concept-media-load-algorithm">resource selection
+  <ol><li><p>Abort any already-running instance of the <a href="#concept-media-load-algorithm" title="concept-media-load-algorithm">resource selection
    algorithm</a> for this element.</li>
 
    <li>
@@ -19581,9 +19577,9 @@
 
    </li>
 
-   <li><p>If the <a href="#media-element">media element</a>'s <code title="dom-media-networkState"><a href="#dom-media-networkstate">networkState</a></code> is set to <code title="dom-media-NETWORK_LOADING"><a href="#dom-media-network_loading">NETWORK_LOADING</a></code> or <code title="dom-media-NETWORK_IDLE"><a href="#dom-media-network_idle">NETWORK_IDLE</a></code>, let <var title="">aborted</var> be true; otherwise, let <var title="">aborted</var> be false.</li>
-
-   <li><p>Let <var title="">emptied</var> be false.</li>
+   <li><p>If the <a href="#media-element">media element</a>'s <code title="dom-media-networkState"><a href="#dom-media-networkstate">networkState</a></code> is set to <code title="dom-media-NETWORK_LOADING"><a href="#dom-media-network_loading">NETWORK_LOADING</a></code> or <code title="dom-media-NETWORK_IDLE"><a href="#dom-media-network_idle">NETWORK_IDLE</a></code>, <a href="#queue-a-task">queue a
+   task</a> to <a href="#fire-a-simple-event">fire a simple event</a> named <code title="event-media-abort"><a href="#event-media-abort">abort</a></code> at the <a href="#media-element">media
+   element</a>.</li>
 
    <li>
 
@@ -19609,7 +19605,9 @@
 
      <li>Set the <a href="#current-playback-position">current playback position</a> to 0.</li>
 
-     <li>Let <var title="">emptied</var> be true.</li>
+     <li><p><a href="#queue-a-task">Queue a task</a> to <a href="#fire-a-simple-event">fire a simple
+     event</a> named <code title="event-media-emptied"><a href="#event-media-emptied">emptied</a></code> at the <a href="#media-element">media
+     element</a>.</li>
 
     </ol></li>
 
@@ -19620,14 +19618,6 @@
    <li><p>Set the <code title="dom-media-error"><a href="#dom-media-error">error</a></code> attribute
    to null and the <a href="#autoplaying-flag">autoplaying flag</a> to true.</li>
 
-   <li><p>If <var title="">aborted</var> is true, <a href="#queue-a-task">queue a
-   task</a> to <a href="#fire-a-simple-event">fire a simple event</a> named <code title="event-media-abort"><a href="#event-media-abort">abort</a></code> at the <a href="#media-element">media
-   element</a>.</li>
-
-   <li><p>If <var title="">emptied</var> is true, <a href="#queue-a-task">queue a
-   task</a> to <a href="#fire-a-simple-event">fire a simple event</a> named <code title="event-media-emptied"><a href="#event-media-emptied">emptied</a></code> at the <a href="#media-element">media
-   element</a>.</li>
-
    <li><p>Invoke the <a href="#media-element">media element</a>'s <a href="#concept-media-load-algorithm" title="concept-media-load-algorithm">resource selection
    algorithm</a>.</li>

Received on Wednesday, 21 October 2009 12:08:47 UTC