html5/spec spec.html,1.1442,1.1443 video.html,1.938,1.939

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv13747

Modified Files:
	spec.html video.html 
Log Message:
more minor tweaks to the event descriptions (whatwg r6013)

[updated by splitter]


Index: video.html
===================================================================
RCS file: /sources/public/html5/spec/video.html,v
retrieving revision 1.938
retrieving revision 1.939
diff -u -d -r1.938 -r1.939
--- video.html	13 Apr 2011 22:46:49 -0000	1.938
+++ video.html	15 Apr 2011 01:46:40 -0000	1.939
@@ -2826,10 +2826,10 @@
 
       <p>Otherwise, the <a href="#media-element">media element</a>'s <code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> attribute has the
       value <code title="dom-media-HAVE_FUTURE_DATA"><a href="#dom-media-have_future_data">HAVE_FUTURE_DATA</a></code> or
-      <code title="dom-media-HAVE_ENOUGH_DATA"><a href="#dom-media-have_enough_data">HAVE_ENOUGH_DATA</a></code>;
-      <a href="webappapis.html#queue-a-task">queue a task</a> to <a href="webappapis.html#fire-a-simple-event">fire a simple event</a>
-      named <code title="event-media-playing"><a href="#event-media-playing">playing</a></code> at the
-      element.</p>
+      <code title="dom-media-HAVE_ENOUGH_DATA"><a href="#dom-media-have_enough_data">HAVE_ENOUGH_DATA</a></code>; if
+      the <a href="#media-element">media element</a> is <a href="#potentially-playing">potentially
+      playing</a>, then <a href="webappapis.html#queue-a-task">queue a task</a> to <a href="webappapis.html#fire-a-simple-event">fire a
+      simple event</a> named <code title="event-media-playing"><a href="#event-media-playing">playing</a></code> at the element.</p>
 
      </li>
 
@@ -4661,14 +4661,6 @@
      </td><td><code><a href="infrastructure.html#event">Event</a></code>
      </td><td>The user agent can render the <a href="#media-data">media data</a> at the <a href="#current-playback-position">current playback position</a> for the first time.
      </td><td><code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> newly increased to <code title="dom-media-HAVE_CURRENT_DATA"><a href="#dom-media-have_current_data">HAVE_CURRENT_DATA</a></code> or greater for the first time.
-    </td></tr><tr><td><dfn id="event-media-waiting" title="event-media-waiting"><code>waiting</code></dfn>
-     </td><td><code><a href="infrastructure.html#event">Event</a></code>
-     </td><td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
-     </td><td><code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> is newly equal to or less than <code title="dom-media-HAVE_CURRENT_DATA"><a href="#dom-media-have_current_data">HAVE_CURRENT_DATA</a></code>, and <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> is false. Either <code title="dom-media-seeking"><a href="#dom-media-seeking">seeking</a></code> is true, or the <a href="#current-playback-position">current playback position</a> is not contained in any of the ranges in <code title="dom-media-buffered"><a href="#dom-media-buffered">buffered</a></code>. It is possible for playback to stop for two other reasons without <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> being false, but those two reasons do not fire this event: maybe <a href="#ended-playback" title="ended playback">playback ended</a>, or playback <a href="#stopped-due-to-errors">stopped due to errors</a>.
-    </td></tr><tr><td><dfn id="event-media-playing" title="event-media-playing"><code>playing</code></dfn>
-     </td><td><code><a href="infrastructure.html#event">Event</a></code>
-     </td><td>Playback has started.
-     </td><td><code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> is newly equal to or greater than <code title="dom-media-HAVE_FUTURE_DATA"><a href="#dom-media-have_future_data">HAVE_FUTURE_DATA</a></code>, <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> is false, <code title="dom-media-seeking"><a href="#dom-media-seeking">seeking</a></code> is false, or the <a href="#current-playback-position">current playback position</a> is contained in one of the ranges in <code title="dom-media-buffered"><a href="#dom-media-buffered">buffered</a></code>.
     </td></tr><tr><td><dfn id="event-media-canplay" title="event-media-canplay"><code>canplay</code></dfn>
      </td><td><code><a href="infrastructure.html#event">Event</a></code>
      </td><td>The user agent can resume playback of the <a href="#media-data">media data</a>, but estimates that if playback were to be started now, the <a href="#media-resource">media resource</a> could not be rendered at the current playback rate up to its end without having to stop for further buffering of content.
@@ -4677,7 +4669,17 @@
      </td><td><code><a href="infrastructure.html#event">Event</a></code>
      </td><td>The user agent estimates that if playback were to be started now, the <a href="#media-resource">media resource</a> could be rendered at the current playback rate all the way to its end without having to stop for further buffering.
      </td><td><code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> is newly equal to <code title="dom-media-HAVE_ENOUGH_DATA"><a href="#dom-media-have_enough_data">HAVE_ENOUGH_DATA</a></code>.
-
+    </td></tr><tr><td><dfn id="event-media-waiting" title="event-media-waiting"><code>waiting</code></dfn>
+     </td><td><code><a href="infrastructure.html#event">Event</a></code>
+     </td><td>Playback has stopped because the next frame is not available, but the user agent expects that frame to become available in due course.
+     </td><td><code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> is equal to or less than <code title="dom-media-HAVE_CURRENT_DATA"><a href="#dom-media-have_current_data">HAVE_CURRENT_DATA</a></code>, and <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> is false. Either <code title="dom-media-seeking"><a href="#dom-media-seeking">seeking</a></code> is true, or the <a href="#current-playback-position">current playback position</a> is not contained in any of the ranges in <code title="dom-media-buffered"><a href="#dom-media-buffered">buffered</a></code>. It is possible for playback to stop for other reasons without <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> being false, but those reasons do not fire this event: e.g.
+     <a href="#ended-playback" title="ended playback">playback ended</a>, or playback <a href="#stopped-due-to-errors">stopped due to errors</a>, or the element has <a href="#paused-for-user-interaction">paused for user interaction</a>.
+    </td></tr><tr><td><dfn id="event-media-playing" title="event-media-playing"><code>playing</code></dfn>
+     </td><td><code><a href="infrastructure.html#event">Event</a></code>
+     </td><td>Playback has started after having been delayed due to lack of <a href="#media-data">media data</a>.
+     </td><td>The element is newly <a href="#potentially-playing">potentially playing</a>, either because <code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> is newly equal to or greater than <code title="dom-media-HAVE_FUTURE_DATA"><a href="#dom-media-have_future_data">HAVE_FUTURE_DATA</a></code>, or because <code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> is newly false. It is possible for playback to start without this event firing, e.g. if when playback would have started, 
+     the element had been <a href="#paused-for-user-interaction">paused for user interaction</a>.
+     
    </td></tr></tbody><tbody><tr><td><dfn id="event-media-seeking" title="event-media-seeking"><code>seeking</code></dfn>
      </td><td><code><a href="infrastructure.html#event">Event</a></code>
      </td><td>The <code title="dom-media-seeking"><a href="#dom-media-seeking">seeking</a></code> IDL attribute changed to true and the seek operation is taking long enough that the user agent has time to fire the event.
@@ -4701,11 +4703,11 @@
      </td><td>
     </td></tr><tr><td><dfn id="event-media-play" title="event-media-play"><code>play</code></dfn>
      </td><td><code><a href="infrastructure.html#event">Event</a></code>
-     </td><td>Playback has begun. Fired after the <code title="dom-media-play"><a href="#dom-media-play">play()</a></code> method has returned, or when the <code title="attr-media-autoplay"><a href="#attr-media-autoplay">autoplay</a></code> attribute has caused playback to begin.
+     </td><td>The element is no longer paused. Fired after the <code title="dom-media-play"><a href="#dom-media-play">play()</a></code> method has returned, or when the <code title="attr-media-autoplay"><a href="#attr-media-autoplay">autoplay</a></code> attribute has caused playback to begin.
      </td><td><code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> is newly false.
     </td></tr><tr><td><dfn id="event-media-pause" title="event-media-pause"><code>pause</code></dfn>
      </td><td><code><a href="infrastructure.html#event">Event</a></code>
-     </td><td>Playback has been paused. Fired after the <code title="dom-media-pause"><a href="#dom-media-pause">pause()</a></code> method has returned.
+     </td><td>The element has been paused. Fired after the <code title="dom-media-pause"><a href="#dom-media-pause">pause()</a></code> method has returned.
      </td><td><code title="dom-media-paused"><a href="#dom-media-paused">paused</a></code> is newly true.
     </td></tr><tr><td><dfn id="event-media-ratechange" title="event-media-ratechange"><code>ratechange</code></dfn>
      </td><td><code><a href="infrastructure.html#event">Event</a></code>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1442
retrieving revision 1.1443
diff -u -d -r1.1442 -r1.1443
--- spec.html	15 Apr 2011 00:46:57 -0000	1.1442
+++ spec.html	15 Apr 2011 01:46:40 -0000	1.1443
@@ -367,7 +367,7 @@
     <a href="Overview.html">single page HTML</a>,
     <a href="spec.html">multipage HTML</a>,
     <a href="author/">web developer edition</a>.
-This is revision 1.4832.
+This is revision 1.4835.
    </p> 
      <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a>
    &#169; 2010 <a href="http://www.w3.org/"><abbr title="World Wide

Received on Friday, 15 April 2011 01:46:44 UTC