- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Sat, 13 Nov 2010 00:16:39 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/spec In directory hutz:/tmp/cvs-serv19241 Modified Files: acknowledgements.html fetching-resources.html history.html spec.html the-iframe-element.html urls.html Log Message: ack for last checkin (whatwg r5680) [updated by splitter] Index: the-iframe-element.html =================================================================== RCS file: /sources/public/html5/spec/the-iframe-element.html,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- the-iframe-element.html 11 Nov 2010 01:47:02 -0000 1.31 +++ the-iframe-element.html 13 Nov 2010 00:16:37 -0000 1.32 @@ -409,8 +409,8 @@ <a href="urls.html#valid-non-empty-url-potentially-surrounded-by-spaces">valid non-empty URL potentially surrounded by spaces</a>.</p><p>The <dfn id="attr-iframe-srcdoc" title="attr-iframe-srcdoc"><code>srcdoc</code></dfn> attribute gives the content of the page that the <a href="browsers.html#nested-browsing-context">nested - browsing context</a> is to contain. The value of the attribute - in is <dfn id="an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</dfn>.</p><p>For <code><a href="#the-iframe-element">iframe</a></code> elements in <a href="dom.html#html-documents">HTML documents</a>, + browsing context</a> is to contain. The value of the attribute is + the source of <dfn id="an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</dfn>.</p><p>For <code><a href="#the-iframe-element">iframe</a></code> elements in <a href="dom.html#html-documents">HTML documents</a>, the attribute, if present, must have a value using <a href="syntax.html#syntax">the HTML syntax</a> that consists of the following syntactic components, in the given order:</p><ol><li>Any number of <a href="syntax.html#syntax-comments" title="syntax-comments">comments</a> and @@ -443,14 +443,14 @@ first time.</p> <p>Whenever an <code><a href="#the-iframe-element">iframe</a></code> element with a <a href="browsers.html#nested-browsing-context">nested - browsing context</a> has its <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute set or changed, - the user agent must <a href="#process-the-iframe-attributes">process the <code>iframe</code> + browsing context</a> has its <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute set, changed, or + removed, the user agent must <a href="#process-the-iframe-attributes">process the <code>iframe</code> attributes</a>.</p> <p>Similarly, whenever an <code><a href="#the-iframe-element">iframe</a></code> element with a <a href="browsers.html#nested-browsing-context">nested browsing context</a> but with no <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute specified has its - <code title="attr-iframe-src"><a href="#attr-iframe-src">src</a></code> attribute set or changed, - the user agent must <a href="#process-the-iframe-attributes">process the <code>iframe</code> + <code title="attr-iframe-src"><a href="#attr-iframe-src">src</a></code> attribute set, changed, or + removed, the user agent must <a href="#process-the-iframe-attributes">process the <code>iframe</code> attributes</a>.</p> <!-- It doesn't happen when the base URL is changed, though. --> @@ -465,7 +465,8 @@ context</a> to a resource whose <a href="fetching-resources.html#content-type">Content-Type</a> is <code><a href="iana.html#text-html">text/html</a></code>, whose <a href="urls.html#url">URL</a> is <code><a href="urls.html#about:srcdoc">about:srcdoc</a></code>, and whose data consists of the value of - the attribute.</p></dd> + the attribute. The resulting <code><a href="infrastructure.html#document">Document</a></code> must be + considered <a href="#an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</a>.</p></dd> <dt>If the <code title="attr-iframe-src"><a href="#attr-iframe-src">src</a></code> attribute is specified but the <code title="attr-iframe-srcdoc"><a href="#attr-iframe-srcdoc">srcdoc</a></code> attribute is not</dt> Index: history.html =================================================================== RCS file: /sources/public/html5/spec/history.html,v retrieving revision 1.1019 retrieving revision 1.1020 diff -u -d -r1.1019 -r1.1020 --- history.html 11 Nov 2010 01:47:00 -0000 1.1019 +++ history.html 13 Nov 2010 00:16:37 -0000 1.1020 @@ -969,6 +969,13 @@ steps.</p></dd> <!-- this theoretically would have no effect but in practice can be useful to work around rendering bugs. --> + <dt>If the <a href="browsers.html#browsing-context">browsing context</a>'s <a href="browsers.html#active-document">active + document</a> is <a href="the-iframe-element.html#an-iframe-srcdoc-document">an <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</a></dt> + + <dd><p><a href="the-iframe-element.html#process-the-iframe-attributes" title="process the iframe attributes">Reprocess the + <code>iframe</code> attributes</a> of the <a href="browsers.html#browsing-context">browsing + context</a>'s <a href="browsers.html#browsing-context-container">browsing context container</a>.</p></dd> + <dt>Otherwise</dt> <dd><p><a href="#navigate">Navigate</a> the <a href="browsers.html#browsing-context">browsing context</a> to Index: fetching-resources.html =================================================================== RCS file: /sources/public/html5/spec/fetching-resources.html,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- fetching-resources.html 11 Nov 2010 01:46:59 -0000 1.27 +++ fetching-resources.html 13 Nov 2010 00:16:37 -0000 1.28 @@ -399,10 +399,8 @@ <ol><li> - <p>Generate the <i>address of the resource from which Request-URIs - are obtained</i> as required by HTTP for the <code title="http-referer">Referer</code> (sic) header from <a href="dom.html#the-document-s-current-address">the - document's current address</a> of the appropriate - <code><a href="infrastructure.html#document">Document</a></code> as given by the following list. <a href="references.html#refsHTTP">[HTTP]</a></p> + <p>Let <var title="">document</var> be the appropriate + <code><a href="infrastructure.html#document">Document</a></code> as given by the following list:</p> <dl class="switch"><dt>When <a href="history.html#navigate" title="navigate">navigating</a></dt> @@ -418,7 +416,26 @@ <dd>The <a href="browsers.html#entry-script">entry script</a>'s <a href="webappapis.html#script-s-document" title="script's document">document</a>.</dd> - </dl><p>Remove any <a href="urls.html#url-fragment" title="url-fragment"><fragment></a> + </dl></li> + + <li> + + <p>While <var title="">document</var> is is <a href="the-iframe-element.html#an-iframe-srcdoc-document">an + <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> + document</a>, let <var title="">document</var> be <var title="">document</var>'s <a href="browsers.html#browsing-context">browsing context</a>'s + <a href="browsers.html#browsing-context-container">browsing context container</a>'s <code><a href="infrastructure.html#document">Document</a></code> + instead.</p> + + </li> + + <li> + + <p>Generate the <i>address of the resource from which Request-URIs + are obtained</i> as required by HTTP for the <code title="http-referer">Referer</code> (sic) header from <a href="dom.html#the-document-s-current-address">the + document's current address</a> of <var title="">document</var>. + <a href="references.html#refsHTTP">[HTTP]</a></p> + + <p>Remove any <a href="urls.html#url-fragment" title="url-fragment"><fragment></a> component from the generated <i>address of the resource from which Request-URIs are obtained</i>.</p> <!-- RFC2616 says "The URI MUST NOT include a fragment." (section 14.36) --> Index: acknowledgements.html =================================================================== RCS file: /sources/public/html5/spec/acknowledgements.html,v retrieving revision 1.1050 retrieving revision 1.1051 diff -u -d -r1.1050 -r1.1051 --- acknowledgements.html 11 Nov 2010 01:46:58 -0000 1.1050 +++ acknowledgements.html 13 Nov 2010 00:16:37 -0000 1.1051 @@ -672,6 +672,7 @@ Julian Reschke, Jürgen Jeka, Justin Lebar, + Justin Schuh, Justin Sinclair, Kai Hendry, Kartikaya Gupta, Index: urls.html =================================================================== RCS file: /sources/public/html5/spec/urls.html,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- urls.html 11 Nov 2010 01:47:03 -0000 1.25 +++ urls.html 13 Nov 2010 00:16:37 -0000 1.26 @@ -487,6 +487,13 @@ </li> + <li><p>If the <code><a href="infrastructure.html#document">Document</a></code> is <a href="the-iframe-element.html#an-iframe-srcdoc-document">an + <code>iframe</code> <code title="attr-iframe-srcdoc">srcdoc</code> document</a>, then + let <var title="">fallback base url</var> be the <a href="#document-base-url">document + base URL</a> of the <code><a href="infrastructure.html#document">Document</a></code>'s <a href="browsers.html#browsing-context">browsing + context</a>'s <a href="browsers.html#browsing-context-container">browsing context container</a>'s + <code><a href="infrastructure.html#document">Document</a></code> instead.</p></li> + <li><p>If there is no <code><a href="semantics.html#the-base-element">base</a></code> element that is both a child of <a href="dom.html#the-head-element">the <code>head</code> element</a> and has an <code title="attr-base-href"><a href="semantics.html#attr-base-href">href</a></code> attribute, then the Index: spec.html =================================================================== RCS file: /sources/public/html5/spec/spec.html,v retrieving revision 1.1325 retrieving revision 1.1326 diff -u -d -r1.1325 -r1.1326 --- spec.html 11 Nov 2010 02:46:43 -0000 1.1325 +++ spec.html 13 Nov 2010 00:16:37 -0000 1.1326 @@ -385,7 +385,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.4545. +This is revision 1.4547. </p> <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2010 <a href="http://www.w3.org/"><abbr title="World Wide
Received on Saturday, 13 November 2010 00:16:41 UTC