html5/spec Overview.html,1.4137,1.4138

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

Modified Files:
	Overview.html 
Log Message:
document.load() - prevent reentrancy in the sync case, and minor fixes. (whatwg r5202)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4137
retrieving revision 1.4138
diff -u -d -r1.4137 -r1.4138
--- Overview.html	27 Jul 2010 06:28:06 -0000	1.4137
+++ Overview.html	27 Jul 2010 07:06:13 -0000	1.4138
@@ -7576,13 +7576,22 @@
   <p>The <dfn id="dom-xmldocumentloader-load" title="dom-XMLDocumentLoader-load"><code>load(<var title="">url</var>)</code></dfn> method must run the following
   steps:</p>
 
-  <ol><li><p>Let <var title="">document</var> be the <code><a href="#document">Document</a></code>
-   object on which the method was invoked.</p>~</li>
+  <ol><li><p>If <code title="dom-XMLDocumentLoader-async"><a href="#dom-xmldocumentloader-async">async</a></code> is
+   set to false and the <var title="">document</var> is
+   <a href="#load-blocked">load-blocked</a>, return false and abort these
+   steps.</li>
+
+   <li><p>Let <var title="">document</var> be the <code><a href="#document">Document</a></code>
+   object on which the method was invoked.</li>
 
    <li><p>If the <a href="#origin">origin</a> of <var title="">url</var> is not
    the same as the <a href="#origin">origin</a> of <var title="">document</var>, throw a <code><a href="#security_err">SECURITY_ERR</a></code>
    exception.</li>
 
+   <li><p>If <code title="dom-XMLDocumentLoader-async"><a href="#dom-xmldocumentloader-async">async</a></code> is
+   set to false, let <var title="">document</var> be
+   <dfn id="load-blocked">load-blocked</dfn>.</li>
+
    <li><p>Remove all child nodes of <var title="">document</var>,
    without firing any mutation events.</li> <!-- as of 2010-07-26,
    only Opera fired mutation events here. -->
@@ -7645,8 +7654,12 @@
 
     </ol></li>
 
-   <li><p>If <code title="dom-XMLDocumentLoader-async"><a href="#dom-xmldocumentloader-async">async</a></code> is
-   set to false, return <var title="">success</var>.</li>
+   <li><p>If <code title="dom-XMLDocumentLoader-async"><a href="#dom-xmldocumentloader-async">async</a></code>
+   was set to false when this algorithm started, let <var title="">document</var> be no longer
+   <a href="#load-blocked">load-blocked</a>.</li>
+
+   <li><p>If <code title="dom-XMLDocumentLoader-async"><a href="#dom-xmldocumentloader-async">async</a></code>
+   was set to false when this algorithm started, return <var title="">success</var>.</li>
 
   </ol></div><h3 id="elements"><span class="secno">3.2 </span>Elements</h3><p class="XXX annotation"><b>Status: </b><i>Last call for comments</i><h4 id="semantics-0"><span class="secno">3.2.1 </span>Semantics</h4><p class="XXX annotation"><b>Status: </b><i>Last call for comments. </i><span><a href="http://www.w3.org/html/wg/tracker/issues/41">ISSUE-41</a> (Decentralized-extensibility) blocks progress to Last Call</span><p>Elements, attributes, and attribute values in HTML are defined
   (by this specification) to have certain meanings (semantics). For

Received on Tuesday, 27 July 2010 07:06:19 UTC