html5/spec semantics.html,1.1037,1.1038 spec.html,1.1369,1.1370 video.html,1.910,1.911 from Michael Smith via cvs-syncmail on 2011-01-12 (public-html-commits@w3.org from January 2011)

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 12 Jan 2011 19:46:40 +0000
To: public-html-commits@w3.org
Message-Id: <E1Pd6eW-0002FZ-Fc@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv8631

Modified Files:
	semantics.html spec.html video.html 
Log Message:
Define how <style scoped> affects @rules. (whatwg r5781)

[updated by splitter]


Index: video.html
===================================================================
RCS file: /sources/public/html5/spec/video.html,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -d -r1.910 -r1.911
--- video.html	12 Jan 2011 03:46:49 -0000	1.910
+++ video.html	12 Jan 2011 19:46:38 -0000	1.911
@@ -439,7 +439,9 @@
 
   <hr><p>When no video data is available (the element's <code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> attribute is either
   <code title="dom-media-HAVE_NOTHING"><a href="#dom-media-have_nothing">HAVE_NOTHING</a></code>, or <code title="dom-media-HAVE_METADATA"><a href="#dom-media-have_metadata">HAVE_METADATA</a></code> but no video
-  data has yet been obtained at all), the <code><a href="#video">video</a></code> element
+  data has yet been obtained at all, or the element's <code title="dom-media-readyState"><a href="#dom-media-readystate">readyState</a></code> attribute is any
+  subsequent value but the <a href="#media-resource">media resource</a> does not have a
+  video channel), the <code><a href="#video">video</a></code> element
   <a href="rendering.html#represents">represents</a> either the <a href="#poster-frame">poster frame</a>, or
   nothing.</p>
 
@@ -454,25 +456,29 @@
   be preferred over nothing, but the <a href="#poster-frame">poster frame</a> should
   not be shown again after a frame of video has been shown.</p>
 
-  <p>When a <code><a href="#video">video</a></code> element is <a href="#dom-media-paused" title="dom-media-paused">paused</a> at any other position, the
-  element <a href="rendering.html#represents">represents</a> the frame of video corresponding to
-  the <a href="#current-playback-position" title="current playback position">current playback
+  <p>When a <code><a href="#video">video</a></code> element is <a href="#dom-media-paused" title="dom-media-paused">paused</a> at any other position, and
+  the <a href="#media-resource">media resource</a> has a video channel, the element
+  <a href="rendering.html#represents">represents</a> the frame of video corresponding to the
+  <a href="#current-playback-position" title="current playback position">current playback
   position</a>, or, if that is not yet available (e.g. because the
   video is seeking or buffering), the last frame of the video to have
   been rendered.</p>
 
-  <p>When a <code><a href="#video">video</a></code> element is <a href="#potentially-playing">potentially
+  <p>When a <code><a href="#video">video</a></code> element whose <a href="#media-resource">media
+  resource</a> has a video channel is <a href="#potentially-playing">potentially
   playing</a>, it <a href="rendering.html#represents">represents</a> the frame of video at the
   continuously increasing <a href="#current-playback-position" title="current playback
   position">"current" position</a>. When the <a href="#current-playback-position">current playback
   position</a> changes such that the last frame rendered is no
   longer the frame corresponding to the <a href="#current-playback-position">current playback
-  position</a> in the video, the new frame must be
-  rendered. Similarly, any audio associated with the video must, if
-  played, be played synchronized with the <a href="#current-playback-position">current playback
-  position</a>, at the specified <a href="#dom-media-volume" title="dom-media-volume">volume</a> with the specified <a href="#dom-media-muted" title="dom-media-muted">mute state</a>.</p>
+  position</a> in the video, the new frame must be rendered.
 
-  <p>When a <code><a href="#video">video</a></code> element is neither <a href="#potentially-playing">potentially
+  Similarly, any audio associated with the <a href="#media-resource">media resource</a>
+  must, if played, be played synchronized with the <a href="#current-playback-position">current
+  playback position</a>, at the specified <a href="#dom-media-volume" title="dom-media-volume">volume</a> with the specified <a href="#dom-media-muted" title="dom-media-muted">mute state</a>.</p>
+
+  <p>When a <code><a href="#video">video</a></code> element whose <a href="#media-resource">media
+  resource</a> has a video channel is neither <a href="#potentially-playing">potentially
   playing</a> nor <a href="#dom-media-paused" title="dom-media-paused">paused</a>
   (e.g. when seeking or stalled), the element <a href="rendering.html#represents">represents</a>
   the last frame of the video to have been rendered.</p>

Index: semantics.html
===================================================================
RCS file: /sources/public/html5/spec/semantics.html,v
retrieving revision 1.1037
retrieving revision 1.1038
diff -u -d -r1.1037 -r1.1038
--- semantics.html	12 Jan 2011 03:46:47 -0000	1.1037
+++ semantics.html	12 Jan 2011 19:46:37 -0000	1.1038
@@ -1804,6 +1804,18 @@
   (if any), and that element's child nodes. Otherwise, the specified
   styles must, if applied, be applied to the entire document.</p>
 
+  <p>For scoped CSS resources, the effect of @-rules must be scoped to
+  the scoped sheet and its subresources, even if the @-rule in
+  question would ordinarily apply to all style sheets that affect the
+  <code><a href="infrastructure.html#document">Document</a></code>. Any '@page' rules in scoped CSS resources
+  must be ignored.</p>
+
+  <p class="example">For example, an '@font-face' rule defined in a
+  scoped style sheet would only define the font for the purposes of
+  font rules in the scoped section; style sheets outside the scoped
+  section using the same font name would not end up using that
+  embedded font.</p>
+
   </div><p id="title-on-style">The <dfn id="attr-style-title" title="attr-style-title"><code>title</code></dfn> attribute on
   <code><a href="#the-style-element">style</a></code> elements defines <span>alternative style sheet
   sets</span>. If the <code><a href="#the-style-element">style</a></code> element has no <code title="attr-style-title"><a href="#attr-style-title">title</a></code> attribute, then it has no

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1369
retrieving revision 1.1370
diff -u -d -r1.1369 -r1.1370
--- spec.html	12 Jan 2011 06:46:40 -0000	1.1369
+++ spec.html	12 Jan 2011 19:46:38 -0000	1.1370
@@ -351,7 +351,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.4642.
+This is revision 1.4644.
    </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 Wednesday, 12 January 2011 19:46:42 UTC