[giow] (0) <video>: Make a network error not hide what's loaded so far.

git-svn-id: http://svn.whatwg.org/webapps@5118 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Jun 29, 2010 · 3fc2ac9 · 3fc2ac9
1 parent 0a8e066
commit 3fc2ac9
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 26 deletions.
diff --git a/complete.html b/complete.html
@@ -24714,12 +24714,15 @@ <h5 id=loading-the-media-resource><span class=secno>4.8.10.5 </span>Loading the
        event</a> named <code title=event-media-error><a href=#event-media-error>error</a></code>
        at the <a href=#media-element>media element</a>.</li>
 
-       <li><p>Set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       <li><p>If the <a href=#media-element>media element</a>'s <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> attribute has a
+       value equal to <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>, set the
+       element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
        the <code title=dom-media-NETWORK_EMPTY><a href=#dom-media-network_empty>NETWORK_EMPTY</a></code>
        value and <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
-       element.</li> <!-- XXX shouldn't this be _IDLE? see
-       aborted-by-user state below -->
+       event</a> named <code title=event-media-emptied><a href=#event-media-emptied>emptied</a></code>
+       at the element. Otherwise, set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       the <code title=dom-media-NETWORK_IDLE><a href=#dom-media-network_idle>NETWORK_IDLE</a></code>
+       value.</li>
 
        <li><p>Set the element's <a href=#delaying-the-load-event-flag>delaying-the-load-event
        flag</a> to false. This stops <a href=#delay-the-load-event title="delay the load
@@ -24751,12 +24754,15 @@ <h5 id=loading-the-media-resource><span class=secno>4.8.10.5 </span>Loading the
        event</a> named <code title=event-media-error><a href=#event-media-error>error</a></code>
        at the <a href=#media-element>media element</a>.</li>
 
-       <li><p>Set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       <li><p>If the <a href=#media-element>media element</a>'s <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> attribute has a
+       value equal to <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>, set the
+       element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
        the <code title=dom-media-NETWORK_EMPTY><a href=#dom-media-network_empty>NETWORK_EMPTY</a></code>
        value and <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
-       element.</li> <!-- XXX shouldn't this be _IDLE? see
-       aborted-by-user case below -->
+       event</a> named <code title=event-media-emptied><a href=#event-media-emptied>emptied</a></code>
+       at the element. Otherwise, set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       the <code title=dom-media-NETWORK_IDLE><a href=#dom-media-network_idle>NETWORK_IDLE</a></code>
+       value.</li>
 
        <li><p>Set the element's <a href=#delaying-the-load-event-flag>delaying-the-load-event
        flag</a> to false. This stops <a href=#delay-the-load-event title="delay the load

diff --git a/index b/index
@@ -24641,12 +24641,15 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
        event</a> named <code title=event-media-error><a href=#event-media-error>error</a></code>
        at the <a href=#media-element>media element</a>.</li>
 
-       <li><p>Set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       <li><p>If the <a href=#media-element>media element</a>'s <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> attribute has a
+       value equal to <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>, set the
+       element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
        the <code title=dom-media-NETWORK_EMPTY><a href=#dom-media-network_empty>NETWORK_EMPTY</a></code>
        value and <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
-       element.</li> <!-- XXX shouldn't this be _IDLE? see
-       aborted-by-user state below -->
+       event</a> named <code title=event-media-emptied><a href=#event-media-emptied>emptied</a></code>
+       at the element. Otherwise, set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       the <code title=dom-media-NETWORK_IDLE><a href=#dom-media-network_idle>NETWORK_IDLE</a></code>
+       value.</li>
 
        <li><p>Set the element's <a href=#delaying-the-load-event-flag>delaying-the-load-event
        flag</a> to false. This stops <a href=#delay-the-load-event title="delay the load
@@ -24678,12 +24681,15 @@ interface <dfn id=htmlaudioelement>HTMLAudioElement</dfn> : <a href=#htmlmediael
        event</a> named <code title=event-media-error><a href=#event-media-error>error</a></code>
        at the <a href=#media-element>media element</a>.</li>
 
-       <li><p>Set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       <li><p>If the <a href=#media-element>media element</a>'s <code title=dom-media-readyState><a href=#dom-media-readystate>readyState</a></code> attribute has a
+       value equal to <code title=dom-media-HAVE_NOTHING><a href=#dom-media-have_nothing>HAVE_NOTHING</a></code>, set the
+       element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
        the <code title=dom-media-NETWORK_EMPTY><a href=#dom-media-network_empty>NETWORK_EMPTY</a></code>
        value and <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
-       element.</li> <!-- XXX shouldn't this be _IDLE? see
-       aborted-by-user case below -->
+       event</a> named <code title=event-media-emptied><a href=#event-media-emptied>emptied</a></code>
+       at the element. Otherwise, set the element's <code title=dom-media-networkState><a href=#dom-media-networkstate>networkState</a></code> attribute to
+       the <code title=dom-media-NETWORK_IDLE><a href=#dom-media-network_idle>NETWORK_IDLE</a></code>
+       value.</li>
 
        <li><p>Set the element's <a href=#delaying-the-load-event-flag>delaying-the-load-event
        flag</a> to false. This stops <a href=#delay-the-load-event title="delay the load

diff --git a/source b/source
@@ -26585,14 +26585,19 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
        event</span> named <code title="event-media-error">error</code>
        at the <span>media element</span>.</p></li>
 
-       <li><p>Set the element's <code
+       <li><p>If the <span>media element</span>'s <code
+       title="dom-media-readyState">readyState</code> attribute has a
+       value equal to <code
+       title="dom-media-HAVE_NOTHING">HAVE_NOTHING</code>, set the
+       element's <code
        title="dom-media-networkState">networkState</code> attribute to
        the <code title="dom-media-NETWORK_EMPTY">NETWORK_EMPTY</code>
        value and <span>queue a task</span> to <span>fire a simple
-       event</span> named <code
-       title="event-media-emptied">emptied</code> at the
-       element.</p></li> <!-- XXX shouldn't this be _IDLE? see
-       aborted-by-user state below -->
+       event</span> named <code title="event-media-emptied">emptied</code>
+       at the element. Otherwise, set the element's <code
+       title="dom-media-networkState">networkState</code> attribute to
+       the <code title="dom-media-NETWORK_IDLE">NETWORK_IDLE</code>
+       value.</p></li>
 
        <li><p>Set the element's <span>delaying-the-load-event
        flag</span> to false. This stops <span title="delay the load
@@ -26632,14 +26637,19 @@ interface <dfn>HTMLAudioElement</dfn> : <span>HTMLMediaElement</span> {};</pre>
        event</span> named <code title="event-media-error">error</code>
        at the <span>media element</span>.</p></li>
 
-       <li><p>Set the element's <code
+       <li><p>If the <span>media element</span>'s <code
+       title="dom-media-readyState">readyState</code> attribute has a
+       value equal to <code
+       title="dom-media-HAVE_NOTHING">HAVE_NOTHING</code>, set the
+       element's <code
        title="dom-media-networkState">networkState</code> attribute to
        the <code title="dom-media-NETWORK_EMPTY">NETWORK_EMPTY</code>
        value and <span>queue a task</span> to <span>fire a simple
-       event</span> named <code
-       title="event-media-emptied">emptied</code> at the
-       element.</p></li> <!-- XXX shouldn't this be _IDLE? see
-       aborted-by-user case below -->
+       event</span> named <code title="event-media-emptied">emptied</code>
+       at the element. Otherwise, set the element's <code
+       title="dom-media-networkState">networkState</code> attribute to
+       the <code title="dom-media-NETWORK_IDLE">NETWORK_IDLE</code>
+       value.</p></li>
 
        <li><p>Set the element's <span>delaying-the-load-event
        flag</span> to false. This stops <span title="delay the load