html5/spec Overview.html,1.4574,1.4575

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

Modified Files:
	Overview.html 
Log Message:
make 'cookie-free' an internal term so that XHR doesn't have to refer to it; also, let XHR define its own origins. (whatwg r5710)

Index: Overview.html
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.4574
retrieving revision 1.4575
diff -u -d -r1.4574 -r1.4575
--- Overview.html	7 Dec 2010 22:10:28 -0000	1.4574
+++ Overview.html	7 Dec 2010 23:48:55 -0000	1.4575
@@ -7310,19 +7310,20 @@
   attribute represents the cookies of the resource from which the
   <code><a href="#document">Document</a></code> was created.</p>
 
-  <p>Some <code><a href="#document">Document</a></code> objects are <dfn id="cookie-free-document-object" title="cookie-free
-  Document object">cookie-free <code>Document</code>
-  objects</dfn>. Any <code><a href="#document">Document</a></code> object created by the <code title="">createDocument()</code> or <code title="dom-DOMHTMLImplementation-createHTMLDocument"><a href="#dom-domhtmlimplementation-createhtmldocument">createHTMLDocument()</a></code>
-  factory methods is a <a href="#cookie-free-document-object">cookie-free <code>Document</code>
-  object</a>. Any <code><a href="#document">Document</a></code> whose <a href="#the-document-s-address" title="the
-  document's address">address</a> does not use a server-based
-  naming authority is a <a href="#cookie-free-document-object">cookie-free <code>Document</code>
-  object</a>. Other specifications can also define
-  <code><a href="#document">Document</a></code> objects as being <a href="#cookie-free-document-object" title="cookie-free
-  Document object">cookie-free <code>Document</code>
-  objects</a>.</p>
+  <p>A <code><a href="#document">Document</a></code> object that falls into one of the
+  following conditions is a <dfn id="cookie-free-document-object">cookie-free <code>Document</code>
+  object</dfn>:</p>
 
-  <p id="sandboxCookies">On getting, if the document is a
+  <ul><li>A <code><a href="#document">Document</a></code> that has no <a href="#browsing-context">browsing
+   context</a>.</li>
+
+   <li>A <code><a href="#document">Document</a></code> whose <a href="#the-document-s-address" title="the document's
+   address">address</a> does not use a server-based naming
+   authority.</li>
+
+  </ul><!--Other specifications can also define <code>Document</code>
+  objects as being <span title="cookie-free Document
+  object">cookie-free <code>Document</code> objects</span>.--><p id="sandboxCookies">On getting, if the document is a
   <a href="#cookie-free-document-object">cookie-free <code>Document</code> object</a>, then the user
   agent must return the empty string. Otherwise, if the
   <code><a href="#document">Document</a></code>'s <a href="#origin">origin</a> is not a
@@ -42476,6 +42477,7 @@
 
    </dd>
 
+
    <dt>For scripts</dt>
 
    <dd>
@@ -42553,6 +42555,7 @@
 
    </dd>
 
+
    <dt>For <code><a href="#document">Document</a></code> objects and images</dt>
 
    <dd>
@@ -42569,13 +42572,6 @@
      assigned when the <code><a href="#document">Document</a></code> is created.</dd>
 
 
-     <dt>If a <code><a href="#document">Document</a></code> or image was returned by the
-     <code>XMLHttpRequest</code> API</dt>
-
-     <dd>The <a href="#origin">origin</a> is equal to the <span>XMLHttpRequest
-     origin</span> of the <code>XMLHttpRequest</code> object. <a href="#refsXHR">[XHR]</a></dd>
-
-
      <dt>If a <code><a href="#document">Document</a></code> or image was generated from a
      <a href="#javascript-protocol" title="javascript protocol"><code>javascript:</code>
      URL</a></dt>
@@ -42646,6 +42642,7 @@
 
    </dd>
 
+
    <dt>For <code><a href="#audio">audio</a></code> and <code><a href="#video">video</a></code> elements</dt>
 
    <dd>
@@ -42661,7 +42658,20 @@
 
    </dd>
 
-  </dl><p>The <dfn id="unicode-serialization-of-an-origin">Unicode serialization of an origin</dfn> is the string
+  </dl><p>Other specifications can override the above definitions by
+  themselves specifying the origin of a particular URL, script,
+  <code><a href="#document">Document</a></code>, or image.</p>
+
+  <!-- e.g.:
+
+    <p>The <span>origin</span> of a <code>Document</code> object
+    returned by the <code>XMLHttpRequest</code> API is equal to the
+    <span>XMLHttpRequest origin</span> of the
+    <code>XMLHttpRequest</code> object.</p>
+
+  -->
+
+  <hr><p>The <dfn id="unicode-serialization-of-an-origin">Unicode serialization of an origin</dfn> is the string
   obtained by applying the following algorithm to the given
   <a href="#origin">origin</a>:</p>

Received on Tuesday, 7 December 2010 23:49:01 UTC