html5/spec history.html,1.1034,1.1035 spec.html,1.1403,1.1404 the-iframe-element.html,1.40,1.41 video.html,1.922,1.923 from Michael Smith via cvs-syncmail on 2011-03-04 (public-html-commits@w3.org from March 2011)

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Fri, 04 Mar 2011 23:46:40 +0000
To: public-html-commits@w3.org
Message-Id: <E1Pvehk-0008J0-QS@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv31730

Modified Files:
	history.html spec.html the-iframe-element.html video.html 
Log Message:
Clarify the weird interaction of <object> and manifest=''. (whatwg r5943)

[updated by splitter]


Index: the-iframe-element.html
===================================================================
RCS file: /sources/public/html5/spec/the-iframe-element.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- the-iframe-element.html	3 Feb 2011 20:57:43 -0000	1.40
+++ the-iframe-element.html	4 Mar 2011 23:46:38 -0000	1.41
@@ -1551,6 +1551,11 @@
       until the <a href="webappapis.html#concept-task" title="concept-task">task</a> that is <a href="webappapis.html#queue-a-task" title="queue a task">queued</a> by the <a href="webappapis.html#networking-task-source">networking task
       source</a> once the resource has been <a href="fetching-resources.html#fetch" title="fetch">fetched</a> (defined next) has been run.</p>
 
+      <p>For the purposes of the <a href="offline.html#application-cache">application cache</a>
+      networking model, this <a href="fetching-resources.html#fetch">fetch</a> operation is not for a
+      <a href="browsers.html#child-browsing-context">child browsing context</a> (though it might end up
+      being used for one after all, as defined below).</p>
+
      </li>
 
      <li><p>If the resource is not yet available (e.g. because the
@@ -1844,12 +1849,19 @@
         to the value of this attribute; otherwise, the <a href="browsers.html#browsing-context-name">browsing
         context name</a> must be set to the empty string.</p>
 
-        <p class="note">It's possible that the <a href="history.html#navigate" title="navigate">navigation</a> of the <a href="browsers.html#browsing-context">browsing
-        context</a> will actually obtain the resource from a
-        different <a href="offline.html#application-cache">application cache</a>. Even if the resource
-        is then found to have a different type, it is still used as
-        part of a <a href="browsers.html#nested-browsing-context">nested browsing context</a>; this algorithm
-        doesn't restart with the new resource.</p>
+        <p class="note">In certain situations, e.g. if the resource
+        was <a href="fetching-resources.html#fetch" title="fetch">fetched</a> from an
+        <a href="offline.html#application-cache">application cache</a> but it is an HTML file with a
+        <code title="attr-html-manifest"><a href="semantics.html#attr-html-manifest">manifest</a></code> attribute
+        that points to a different <a href="offline.html#concept-appcache-manifest" title="concept-appcache-manifest">application cache
+        manifest</a>, the <a href="history.html#navigate" title="navigate">navigation</a>
+        of the <a href="browsers.html#browsing-context">browsing context</a> will be restarted so as
+        to load the resource afresh from the network or a different
+        <a href="offline.html#application-cache">application cache</a>. Even if the resource is then
+        found to have a different type, it is still used as part of a
+        <a href="browsers.html#nested-browsing-context">nested browsing context</a>: only the
+        <a href="history.html#navigate">navigate</a> algorithm is restarted, not this
+        <code><a href="#the-object-element">object</a></code> algorithm.</p>
 
         <!-- note that malformed XML files don't cause fallback -->
 

Index: history.html
===================================================================
RCS file: /sources/public/html5/spec/history.html,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -d -r1.1034 -r1.1035
--- history.html	18 Feb 2011 08:46:57 -0000	1.1034
+++ history.html	4 Mar 2011 23:46:38 -0000	1.1035
@@ -1237,12 +1237,18 @@
 
    <li>
 
-    <p>If the new resource is to be fetched using HTTP GET <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">or equivalent</a>, then
-    check if there are any <a href="offline.html#relevant-application-cache" title="relevant application
-    cache">relevant application caches</a> that are identified by a
-    URL with the <a href="origin-0.html#same-origin">same origin</a> as the URL in question, and
-    that have this URL as one of their entries, excluding entries
-    marked as <a href="offline.html#concept-appcache-foreign" title="concept-appcache-foreign">foreign</a>. If so, then the
+    <p>If the resource has already been obtained (e.g. because it is
+    being used to populate an <code><a href="the-iframe-element.html#the-object-element">object</a></code> element's new
+    <a href="browsers.html#child-browsing-context">child browsing context</a>), then skip this step.</p>
+
+    <p>Otherwise:</p>
+
+    <p>If the new resource is to be fetched using HTTP GET <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">or equivalent</a>, and
+    there are <a href="offline.html#relevant-application-cache" title="relevant application cache">relevant
+    application caches</a> that are identified by a URL with the
+    <a href="origin-0.html#same-origin">same origin</a> as the URL in question, and that have
+    this URL as one of their entries, excluding entries marked as
+    <a href="offline.html#concept-appcache-foreign" title="concept-appcache-foreign">foreign</a>, then the
     user agent must then get the resource from the <a href="offline.html#concept-appcache-selection" title="concept-appcache-selection">most appropriate application
     cache</a> of those that match.</p>
 
@@ -1258,9 +1264,8 @@
     application cache at all; the submission will be made to the
     network.</p>
 
-    <p>Otherwise, unless it has already been obtained<!-- it's
-    obtained by <object>, for instance -->, <a href="fetching-resources.html#fetch">fetch</a> the new
-    resource, with the <i>manual redirect flag</i> set.</p>
+    <p>Otherwise, <a href="fetching-resources.html#fetch">fetch</a> the new resource, with the
+    <i>manual redirect flag</i> set.</p>
 
     <p>If the resource is being fetched using a method other than one
     <a href="fetching-resources.html#concept-http-equivalent-get" title="concept-http-equivalent-get">equivalent to</a>

Index: video.html
===================================================================
RCS file: /sources/public/html5/spec/video.html,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -d -r1.922 -r1.923
--- video.html	4 Mar 2011 01:46:45 -0000	1.922
+++ video.html	4 Mar 2011 23:46:38 -0000	1.923
@@ -357,7 +357,7 @@
       <ol><li><a href="video.html#error-codes"><span class="secno">4.8.10.1 </span>Error codes</a></li><li><a href="video.html#location-of-the-media-resource"><span class="secno">4.8.10.2 </span>Location of the media resource</a></li><li><a href="video.html#mime-types"><span class="secno">4.8.10.3 </span>MIME types</a></li><li><a href="video.html#network-states"><span class="secno">4.8.10.4 </span>Network states</a></li><li><a href="video.html#loading-the-media-resource"><span class="secno">4.8.10.5 </span>Loading the media resource</a></li><li><a href="video.html#offsets-into-the-media-resource"><span class="secno">4.8.10.6 </span>Offsets into the media resource</a></li><li><a href="video.html#the-ready-states"><span class="secno">4.8.10.7 </span>The ready states</a></li><li><a href="video.html#playing-the-media-resource"><span class="secno">4.8.10.8 </span>Playing the media resource</a></li><li><a href="video.html#seeking"><span class="secno">4.8.10.9 </span>Seeking</a></li><li><a href="video.html#timed-ext-tracks"><span class="secno">4.8.10.10 </span>Timed text tracks</a>
         <ol><li><a href="video.html#text-track-model"><span class="secno">4.8.10.10.1 </span>Text track model</a></li><li><a href="video.html#sourcing-in-band-text-tracks"><span class="secno">4.8.10.10.2 </span>Sourcing in-band text tracks</a></li><li><a href="video.html#sourcing-out-of-band-text-tracks"><span class="secno">4.8.10.10.3 </span>Sourcing out-of-band text tracks</a></li><li><a href="video.html#text-track-api"><span class="secno">4.8.10.10.4 </span>Text track API</a></li><li><a href="video.html#cue-events"><span class="secno">4.8.10.10.5 </span>Event definitions</a></li></ol></li><li><a href="video.html#user-interface"><span class="secno">4.8.10.11 </span>User interface</a></li><li><a href="video.html#time-ranges"><span class="secno">4.8.10.12 </span>Time ranges</a></li><li><a href="video.html#mediaevents"><span class="secno">4.8.10.13 </span>Event summary</a></li><li><a href="video.html#security-and-privacy-considerations"><span class="secno">4.8.10.14 </span>Security and privacy consideration</a></li><li><a href="video.html#best-practices-for-authors-using-media-elements"><span class="secno">4.8.10.15 </span>Best practices for authors using media elements</a></li><li><a href="video.html#best-practices-for-implementors-of-media-elements"><span class="secno">4.8.10.16 </span>Best practices for implementors of media elements</a></li></ol></li></ol></li></ol></li></ol></div>
 
-  <h4 id="video"><span class="secno">4.8.6 </span>The <dfn><code>video</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/9">ISSUE-9</a> (video-accessibility) and <a href="http://www.w3.org/html/wg/tracker/issues/142">ISSUE-142</a> (poster-alt) block progress to Last Call</span></p><dl class="element"><dt>Categories</dt>
+  <h4 id="video"><span class="secno">4.8.6 </span>The <dfn><code>video</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/142">ISSUE-142</a> (poster-alt) blocks progress to Last Call</span></p><dl class="element"><dt>Categories</dt>
    <dd><a href="content-models.html#flow-content">Flow content</a>.</dd>
    <dd><a href="content-models.html#phrasing-content">Phrasing content</a>.</dd>
    <dd><a href="content-models.html#embedded-content">Embedded content</a>.</dd>
@@ -949,7 +949,7 @@
  ...
 &lt;/video&gt;</pre>
 
-  </div><!--KEEP-END w3c-html--><!--TT--><!--<div data-component="other Hixie drafts (editor: Ian Hickson)">--><h4 id="the-track-element"><span class="secno">4.8.9 </span>The <dfn><code>track</code></dfn> element</h4><p class="XXX annotation"><span><a href="http://www.w3.org/html/wg/tracker/issues/9">ISSUE-9</a> (video-accessibility) blocks progress to Last Call</span></p><dl class="element"><dt>Categories</dt>
+  </div><!--KEEP-END w3c-html--><!--TT--><!--<div data-component="other Hixie drafts (editor: Ian Hickson)">--><h4 id="the-track-element"><span class="secno">4.8.9 </span>The <dfn><code>track</code></dfn> element</h4><dl class="element"><dt>Categories</dt>
    <dd>None.</dd>
    <dt>Contexts in which this element can be used:</dt>
    <dd>As a child of a <a href="#media-element">media element</a>, before any <a href="content-models.html#flow-content">flow content</a>.</dd>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/spec/spec.html,v
retrieving revision 1.1403
retrieving revision 1.1404
diff -u -d -r1.1403 -r1.1404
--- spec.html	4 Mar 2011 03:48:09 -0000	1.1403
+++ spec.html	4 Mar 2011 23:46:38 -0000	1.1404
@@ -369,7 +369,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.4783.
+This is revision 1.4784.
    </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, 4 March 2011 23:46:42 UTC