[] (0) Sync with XHR2.

git-svn-id: http://svn.whatwg.org/webapps@3690 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 29, 2009 · f1de26a · f1de26a
1 parent a667236
commit f1de26a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 22 deletions.
diff --git a/index b/index
@@ -71,7 +71,7 @@
   <div class=head>
    <p><a class=logo href=http://www.whatwg.org/ rel=home><img alt=WHATWG src=/images/logo></a></p>
    <h1>HTML 5</h1>
-   <h2 class="no-num no-toc" id=draft-standard-&mdash;-28-august-2009>Draft Standard &mdash; 28 August 2009</h2>
+   <h2 class="no-num no-toc" id=draft-standard-&mdash;-29-august-2009>Draft Standard &mdash; 29 August 2009</h2>
    <p>You can take part in this work. <a href=http://www.whatwg.org/mailing-list>Join the working group's discussion list.</a></p>
    <p><strong>Web designers!</strong> We have a <a href=http://blog.whatwg.org/faq/>FAQ</a>, a <a href=http://forums.whatwg.org/>forum</a>, and a <a href=http://www.whatwg.org/mailing-list#help>help mailing list</a> for you!</p>
    <!--<p class="impl"><strong>Implementors!</strong> We have a <a href="http://www.whatwg.org/mailing-list#implementors">mailing list</a> for you too!</p>-->
@@ -47473,14 +47473,8 @@ interface <dfn id=window>Window</dfn> {
      <code>XMLHttpRequest</code> API</dt>
 
      <dd>The <a href=#origin>origin</a> and <a href=#effective-script-origin>effective script
-     origin</a> are equal to the <a href=#origin>origin</a> and
-     <a href=#effective-script-origin>effective script origin</a> of the <code>Document</code>
-     object of the <code><a href=#window>Window</a></code> object from which the
-     <code>XMLHttpRequest</code> constructor was invoked. (That is,
-     they track the <code>Document</code> to which the
-     <code>XMLHttpRequest</code> object's <a href=http://www.w3.org/TR/2008/WD-XMLHttpRequest2-20080930/#document-pointer><code>Document</code>
-     pointer</a> pointed when it was created.) <a href=#refsXHR>[XHR]</a></dd>
-     <!-- XXX xref is broken: http://www.w3.org/TR/2008/WD-XMLHttpRequest2-20080930/#document-pointer -->
+     origin</a> are equal to the <span>XMLHttpRequest origin</span>
+     of the <code>XMLHttpRequest</code> object. <a href=#refsXHR>[XHR]</a></dd>
 
 
      <dt>If a <code>Document</code> or image was generated from a
@@ -73943,7 +73937,7 @@ interface <a href=#htmldocument>HTMLDocument</a> {
    Object</a></cite>, A. van Kesteren. W3C, April
    2008.</dd>
    -->
-   <dd><cite><a href=http://dev.w3.org/2006/webapi/XMLHttpRequest/><code>XMLHttpRequest</code></a></cite>,
+   <dd><cite><a href=http://dev.w3.org/2006/webapi/XMLHttpRequest-2/><code>XMLHttpRequest</code></a></cite>,
    A. van Kesteren. W3C, June 2009.</dd>
 
    <dt id=refsXHTML10>[XHTML10]</dt>

diff --git a/source b/source
@@ -53681,16 +53681,9 @@ interface <dfn>Window</dfn> {
      <code>XMLHttpRequest</code> API</dt>
 
      <dd>The <span>origin</span> and <span>effective script
-     origin</span> are equal to the <span>origin</span> and
-     <span>effective script origin</span> of the <code>Document</code>
-     object of the <code>Window</code> object from which the
-     <code>XMLHttpRequest</code> constructor was invoked. (That is,
-     they track the <code>Document</code> to which the
-     <code>XMLHttpRequest</code> object's <a
-     href="http://www.w3.org/TR/2008/WD-XMLHttpRequest2-20080930/#document-pointer"><code>Document</code>
-     pointer</a> pointed when it was created.) <a
+     origin</span> are equal to the <span>XMLHttpRequest origin</span>
+     of the <code>XMLHttpRequest</code> object. <a
      href="#refsXHR">[XHR]</a></dd>
-     <!-- XXX xref is broken: http://www.w3.org/TR/2008/WD-XMLHttpRequest2-20080930/#document-pointer -->
 
 
      <dt>If a <code>Document</code> or image was generated from a
@@ -68767,7 +68760,7 @@ interface <dfn>SharedWorkerGlobalScope</dfn> : <span>WorkerGlobalScope</span> {
   -->
 
 
-  <h4>Base URLs and origins of workers</h4>
+  <h4>Origins of workers</h4>
 
   <p>Both the <span>origin</span> and <span>effective script
   origin</span> of scripts running in workers are the
@@ -69941,7 +69934,10 @@ interface <dfn>WorkerUtils</dfn> {
    <li><p><code>XMLHttpRequest</code> and all interface objects and
    constructors defined by the XMLHttpRequest specifications, except
    that the <span>document response entity body</span> must always be
-   null. <a href="#refsXHR">[XHR]</a></p></li>
+   null. The <span><code>XMLHttpRequest</code> base URL</span> is the
+   <span>script's base URL</span>; the
+   <span><code>XMLHttpRequest</code> origin</span> is the script's
+   <span>origin</span>. <a href="#refsXHR">[XHR]</a></p></li>
 
    <li><p>The <code>WebSocket</code> interface object and
    constructor. <a href="#refsWEBSOCKET">[WEBSOCKET]</a></p></li>
@@ -87844,7 +87840,7 @@ interface <span>HTMLDocument</span> {
    2008.</dd>
    -->
    <dd><cite><a
-   href="http://dev.w3.org/2006/webapi/XMLHttpRequest/"><code>XMLHttpRequest</code></a></cite>,
+   href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/"><code>XMLHttpRequest</code></a></cite>,
    A. van Kesteren. W3C, June 2009.</dd>
 
    <dt id="refsXHTML10">[XHTML10]</dt>