[html5] r5202 - [giow] (2) document.load() - prevent reentrancy in the sync case, and minor fixes.

[whatwg at whatwg.org]

Author: ianh
Date: 2010-07-27 00:06:07 -0700 (Tue, 27 Jul 2010)
New Revision: 5202

Modified:
   complete.html
   index
   source
Log:
[giow] (2) document.load() - prevent reentrancy in the sync case, and minor fixes.

Modified: complete.html
===================================================================
--- complete.html	2010-07-27 06:28:00 UTC (rev 5201)
+++ complete.html	2010-07-27 07:06:07 UTC (rev 5202)
@@ -8742,13 +8742,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. -->
@@ -8811,9 +8820,13 @@
 
     </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>
 
 

Modified: index
===================================================================
--- index	2010-07-27 06:28:00 UTC (rev 5201)
+++ index	2010-07-27 07:06:07 UTC (rev 5202)
@@ -8666,13 +8666,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. -->
@@ -8735,9 +8744,13 @@
 
     </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>
 
 

Modified: source
===================================================================
--- source	2010-07-27 06:28:00 UTC (rev 5201)
+++ source	2010-07-27 07:06:07 UTC (rev 5202)
@@ -8740,14 +8740,23 @@
 
   <ol>
 
+   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
+   set to false and the <var title="">document</var> is
+   <span>load-blocked</span>, return false and abort these
+   steps.</p></li>
+
    <li><p>Let <var title="">document</var> be the <code>Document</code>
-   object on which the method was invoked.</p>~</li>
+   object on which the method was invoked.</p></li>
 
    <li><p>If the <span>origin</span> of <var title="">url</var> is not
    the same as the <span>origin</span> of <var
    title="">document</var>, throw a <code>SECURITY_ERR</code>
    exception.</p></li>
 
+   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
+   set to false, let <var title="">document</var> be
+   <dfn>load-blocked</dfn>.</p></li>
+
    <li><p>Remove all child nodes of <var title="">document</var>,
    without firing any mutation events.</p></li> <!-- as of 2010-07-26,
    only Opera fired mutation events here. -->
@@ -8825,9 +8834,15 @@
 
    </li>
 
-   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
-   set to false, return <var title="">success</var>.</p></li>
+   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
+   was set to false when this algorithm started, let <var
+   title="">document</var> be no longer
+   <span>load-blocked</span>.</p></li>
 
+   <li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
+   was set to false when this algorithm started, return <var
+   title="">success</var>.</p></li>
+
   </ol>
 
   </div>