Skip to content

Commit

Permalink
[giow] (1) Move XMLDocumentLoader.load to XMLDocument.
Browse files Browse the repository at this point in the history
Fixing http://www.w3.org/Bugs/Public/show_bug.cgi?id=14037

git-svn-id: http://svn.whatwg.org/webapps@6719 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed Oct 20, 2011
1 parent 83f13ee commit 510cae8
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 55 deletions.
30 changes: 12 additions & 18 deletions complete.html
Original file line number Diff line number Diff line change
Expand Up @@ -9952,15 +9952,9 @@ <h4 id=dom-tree-accessors><span class=secno>3.1.4 </span><dfn>DOM tree accessors

<h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML documents</h4>

<p>A <code><a href=#document>Document</a></code> object that is an <a href=#xml-documents title="XML
documents">XML document</a> that was created by the <code title=dom-DOMImplementation-createDocument><a href=#dom-domimplementation-createdocument>DOMImplementation.createDocument()</a></code>
factory method must also implement the
<code><a href=#xmldocumentloader>XMLDocumentLoader</a></code> interface:</p>

<pre class=idl>[NoInterfaceObject]
interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {
<!--SYNCLOAD attribute boolean <span title="dom-XMLDocumentLoader-async">async</span>;
--> boolean <a href=#dom-xmldocumentloader-load title=dom-XMLDocumentLoader-load>load</a>(DOMString url);
<pre class=idl>partial interface <dfn id=xmldocument>XMLDocument</dfn> {
<!--SYNCLOAD attribute boolean <span title="dom-XMLDocument-async">async</span>;
--> boolean <a href=#dom-xmldocument-load title=dom-XMLDocument-load>load</a>(DOMString url);
};</pre>

<!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/576 -->
Expand All @@ -9969,20 +9963,20 @@ <h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML document

<!--SYNCLOAD
<p>The <dfn
title="dom-XMLDocumentLoader-async"><code>async</code></dfn>
title="dom-XMLDocument-async"><code>async</code></dfn>
attribute must initially be true. On getting, it must return its
current value. On setting, its current value must be changed to the
new value.</p>
-->
<p>The <dfn id=dom-xmldocumentloader-load title=dom-XMLDocumentLoader-load><code>load(<var title="">url</var>)</code></dfn> method must run the following
<p>The <dfn id=dom-xmldocument-load title=dom-XMLDocument-load><code>load(<var title="">url</var>)</code></dfn> method must run the following
steps:</p>

<ol><!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p>If <code title="dom-XMLDocument-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><a href=#document>Document</a></code>
--><li><p>Let <var title="">document</var> be the <code><a href=#xmldocument>XMLDocument</a></code>
object on which the method was invoked.</li>

<li><p><a href=#resolve-a-url title="resolve a url">Resolve</a> the method's
Expand All @@ -9995,7 +9989,7 @@ <h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML document
the same as the <a href=#origin>origin</a> of <var title="">document</var>, throw a <code><a href=#securityerror>SecurityError</a></code>
exception and abort these steps.</li>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p>If <code title="dom-XMLDocument-async">async</code> is
set to false, let <var title="">document</var> be
<dfn>load-blocked</dfn>.</p></li>
-->
Expand All @@ -10005,7 +9999,7 @@ <h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML document

<li><p>Set the <a href=#current-document-readiness>current document readiness</a> of <var title="">document</var> to "loading".</li>

<li><p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p><!--SYNCLOAD If <code title="dom-XMLDocument-async">async</code> is
set to true, then run--> Run the remainder of these steps asynchronously,
and return true from the method.<!--SYNCLOAD Otherwise, continue running these
steps without yet returning.--></li>
Expand Down Expand Up @@ -10039,7 +10033,7 @@ <h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML document

<li>

<p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
<p><!--SYNCLOAD If <code title="dom-XMLDocument-async">async</code> is
set to true, then <span>queue--> <a href=#queue-a-task>Queue a task</a> to run the following
steps. <!--SYNCLOAD Otherwise, run them synchronously.--></p>

Expand All @@ -10061,12 +10055,12 @@ <h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML document

</ol></li>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
<li><p>If <code title="dom-XMLDocument-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>
<li><p>If <code title="dom-XMLDocument-async">async</code>
was set to false when this algorithm started, return <var
title="">success</var>.</p></li>
-->
Expand Down
30 changes: 12 additions & 18 deletions index
Original file line number Diff line number Diff line change
Expand Up @@ -9952,15 +9952,9 @@ partial interface <a href=#document>Document</a> {

<h4 id=loading-xml-documents><span class=secno>3.1.5 </span>Loading XML documents</h4>

<p>A <code><a href=#document>Document</a></code> object that is an <a href=#xml-documents title="XML
documents">XML document</a> that was created by the <code title=dom-DOMImplementation-createDocument><a href=#dom-domimplementation-createdocument>DOMImplementation.createDocument()</a></code>
factory method must also implement the
<code><a href=#xmldocumentloader>XMLDocumentLoader</a></code> interface:</p>

<pre class=idl>[NoInterfaceObject]
interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {
<!--SYNCLOAD attribute boolean <span title="dom-XMLDocumentLoader-async">async</span>;
--> boolean <a href=#dom-xmldocumentloader-load title=dom-XMLDocumentLoader-load>load</a>(DOMString url);
<pre class=idl>partial interface <dfn id=xmldocument>XMLDocument</dfn> {
<!--SYNCLOAD attribute boolean <span title="dom-XMLDocument-async">async</span>;
--> boolean <a href=#dom-xmldocument-load title=dom-XMLDocument-load>load</a>(DOMString url);
};</pre>

<!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/576 -->
Expand All @@ -9969,20 +9963,20 @@ interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {

<!--SYNCLOAD
<p>The <dfn
title="dom-XMLDocumentLoader-async"><code>async</code></dfn>
title="dom-XMLDocument-async"><code>async</code></dfn>
attribute must initially be true. On getting, it must return its
current value. On setting, its current value must be changed to the
new value.</p>
-->
<p>The <dfn id=dom-xmldocumentloader-load title=dom-XMLDocumentLoader-load><code>load(<var title="">url</var>)</code></dfn> method must run the following
<p>The <dfn id=dom-xmldocument-load title=dom-XMLDocument-load><code>load(<var title="">url</var>)</code></dfn> method must run the following
steps:</p>

<ol><!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p>If <code title="dom-XMLDocument-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><a href=#document>Document</a></code>
--><li><p>Let <var title="">document</var> be the <code><a href=#xmldocument>XMLDocument</a></code>
object on which the method was invoked.</li>

<li><p><a href=#resolve-a-url title="resolve a url">Resolve</a> the method's
Expand All @@ -9995,7 +9989,7 @@ interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {
the same as the <a href=#origin>origin</a> of <var title="">document</var>, throw a <code><a href=#securityerror>SecurityError</a></code>
exception and abort these steps.</li>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p>If <code title="dom-XMLDocument-async">async</code> is
set to false, let <var title="">document</var> be
<dfn>load-blocked</dfn>.</p></li>
-->
Expand All @@ -10005,7 +9999,7 @@ interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {

<li><p>Set the <a href=#current-document-readiness>current document readiness</a> of <var title="">document</var> to "loading".</li>

<li><p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p><!--SYNCLOAD If <code title="dom-XMLDocument-async">async</code> is
set to true, then run--> Run the remainder of these steps asynchronously,
and return true from the method.<!--SYNCLOAD Otherwise, continue running these
steps without yet returning.--></li>
Expand Down Expand Up @@ -10039,7 +10033,7 @@ interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {

<li>

<p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
<p><!--SYNCLOAD If <code title="dom-XMLDocument-async">async</code> is
set to true, then <span>queue--> <a href=#queue-a-task>Queue a task</a> to run the following
steps. <!--SYNCLOAD Otherwise, run them synchronously.--></p>

Expand All @@ -10061,12 +10055,12 @@ interface <dfn id=xmldocumentloader>XMLDocumentLoader</dfn> {

</ol></li>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
<li><p>If <code title="dom-XMLDocument-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>
<li><p>If <code title="dom-XMLDocument-async">async</code>
was set to false when this algorithm started, return <var
title="">success</var>.</p></li>
-->
Expand Down
31 changes: 12 additions & 19 deletions source
Original file line number Diff line number Diff line change
Expand Up @@ -10129,16 +10129,9 @@ partial interface <span>Document</span> {

<h4>Loading XML documents</h4>

<p>A <code>Document</code> object that is an <span title="XML
documents">XML document</span> that was created by the <code
title="dom-DOMImplementation-createDocument">DOMImplementation.createDocument()</code>
factory method must also implement the
<code>XMLDocumentLoader</code> interface:</p>

<pre class="idl">[NoInterfaceObject]
interface <dfn>XMLDocumentLoader</dfn> {
<!--SYNCLOAD attribute boolean <span title="dom-XMLDocumentLoader-async">async</span>;
--> boolean <span title="dom-XMLDocumentLoader-load">load</span>(DOMString url);
<pre class="idl">partial interface <dfn>XMLDocument</dfn> {
<!--SYNCLOAD attribute boolean <span title="dom-XMLDocument-async">async</span>;
--> boolean <span title="dom-XMLDocument-load">load</span>(DOMString url);
};</pre>

<!-- http://software.hixie.ch/utilities/js/live-dom-viewer/saved/576 -->
Expand All @@ -10147,23 +10140,23 @@ interface <dfn>XMLDocumentLoader</dfn> {

<!--SYNCLOAD
<p>The <dfn
title="dom-XMLDocumentLoader-async"><code>async</code></dfn>
title="dom-XMLDocument-async"><code>async</code></dfn>
attribute must initially be true. On getting, it must return its
current value. On setting, its current value must be changed to the
new value.</p>
-->
<p>The <dfn title="dom-XMLDocumentLoader-load"><code>load(<var
<p>The <dfn title="dom-XMLDocument-load"><code>load(<var
title="">url</var>)</code></dfn> method must run the following
steps:</p>

<ol>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p>If <code title="dom-XMLDocument-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>
<li><p>Let <var title="">document</var> be the <code>XMLDocument</code>
object on which the method was invoked.</p></li>

<li><p><span title="resolve a url">Resolve</span> the method's
Expand All @@ -10178,7 +10171,7 @@ interface <dfn>XMLDocumentLoader</dfn> {
title="">document</var>, throw a <code>SecurityError</code>
exception and abort these steps.</p></li>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p>If <code title="dom-XMLDocument-async">async</code> is
set to false, let <var title="">document</var> be
<dfn>load-blocked</dfn>.</p></li>
-->
Expand All @@ -10189,7 +10182,7 @@ interface <dfn>XMLDocumentLoader</dfn> {
<li><p>Set the <span>current document readiness</span> of <var
title="">document</var> to "loading".</p></li>

<li><p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
<li><p><!--SYNCLOAD If <code title="dom-XMLDocument-async">async</code> is
set to true, then run--> Run the remainder of these steps asynchronously,
and return true from the method.<!--SYNCLOAD Otherwise, continue running these
steps without yet returning.--></p></li>
Expand Down Expand Up @@ -10230,7 +10223,7 @@ interface <dfn>XMLDocumentLoader</dfn> {

<li>

<p><!--SYNCLOAD If <code title="dom-XMLDocumentLoader-async">async</code> is
<p><!--SYNCLOAD If <code title="dom-XMLDocument-async">async</code> is
set to true, then <span>queue--> <span>Queue a task</span> to run the following
steps. <!--SYNCLOAD Otherwise, run them synchronously.--></p>

Expand Down Expand Up @@ -10259,12 +10252,12 @@ interface <dfn>XMLDocumentLoader</dfn> {

</li>
<!--SYNCLOAD
<li><p>If <code title="dom-XMLDocumentLoader-async">async</code>
<li><p>If <code title="dom-XMLDocument-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>
<li><p>If <code title="dom-XMLDocument-async">async</code>
was set to false when this algorithm started, return <var
title="">success</var>.</p></li>
-->
Expand Down

0 comments on commit 510cae8

Please sign in to comment.