[html5] r1774 - /

[whatwg at whatwg.org]

Author: ianh
Date: 2008-06-13 02:31:51 -0700 (Fri, 13 Jun 2008)
New Revision: 1774

Modified:
   index
   source
Log:
[e] (0) Jiggle height/width around so that width comes first, and a minor correction... (credit: pt)

Modified: index
===================================================================
--- index	2008-06-13 09:24:49 UTC (rev 1773)
+++ index	2008-06-13 09:31:51 UTC (rev 1774)
@@ -15385,29 +15385,38 @@
    contain the video represent nothing.
 
   <p>The <dfn id=adjusted>adjusted aspect ratio</dfn> of a video is the ratio
-   of its intrinsic width to its intrinsic height. The intrinsic height of a
-   video is the height given by the resource itself. If the video's <a
-   href="#pixel0">pixel ratio override</a>'s is <i>none</i>, then the video's
-   intrinsic width is the width given by the resource itself. If the video
-   has a <a href="#pixel0">pixel ratio override</a> other than <i>none</i>,
-   then the intrinsic width of the video is the width given by the resource
-   itself, divided by the pixel ratio given by the resource itself,
-   multiplied by the video's <a href="#pixel0">pixel ratio override</a>.
+   of its intrinsic width to its intrinsic height.
 
-  <p>If the resource doesn't give an explicit height, then user agents should
-   assume that the height of each pixel of the video data is exactly one CSS
-   pixel. If the resource doesn't give an explicit width, then user agents
-   should assume that the width of each pixel of the video data is exactly
-   one CSS pixel multiplied by the resource's pixel ratio. If the resource
-   doesn't give an explicit pixel ratio, then user agents should assume that
-   the pixel ratio is 1.0.
+  <p>If the video's <a href="#pixel0">pixel ratio override</a>'s is
+   <i>none</i>, then the video's intrinsic width is the width given by the
+   resource itself. If the video has a <a href="#pixel0">pixel ratio
+   override</a> other than <i>none</i>, then the intrinsic width of the video
+   is the width given by the resource itself, divided by the pixel ratio
+   given by the resource itself, multiplied by the video's <a
+   href="#pixel0">pixel ratio override</a>. If the resource doesn't give an
+   explicit width, then user agents should assume that the width of each
+   pixel of the video data is exactly one CSS pixel multiplied by the
+   resource's pixel ratio. If the resource doesn't give an explicit pixel
+   ratio, then user agents should assume that the pixel ratio is 1.0.
 
-  <p>User agents may adjust the intrinsic height and width of the video to
+  <p>The intrinsic height of a video is the height given by the resource
+   itself. If the resource doesn't give an explicit height, then user agents
+   should assume that the height of each pixel of the video data is exactly
+   one CSS pixel.
+
+  <p>User agents may adjust the intrinsic width and height of the video to
    ensure that each pixel of video data corresponds to at least one device
    pixel, so long as this doesn't affect the <a href="#adjusted">adjusted
    aspect ratio</a> (this is especially relevant for pixel ratios that are
    less than 1.0).
 
+  <p>The intrinsic width of a <code><a href="#video1">video</a></code>
+   element's playback area is the intrinsic width of the video resource, if
+   that is available; otherwise it is the intrinsic width of the resource
+   given by the <code title=attr-video-poster><a
+   href="#poster">poster</a></code> attribute, if that is available;
+   otherwise it is 300 CSS pixels.
+
   <p>The intrinsic height of a <code><a href="#video1">video</a></code>
    element's playback area is the intrinsic height of the video resource, if
    that is available; otherwise it is the intrinsic height of the resource
@@ -15415,13 +15424,6 @@
    href="#poster">poster</a></code> attribute, if that is available;
    otherwise it is 150 CSS pixels.
 
-  <p>The intrinsic width of a <code><a href="#video1">video</a></code>
-   element's playback area is the intrinsic width of the video resource, if
-   that is available; otherwise it is the intrinsic height of the resource
-   given by the <code title=attr-video-poster><a
-   href="#poster">poster</a></code> attribute, if that is available;
-   otherwise it is 300 CSS pixels.
-
   <p class=note>The image given by the <code title=attr-video-poster><a
    href="#poster">poster</a></code> attribute is not affected by the pixel
    ratio conversions.

Modified: source
===================================================================
--- source	2008-06-13 09:24:49 UTC (rev 1773)
+++ source	2008-06-13 09:31:51 UTC (rev 1774)
@@ -13306,43 +13306,44 @@
   do not contain the video represent nothing.</p>
 
   <p>The <dfn>adjusted aspect ratio</dfn> of a video is the ratio of
-  its intrinsic width to its intrinsic height. The intrinsic height of
-  a video is the height given by the resource itself. If the video's
-  <span>pixel ratio override</span>'s is <i>none</i>, then the video's
-  intrinsic width is the width given by the resource itself. If the
-  video has a <span>pixel ratio override</span> other than
-  <i>none</i>, then the intrinsic width of the video is the width
-  given by the resource itself, divided by the pixel ratio given by
-  the resource itself, multiplied by the video's <span>pixel ratio
-  override</span>.</p>
+  its intrinsic width to its intrinsic height.</p>
 
-  <p>If the resource doesn't give an explicit height, then user agents
-  should assume that the height of each pixel of the video data is
-  exactly one CSS pixel. If the resource doesn't give an explicit
-  width, then user agents should assume that the width of each pixel
-  of the video data is exactly one CSS pixel multiplied by the
-  resource's pixel ratio. If the resource doesn't give an explicit
+  <p>If the video's <span>pixel ratio override</span>'s is
+  <i>none</i>, then the video's intrinsic width is the width given by
+  the resource itself. If the video has a <span>pixel ratio
+  override</span> other than <i>none</i>, then the intrinsic width of
+  the video is the width given by the resource itself, divided by the
+  pixel ratio given by the resource itself, multiplied by the video's
+  <span>pixel ratio override</span>. If the resource doesn't give an
+  explicit width, then user agents should assume that the width of
+  each pixel of the video data is exactly one CSS pixel multiplied by
+  the resource's pixel ratio. If the resource doesn't give an explicit
   pixel ratio, then user agents should assume that the pixel ratio is
   1.0.</p>
 
-  <p>User agents may adjust the intrinsic height and width of the
+  <p>The intrinsic height of a video is the height given by the
+  resource itself. If the resource doesn't give an explicit height,
+  then user agents should assume that the height of each pixel of the
+  video data is exactly one CSS pixel.</p>
+
+  <p>User agents may adjust the intrinsic width and height of the
   video to ensure that each pixel of video data corresponds to at
   least one device pixel, so long as this doesn't affect the
   <span>adjusted aspect ratio</span> (this is especially relevant for
   pixel ratios that are less than 1.0).</p>
 
+  <p>The intrinsic width of a <code>video</code> element's playback
+  area is the intrinsic width of the video resource, if that is
+  available; otherwise it is the intrinsic width of the resource given
+  by the <code title="attr-video-poster">poster</code> attribute, if
+  that is available; otherwise it is 300 CSS pixels.</p>
+
   <p>The intrinsic height of a <code>video</code> element's playback
   area is the intrinsic height of the video resource, if that is
   available; otherwise it is the intrinsic height of the resource given
   by the <code title="attr-video-poster">poster</code> attribute, if
   that is available; otherwise it is 150 CSS pixels.</p>
 
-  <p>The intrinsic width of a <code>video</code> element's playback
-  area is the intrinsic width of the video resource, if that is
-  available; otherwise it is the intrinsic height of the resource
-  given by the <code title="attr-video-poster">poster</code>
-  attribute, if that is available; otherwise it is 300 CSS pixels.</p>
-
   <p class="note">The image given by the <code
   title="attr-video-poster">poster</code> attribute is not affected by
   the pixel ratio conversions.</p>