[html5] r8787 - [e] (0) Move the reference for URL origin from Web Origin to URL. Fixing https:/ [...]

whatwg at whatwg.org whatwg at whatwg.org
Thu Sep 18 13:37:50 PDT 2014


Author: ianh
Date: 2014-09-18 13:37:46 -0700 (Thu, 18 Sep 2014)
New Revision: 8787

Modified:
   complete.html
   index
   source
Log:
[e] (0) Move the reference for URL origin from Web Origin to URL.
Fixing https://www.w3.org/Bugs/Public/show_bug.cgi?id=26152
Affected topics: HTML, Security

Modified: complete.html
===================================================================
--- complete.html	2014-09-18 16:53:24 UTC (rev 8786)
+++ complete.html	2014-09-18 20:37:46 UTC (rev 8787)
@@ -2160,6 +2160,7 @@
     <p>The following terms are defined in the WHATWG URL standard: <a href=#refsURL>[URL]</a></p>
 
     <ul class=brief><li><dfn id=url>URL</dfn>
+     <li><dfn id=concept-url-origin><a href=https://url.spec.whatwg.org/#concept-url-origin>Origin</a></dfn> of URLs
      <li><dfn id=absolute-url>Absolute URL</dfn>
      <li><dfn id=relative-url>Relative URL</dfn>
      <li><dfn id=concept-url-scheme-relative>Relative schemes</dfn>
@@ -58072,80 +58073,104 @@
   <hr>
 
   <p>The <dfn id=origin-2>origin</dfn> of a resource and the <dfn id=effective-script-origin>effective script origin</dfn> of a resource
-  are both either opaque identifiers or tuples consisting of a scheme component, a host component, a
-  port component, and optionally extra data.</p>
+  are each one of the following:</p>
 
-  <p class=note>The extra data could include the certificate of the site when using encrypted
-  connections, to ensure that if the site's secure certificate changes, the origin is considered to
-  change as well.</p>
+  <dl><dt>Opaque identifiers
 
+   <dd>
+
+    <p>Internal values, with no serialisation, for which the only meaningful operation is testing
+    for equality.</p>
+
+
+   <dt>Tuples
+
+   <dd>
+
+    <p>Tuples consisting of a scheme component, a host component, a port component, and optionally
+    extra data.</p>
+
+    <p class=note>The extra data could include the certificate of the site when using encrypted
+    connections, to ensure that if the site's secure certificate changes, the origin is considered to
+    change as well.</p>
+
+
+   <dt>Aliases
+
+   <dd>
+
+    <p>A reference to another <a href=#origin-2 id=origin:origin-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin>effective script origin</a>.</p>
+
+
+  </dl>
+
   
 
-  <p>An <a href=#origin-2 id=origin:origin-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin>effective script origin</a> can be defined as an <dfn id=concept-origin-alias>alias</dfn> to another <a href=#origin-2 id=origin:origin-2-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-2>effective script
-  origin</a>. The value of the <a href=#origin-2 id=origin:origin-2-3>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-3>effective script origin</a> is
-  then the value of the <a href=#origin-2 id=origin:origin-2-4>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-4>effective script origin</a> to which it is
+  <p>An <a href=#origin-2 id=origin:origin-2-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-2>effective script origin</a> can be defined as an <dfn id=concept-origin-alias>alias</dfn> to another <a href=#origin-2 id=origin:origin-2-3>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-3>effective script
+  origin</a>. The value of the <a href=#origin-2 id=origin:origin-2-4>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-4>effective script origin</a> is
+  then the value of the <a href=#origin-2 id=origin:origin-2-5>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-5>effective script origin</a> to which it is
   an alias.</p>
 
   <p>These characteristics are defined as follows:</p>
 
   <dl><dt>For URLs<dd>
 
-    <p>The <a href=#origin-2 id=origin:origin-2-5>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-5>effective script origin</a> of the <a href=#url id=origin:url>URL</a> are
-    the origin defined in <cite>The Web Origin Concept</cite>. <a href=#refsORIGIN>[ORIGIN]</a></p>
+    <p>The <a href=#origin-2 id=origin:origin-2-6>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-6>effective script origin</a> of the <a href=#url id=origin:url>URL</a> are
+    the <a href=https://url.spec.whatwg.org/#concept-url-origin id=origin:concept-url-origin data-x-internal=concept-url-origin>URL origin</a> defined in the WHATWG URL standard. <a href=#refsURL>[URL]</a></p>
 
    <dt>For <code id=origin:document><a href=#document>Document</a></code> objects<dd>
 
     <dl class=switch><dt id=sandboxOrigin>If a <code id=origin:document-2><a href=#document>Document</a></code>'s <a href=#active-sandboxing-flag-set id=origin:active-sandboxing-flag-set>active sandboxing flag set</a> has
      its <a href=#sandboxed-origin-browsing-context-flag id=origin:sandboxed-origin-browsing-context-flag>sandboxed origin browsing context flag</a> set<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-6>origin</a> is a globally unique identifier assigned when the
+      <p>The <a href=#origin-2 id=origin:origin-2-7>origin</a> is a globally unique identifier assigned when the
       <code id=origin:document-3><a href=#document>Document</a></code> is created.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-6>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias>alias</a> to the <a href=#origin-2 id=origin:origin-2-7>origin</a> of the
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-7>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias>alias</a> to the <a href=#origin-2 id=origin:origin-2-8>origin</a> of the
       <code id=origin:document-4><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-5><a href=#document>Document</a></code> was served over the network and has an address that uses a URL
      scheme with a server-based naming authority<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-8>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-2>alias</a> to the
-      <a href=#origin-2 id=origin:origin-2-9>origin</a> of <a id="origin:the-document's-address" href=https://dom.spec.whatwg.org/#concept-document-url data-x-internal="the-document's-address">the <code>Document</code>'s address</a>.</p>
+      <p>The <a href=#origin-2 id=origin:origin-2-9>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-2>alias</a> to the
+      <a href=#origin-2 id=origin:origin-2-10>origin</a> of <a id="origin:the-document's-address" href=https://dom.spec.whatwg.org/#concept-document-url data-x-internal="the-document's-address">the <code>Document</code>'s address</a>.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-7>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-3>alias</a> to the <a href=#origin-2 id=origin:origin-2-10>origin</a> of the
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-8>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-3>alias</a> to the <a href=#origin-2 id=origin:origin-2-11>origin</a> of the
       <code id=origin:document-6><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-7><a href=#document>Document</a></code> was generated from a <a href=http://tools.ietf.org/html/rfc2397#section-2 id=origin:data-protocol data-x-internal=data-protocol><code>data:</code> URL</a> found in another <code id=origin:document-8><a href=#document>Document</a></code> or in a
      script<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-11>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-4>alias</a> to the
-      <a href=#origin-2 id=origin:origin-2-12>origin</a> specified by the <a href=#incumbent-settings-object id=origin:incumbent-settings-object>incumbent settings object</a> when the <a href=#navigate id=origin:navigate>navigate</a>
+      <p>The <a href=#origin-2 id=origin:origin-2-12>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-4>alias</a> to the
+      <a href=#origin-2 id=origin:origin-2-13>origin</a> specified by the <a href=#incumbent-settings-object id=origin:incumbent-settings-object>incumbent settings object</a> when the <a href=#navigate id=origin:navigate>navigate</a>
       algorithm was invoked, or, if no <a href=#concept-script id=origin:concept-script>script</a> was involved, of
       the <a id=origin:node-document href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a> of the element that initiated the <a href=#navigate id=origin:navigate-2>navigation</a> to that <a href=#url id=origin:url-2>URL</a>.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-8>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-5>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-9>effective script origin</a> of that
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-9>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-5>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-10>effective script origin</a> of that
       same <a href=#script-settings-object id=origin:script-settings-object>script settings object</a> or <code id=origin:document-9><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-10><a href=#document>Document</a></code> is the initial "<code id=origin:about:blank><a href=#about:blank>about:blank</a></code>" document<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-13>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-10>effective script origin</a> of the
+      <p>The <a href=#origin-2 id=origin:origin-2-14>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-11>effective script origin</a> of the
       <code id=origin:document-11><a href=#document>Document</a></code> are <a href=#about-blank-origin>those it was assigned when its
       browsing context was created</a>.</p>
 
      <dt>If a <code id=origin:document-12><a href=#document>Document</a></code> was created as part of the processing for <a href=#javascript-protocol id=origin:javascript-protocol><code>javascript:</code> URLs</a><dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-14>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-6>alias</a> to the
-      <a href=#origin-2 id=origin:origin-2-15>origin</a> of the <a href=#active-document id=origin:active-document>active document</a> of the <a href=#browsing-context id=origin:browsing-context>browsing context</a>
+      <p>The <a href=#origin-2 id=origin:origin-2-15>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-6>alias</a> to the
+      <a href=#origin-2 id=origin:origin-2-16>origin</a> of the <a href=#active-document id=origin:active-document>active document</a> of the <a href=#browsing-context id=origin:browsing-context>browsing context</a>
       being navigated when the <a href=#navigate id=origin:navigate-3>navigate</a> algorithm was invoked.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-11>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-7>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-12>effective script origin</a> of that
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-12>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-7>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-13>effective script origin</a> of that
       same <code id=origin:document-13><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-14><a href=#document>Document</a></code> is <a href=#an-iframe-srcdoc-document id=origin:an-iframe-srcdoc-document>an <code>iframe</code> <code>srcdoc</code> document</a><dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-16>origin</a> of the <code id=origin:document-15><a href=#document>Document</a></code> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-8>alias</a> to the <a href=#origin-2 id=origin:origin-2-17>origin</a> of the
+      <p>The <a href=#origin-2 id=origin:origin-2-17>origin</a> of the <code id=origin:document-15><a href=#document>Document</a></code> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-8>alias</a> to the <a href=#origin-2 id=origin:origin-2-18>origin</a> of the
       <code id=origin:document-16><a href=#document>Document</a></code>'s <a href=#browsing-context id=origin:browsing-context-2>browsing context</a>'s <a href=#browsing-context-container id=origin:browsing-context-container>browsing context
       container</a>'s <a id=origin:node-document-2 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-13>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-9>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-14>effective script origin</a> of the
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-14>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-9>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-15>effective script origin</a> of the
       <code id=origin:document-17><a href=#document>Document</a></code>'s <a href=#browsing-context id=origin:browsing-context-3>browsing context</a>'s <a href=#browsing-context-container id=origin:browsing-context-container-2>browsing context
       container</a>'s <a id=origin:node-document-3 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</p>
 
@@ -58155,44 +58180,44 @@
 
       <p>The default behavior as defined in the DOM standard applies. <a href=#refsDOM>[DOM]</a>.</p>
 
-      <p class=note>The <a href=#origin-2 id=origin:origin-2-18>origin</a> is a globally unique identifier assigned when the
-      <code id=origin:document-20><a href=#document>Document</a></code> is created, and the <a href=#effective-script-origin id=origin:effective-script-origin-15>effective script origin</a> is initially an
-      <a href=#concept-origin-alias id=origin:concept-origin-alias-10>alias</a> to the <a href=#origin-2 id=origin:origin-2-19>origin</a> of the
+      <p class=note>The <a href=#origin-2 id=origin:origin-2-19>origin</a> is a globally unique identifier assigned when the
+      <code id=origin:document-20><a href=#document>Document</a></code> is created, and the <a href=#effective-script-origin id=origin:effective-script-origin-16>effective script origin</a> is initially an
+      <a href=#concept-origin-alias id=origin:concept-origin-alias-10>alias</a> to the <a href=#origin-2 id=origin:origin-2-20>origin</a> of the
       <code id=origin:document-21><a href=#document>Document</a></code>.</p>
 
      </dl>
 
-    <p class=note>The <a href=#effective-script-origin id=origin:effective-script-origin-16>effective script origin</a> of a <code id=origin:document-22><a href=#document>Document</a></code> can be
+    <p class=note>The <a href=#effective-script-origin id=origin:effective-script-origin-17>effective script origin</a> of a <code id=origin:document-22><a href=#document>Document</a></code> can be
     manipulated using the <code id=origin:dom-document-domain><a href=#dom-document-domain>document.domain</a></code> IDL
     attribute.</p>
 
    <dt>For images of <code id=origin:the-img-element><a href=#the-img-element>img</a></code> elements<dd>
 
-    <dl class=switch><dt>If the image data is <a href=#cors-cross-origin id=origin:cors-cross-origin>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-20>origin</a> is a globally unique identifier assigned when the image is
-     created.<dt>If the image data is <a href=#cors-same-origin id=origin:cors-same-origin>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-21>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-11>alias</a> to the
-     <a href=#origin-2 id=origin:origin-2-22>origin</a> of the <code id=origin:the-img-element-2><a href=#the-img-element>img</a></code> element's <a id=origin:node-document-4 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
+    <dl class=switch><dt>If the image data is <a href=#cors-cross-origin id=origin:cors-cross-origin>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-21>origin</a> is a globally unique identifier assigned when the image is
+     created.<dt>If the image data is <a href=#cors-same-origin id=origin:cors-same-origin>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-22>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-11>alias</a> to the
+     <a href=#origin-2 id=origin:origin-2-23>origin</a> of the <code id=origin:the-img-element-2><a href=#the-img-element>img</a></code> element's <a id=origin:node-document-4 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
 
-    <p>Images do not have an <a href=#effective-script-origin id=origin:effective-script-origin-17>effective script origin</a>.</p>
+    <p>Images do not have an <a href=#effective-script-origin id=origin:effective-script-origin-18>effective script origin</a>.</p>
 
    <dt>For <code id=origin:the-audio-element><a href=#the-audio-element>audio</a></code> and <code id=origin:the-video-element><a href=#the-video-element>video</a></code> elements<dd>
 
-    <dl class=switch><dt>If the <a href=#media-data id=origin:media-data>media data</a> is <a href=#cors-cross-origin id=origin:cors-cross-origin-2>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-23>origin</a> is a globally unique identifier assigned when the <a href=#media-data id=origin:media-data-2>media
-     data</a> is <a href=#fetch id=origin:fetch>fetched</a>.<dt>If the <a href=#media-data id=origin:media-data-3>media data</a> is <a href=#cors-same-origin id=origin:cors-same-origin-2>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-24>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-12>alias</a> to the
-     <a href=#origin-2 id=origin:origin-2-25>origin</a> of the <a href=#media-element id=origin:media-element>media element</a>'s <a id=origin:node-document-5 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
+    <dl class=switch><dt>If the <a href=#media-data id=origin:media-data>media data</a> is <a href=#cors-cross-origin id=origin:cors-cross-origin-2>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-24>origin</a> is a globally unique identifier assigned when the <a href=#media-data id=origin:media-data-2>media
+     data</a> is <a href=#fetch id=origin:fetch>fetched</a>.<dt>If the <a href=#media-data id=origin:media-data-3>media data</a> is <a href=#cors-same-origin id=origin:cors-same-origin-2>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-25>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-12>alias</a> to the
+     <a href=#origin-2 id=origin:origin-2-26>origin</a> of the <a href=#media-element id=origin:media-element>media element</a>'s <a id=origin:node-document-5 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
 
-    <p><a href=#media-element id=origin:media-element-2>Media elements</a> do not have an <a href=#effective-script-origin id=origin:effective-script-origin-18>effective script
+    <p><a href=#media-element id=origin:media-element-2>Media elements</a> do not have an <a href=#effective-script-origin id=origin:effective-script-origin-19>effective script
     origin</a>.</p>
 
    <dt>For fonts<dd>
 
-    <p>The <a href=#origin-2 id=origin:origin-2-26>origin</a> of a downloadable Web font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-13>alias</a> to the <a href=#origin-2 id=origin:origin-2-27>origin</a> of the <a href=#absolute-url id=origin:absolute-url>absolute
+    <p>The <a href=#origin-2 id=origin:origin-2-27>origin</a> of a downloadable Web font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-13>alias</a> to the <a href=#origin-2 id=origin:origin-2-28>origin</a> of the <a href=#absolute-url id=origin:absolute-url>absolute
     URL</a> used to obtain the font (after any redirects). <a href=#refsCSSFONTS>[CSSFONTS]</a>
     <a href=#refsCSSFONTLOAD>[CSSFONTLOAD]</a></p> 
 
-    <p>The <a href=#origin-2 id=origin:origin-2-28>origin</a> of a locally installed system font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-14>alias</a> to the <a href=#origin-2 id=origin:origin-2-29>origin</a> of the
+    <p>The <a href=#origin-2 id=origin:origin-2-29>origin</a> of a locally installed system font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-14>alias</a> to the <a href=#origin-2 id=origin:origin-2-30>origin</a> of the
     <code id=origin:document-23><a href=#document>Document</a></code> in which that font is being used.</p>
 
-    <p>Fonts do not have an <a href=#effective-script-origin id=origin:effective-script-origin-19>effective script origin</a>.</p>
+    <p>Fonts do not have an <a href=#effective-script-origin id=origin:effective-script-origin-20>effective script origin</a>.</p>
 
    </dl>
 
@@ -58205,40 +58230,40 @@
   <hr>
 
   <p>The <dfn id=unicode-serialisation-of-an-origin>Unicode serialisation of an origin</dfn> is the string obtained by applying the
-  following algorithm to the given <a href=#origin-2 id=origin:origin-2-30>origin</a>:</p>
+  following algorithm to the given <a href=#origin-2 id=origin:origin-2-31>origin</a>:</p>
 
-  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-31>origin</a> in question is not a scheme/host/port tuple, then return the
-   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-32>origin</a>
+  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-32>origin</a> in question is not a scheme/host/port tuple, then return the
+   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-33>origin</a>
    tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li><p>Apply the <a href=#domain-to-unicode id=origin:domain-to-unicode>domain to Unicode</a> algorithm to each component of the host
-   part of the <a href=#origin-2 id=origin:origin-2-33>origin</a> tuple, and append the results — each component, in the same
-   order, separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a><li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-34>origin</a> tuple gives a port that is different from the
-   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-35>origin</a> tuple, then
+   part of the <a href=#origin-2 id=origin:origin-2-34>origin</a> tuple, and append the results — each component, in the same
+   order, separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a><li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-35>origin</a> tuple gives a port that is different from the
+   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-36>origin</a> tuple, then
    append a U+003A COLON character (:) and the given port, in base ten, to <var>result</var>.<li><p>Return <var>result</var>.</ol>
 
 
   <p>The <dfn id=ascii-serialisation-of-an-origin>ASCII serialisation of an origin</dfn> is the string obtained by applying the
-  following algorithm to the given <a href=#origin-2 id=origin:origin-2-36>origin</a>:</p>
+  following algorithm to the given <a href=#origin-2 id=origin:origin-2-37>origin</a>:</p>
 
-  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-37>origin</a> in question is not a scheme/host/port tuple, then return the
-   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-38>origin</a>
+  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-38>origin</a> in question is not a scheme/host/port tuple, then return the
+   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-39>origin</a>
    tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li>
 
     <p>Apply the <a href=#domain-to-ascii id=origin:domain-to-ascii>domain to ASCII</a> algorithm to each component of the host part of
-    the <a href=#origin-2 id=origin:origin-2-39>origin</a> tuple, and append the results — each component, in the same order,
+    the <a href=#origin-2 id=origin:origin-2-40>origin</a> tuple, and append the results — each component, in the same order,
     separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a></p>
 
     <p>If the <a href=#domain-to-ascii id=origin:domain-to-ascii-2>domain to ASCII</a> algorithm returns failure, e.g. because a component is too long or because it contains
     invalid characters, then throw a <code id=origin:securityerror-2><a href=#securityerror>SecurityError</a></code> exception and abort these steps.</p>
 
-   <li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-40>origin</a> tuple gives a port that is different from the
-   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-41>origin</a> tuple, then
+   <li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-41>origin</a> tuple gives a port that is different from the
+   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-42>origin</a> tuple, then
    append a U+003A COLON character (:) and the given port, in base ten, to <var>result</var>.<li><p>Return <var>result</var>.</ol>
 
 
-  <p>Two <a href=#origin-2 id=origin:origin-2-42>origins</a> are said to be the <dfn id=same-origin>same origin</dfn> if the
+  <p>Two <a href=#origin-2 id=origin:origin-2-43>origins</a> are said to be the <dfn id=same-origin>same origin</dfn> if the
   following algorithm returns true:</p>
 
-  <ol><li><p>Let <var>A</var> be the first <a href=#origin-2 id=origin:origin-2-43>origin</a> being compared, and <var>B</var> be the second <a href=#origin-2 id=origin:origin-2-44>origin</a> being compared.<li><p>If <var>A</var> and <var>B</var> are both opaque identifiers, and their
+  <ol><li><p>Let <var>A</var> be the first <a href=#origin-2 id=origin:origin-2-44>origin</a> being compared, and <var>B</var> be the second <a href=#origin-2 id=origin:origin-2-45>origin</a> being compared.<li><p>If <var>A</var> and <var>B</var> are both opaque identifiers, and their
    value is equal, then return true.<li><p>Otherwise, if either <var>A</var> or <var>B</var> or both are opaque
    identifiers, return false.<li><p>If <var>A</var> and <var>B</var> have scheme components that are not
    identical, return false.<li><p>If <var>A</var> and <var>B</var> have host components that are not

Modified: index
===================================================================
--- index	2014-09-18 16:53:24 UTC (rev 8786)
+++ index	2014-09-18 20:37:46 UTC (rev 8787)
@@ -2160,6 +2160,7 @@
     <p>The following terms are defined in the WHATWG URL standard: <a href=#refsURL>[URL]</a></p>
 
     <ul class=brief><li><dfn id=url>URL</dfn>
+     <li><dfn id=concept-url-origin><a href=https://url.spec.whatwg.org/#concept-url-origin>Origin</a></dfn> of URLs
      <li><dfn id=absolute-url>Absolute URL</dfn>
      <li><dfn id=relative-url>Relative URL</dfn>
      <li><dfn id=concept-url-scheme-relative>Relative schemes</dfn>
@@ -58072,80 +58073,104 @@
   <hr>
 
   <p>The <dfn id=origin-2>origin</dfn> of a resource and the <dfn id=effective-script-origin>effective script origin</dfn> of a resource
-  are both either opaque identifiers or tuples consisting of a scheme component, a host component, a
-  port component, and optionally extra data.</p>
+  are each one of the following:</p>
 
-  <p class=note>The extra data could include the certificate of the site when using encrypted
-  connections, to ensure that if the site's secure certificate changes, the origin is considered to
-  change as well.</p>
+  <dl><dt>Opaque identifiers
 
+   <dd>
+
+    <p>Internal values, with no serialisation, for which the only meaningful operation is testing
+    for equality.</p>
+
+
+   <dt>Tuples
+
+   <dd>
+
+    <p>Tuples consisting of a scheme component, a host component, a port component, and optionally
+    extra data.</p>
+
+    <p class=note>The extra data could include the certificate of the site when using encrypted
+    connections, to ensure that if the site's secure certificate changes, the origin is considered to
+    change as well.</p>
+
+
+   <dt>Aliases
+
+   <dd>
+
+    <p>A reference to another <a href=#origin-2 id=origin:origin-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin>effective script origin</a>.</p>
+
+
+  </dl>
+
   
 
-  <p>An <a href=#origin-2 id=origin:origin-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin>effective script origin</a> can be defined as an <dfn id=concept-origin-alias>alias</dfn> to another <a href=#origin-2 id=origin:origin-2-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-2>effective script
-  origin</a>. The value of the <a href=#origin-2 id=origin:origin-2-3>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-3>effective script origin</a> is
-  then the value of the <a href=#origin-2 id=origin:origin-2-4>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-4>effective script origin</a> to which it is
+  <p>An <a href=#origin-2 id=origin:origin-2-2>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-2>effective script origin</a> can be defined as an <dfn id=concept-origin-alias>alias</dfn> to another <a href=#origin-2 id=origin:origin-2-3>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-3>effective script
+  origin</a>. The value of the <a href=#origin-2 id=origin:origin-2-4>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-4>effective script origin</a> is
+  then the value of the <a href=#origin-2 id=origin:origin-2-5>origin</a> or <a href=#effective-script-origin id=origin:effective-script-origin-5>effective script origin</a> to which it is
   an alias.</p>
 
   <p>These characteristics are defined as follows:</p>
 
   <dl><dt>For URLs<dd>
 
-    <p>The <a href=#origin-2 id=origin:origin-2-5>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-5>effective script origin</a> of the <a href=#url id=origin:url>URL</a> are
-    the origin defined in <cite>The Web Origin Concept</cite>. <a href=#refsORIGIN>[ORIGIN]</a></p>
+    <p>The <a href=#origin-2 id=origin:origin-2-6>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-6>effective script origin</a> of the <a href=#url id=origin:url>URL</a> are
+    the <a href=https://url.spec.whatwg.org/#concept-url-origin id=origin:concept-url-origin data-x-internal=concept-url-origin>URL origin</a> defined in the WHATWG URL standard. <a href=#refsURL>[URL]</a></p>
 
    <dt>For <code id=origin:document><a href=#document>Document</a></code> objects<dd>
 
     <dl class=switch><dt id=sandboxOrigin>If a <code id=origin:document-2><a href=#document>Document</a></code>'s <a href=#active-sandboxing-flag-set id=origin:active-sandboxing-flag-set>active sandboxing flag set</a> has
      its <a href=#sandboxed-origin-browsing-context-flag id=origin:sandboxed-origin-browsing-context-flag>sandboxed origin browsing context flag</a> set<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-6>origin</a> is a globally unique identifier assigned when the
+      <p>The <a href=#origin-2 id=origin:origin-2-7>origin</a> is a globally unique identifier assigned when the
       <code id=origin:document-3><a href=#document>Document</a></code> is created.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-6>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias>alias</a> to the <a href=#origin-2 id=origin:origin-2-7>origin</a> of the
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-7>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias>alias</a> to the <a href=#origin-2 id=origin:origin-2-8>origin</a> of the
       <code id=origin:document-4><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-5><a href=#document>Document</a></code> was served over the network and has an address that uses a URL
      scheme with a server-based naming authority<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-8>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-2>alias</a> to the
-      <a href=#origin-2 id=origin:origin-2-9>origin</a> of <a id="origin:the-document's-address" href=https://dom.spec.whatwg.org/#concept-document-url data-x-internal="the-document's-address">the <code>Document</code>'s address</a>.</p>
+      <p>The <a href=#origin-2 id=origin:origin-2-9>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-2>alias</a> to the
+      <a href=#origin-2 id=origin:origin-2-10>origin</a> of <a id="origin:the-document's-address" href=https://dom.spec.whatwg.org/#concept-document-url data-x-internal="the-document's-address">the <code>Document</code>'s address</a>.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-7>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-3>alias</a> to the <a href=#origin-2 id=origin:origin-2-10>origin</a> of the
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-8>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-3>alias</a> to the <a href=#origin-2 id=origin:origin-2-11>origin</a> of the
       <code id=origin:document-6><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-7><a href=#document>Document</a></code> was generated from a <a href=http://tools.ietf.org/html/rfc2397#section-2 id=origin:data-protocol data-x-internal=data-protocol><code>data:</code> URL</a> found in another <code id=origin:document-8><a href=#document>Document</a></code> or in a
      script<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-11>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-4>alias</a> to the
-      <a href=#origin-2 id=origin:origin-2-12>origin</a> specified by the <a href=#incumbent-settings-object id=origin:incumbent-settings-object>incumbent settings object</a> when the <a href=#navigate id=origin:navigate>navigate</a>
+      <p>The <a href=#origin-2 id=origin:origin-2-12>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-4>alias</a> to the
+      <a href=#origin-2 id=origin:origin-2-13>origin</a> specified by the <a href=#incumbent-settings-object id=origin:incumbent-settings-object>incumbent settings object</a> when the <a href=#navigate id=origin:navigate>navigate</a>
       algorithm was invoked, or, if no <a href=#concept-script id=origin:concept-script>script</a> was involved, of
       the <a id=origin:node-document href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a> of the element that initiated the <a href=#navigate id=origin:navigate-2>navigation</a> to that <a href=#url id=origin:url-2>URL</a>.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-8>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-5>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-9>effective script origin</a> of that
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-9>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-5>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-10>effective script origin</a> of that
       same <a href=#script-settings-object id=origin:script-settings-object>script settings object</a> or <code id=origin:document-9><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-10><a href=#document>Document</a></code> is the initial "<code id=origin:about:blank><a href=#about:blank>about:blank</a></code>" document<dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-13>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-10>effective script origin</a> of the
+      <p>The <a href=#origin-2 id=origin:origin-2-14>origin</a> and <a href=#effective-script-origin id=origin:effective-script-origin-11>effective script origin</a> of the
       <code id=origin:document-11><a href=#document>Document</a></code> are <a href=#about-blank-origin>those it was assigned when its
       browsing context was created</a>.</p>
 
      <dt>If a <code id=origin:document-12><a href=#document>Document</a></code> was created as part of the processing for <a href=#javascript-protocol id=origin:javascript-protocol><code>javascript:</code> URLs</a><dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-14>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-6>alias</a> to the
-      <a href=#origin-2 id=origin:origin-2-15>origin</a> of the <a href=#active-document id=origin:active-document>active document</a> of the <a href=#browsing-context id=origin:browsing-context>browsing context</a>
+      <p>The <a href=#origin-2 id=origin:origin-2-15>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-6>alias</a> to the
+      <a href=#origin-2 id=origin:origin-2-16>origin</a> of the <a href=#active-document id=origin:active-document>active document</a> of the <a href=#browsing-context id=origin:browsing-context>browsing context</a>
       being navigated when the <a href=#navigate id=origin:navigate-3>navigate</a> algorithm was invoked.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-11>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-7>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-12>effective script origin</a> of that
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-12>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-7>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-13>effective script origin</a> of that
       same <code id=origin:document-13><a href=#document>Document</a></code>.</p>
 
      <dt>If a <code id=origin:document-14><a href=#document>Document</a></code> is <a href=#an-iframe-srcdoc-document id=origin:an-iframe-srcdoc-document>an <code>iframe</code> <code>srcdoc</code> document</a><dd>
 
-      <p>The <a href=#origin-2 id=origin:origin-2-16>origin</a> of the <code id=origin:document-15><a href=#document>Document</a></code> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-8>alias</a> to the <a href=#origin-2 id=origin:origin-2-17>origin</a> of the
+      <p>The <a href=#origin-2 id=origin:origin-2-17>origin</a> of the <code id=origin:document-15><a href=#document>Document</a></code> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-8>alias</a> to the <a href=#origin-2 id=origin:origin-2-18>origin</a> of the
       <code id=origin:document-16><a href=#document>Document</a></code>'s <a href=#browsing-context id=origin:browsing-context-2>browsing context</a>'s <a href=#browsing-context-container id=origin:browsing-context-container>browsing context
       container</a>'s <a id=origin:node-document-2 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</p>
 
-      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-13>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-9>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-14>effective script origin</a> of the
+      <p>The <a href=#effective-script-origin id=origin:effective-script-origin-14>effective script origin</a> is initially an <a href=#concept-origin-alias id=origin:concept-origin-alias-9>alias</a> to the <a href=#effective-script-origin id=origin:effective-script-origin-15>effective script origin</a> of the
       <code id=origin:document-17><a href=#document>Document</a></code>'s <a href=#browsing-context id=origin:browsing-context-3>browsing context</a>'s <a href=#browsing-context-container id=origin:browsing-context-container-2>browsing context
       container</a>'s <a id=origin:node-document-3 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</p>
 
@@ -58155,44 +58180,44 @@
 
       <p>The default behavior as defined in the DOM standard applies. <a href=#refsDOM>[DOM]</a>.</p>
 
-      <p class=note>The <a href=#origin-2 id=origin:origin-2-18>origin</a> is a globally unique identifier assigned when the
-      <code id=origin:document-20><a href=#document>Document</a></code> is created, and the <a href=#effective-script-origin id=origin:effective-script-origin-15>effective script origin</a> is initially an
-      <a href=#concept-origin-alias id=origin:concept-origin-alias-10>alias</a> to the <a href=#origin-2 id=origin:origin-2-19>origin</a> of the
+      <p class=note>The <a href=#origin-2 id=origin:origin-2-19>origin</a> is a globally unique identifier assigned when the
+      <code id=origin:document-20><a href=#document>Document</a></code> is created, and the <a href=#effective-script-origin id=origin:effective-script-origin-16>effective script origin</a> is initially an
+      <a href=#concept-origin-alias id=origin:concept-origin-alias-10>alias</a> to the <a href=#origin-2 id=origin:origin-2-20>origin</a> of the
       <code id=origin:document-21><a href=#document>Document</a></code>.</p>
 
      </dl>
 
-    <p class=note>The <a href=#effective-script-origin id=origin:effective-script-origin-16>effective script origin</a> of a <code id=origin:document-22><a href=#document>Document</a></code> can be
+    <p class=note>The <a href=#effective-script-origin id=origin:effective-script-origin-17>effective script origin</a> of a <code id=origin:document-22><a href=#document>Document</a></code> can be
     manipulated using the <code id=origin:dom-document-domain><a href=#dom-document-domain>document.domain</a></code> IDL
     attribute.</p>
 
    <dt>For images of <code id=origin:the-img-element><a href=#the-img-element>img</a></code> elements<dd>
 
-    <dl class=switch><dt>If the image data is <a href=#cors-cross-origin id=origin:cors-cross-origin>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-20>origin</a> is a globally unique identifier assigned when the image is
-     created.<dt>If the image data is <a href=#cors-same-origin id=origin:cors-same-origin>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-21>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-11>alias</a> to the
-     <a href=#origin-2 id=origin:origin-2-22>origin</a> of the <code id=origin:the-img-element-2><a href=#the-img-element>img</a></code> element's <a id=origin:node-document-4 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
+    <dl class=switch><dt>If the image data is <a href=#cors-cross-origin id=origin:cors-cross-origin>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-21>origin</a> is a globally unique identifier assigned when the image is
+     created.<dt>If the image data is <a href=#cors-same-origin id=origin:cors-same-origin>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-22>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-11>alias</a> to the
+     <a href=#origin-2 id=origin:origin-2-23>origin</a> of the <code id=origin:the-img-element-2><a href=#the-img-element>img</a></code> element's <a id=origin:node-document-4 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
 
-    <p>Images do not have an <a href=#effective-script-origin id=origin:effective-script-origin-17>effective script origin</a>.</p>
+    <p>Images do not have an <a href=#effective-script-origin id=origin:effective-script-origin-18>effective script origin</a>.</p>
 
    <dt>For <code id=origin:the-audio-element><a href=#the-audio-element>audio</a></code> and <code id=origin:the-video-element><a href=#the-video-element>video</a></code> elements<dd>
 
-    <dl class=switch><dt>If the <a href=#media-data id=origin:media-data>media data</a> is <a href=#cors-cross-origin id=origin:cors-cross-origin-2>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-23>origin</a> is a globally unique identifier assigned when the <a href=#media-data id=origin:media-data-2>media
-     data</a> is <a href=#fetch id=origin:fetch>fetched</a>.<dt>If the <a href=#media-data id=origin:media-data-3>media data</a> is <a href=#cors-same-origin id=origin:cors-same-origin-2>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-24>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-12>alias</a> to the
-     <a href=#origin-2 id=origin:origin-2-25>origin</a> of the <a href=#media-element id=origin:media-element>media element</a>'s <a id=origin:node-document-5 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
+    <dl class=switch><dt>If the <a href=#media-data id=origin:media-data>media data</a> is <a href=#cors-cross-origin id=origin:cors-cross-origin-2>CORS-cross-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-24>origin</a> is a globally unique identifier assigned when the <a href=#media-data id=origin:media-data-2>media
+     data</a> is <a href=#fetch id=origin:fetch>fetched</a>.<dt>If the <a href=#media-data id=origin:media-data-3>media data</a> is <a href=#cors-same-origin id=origin:cors-same-origin-2>CORS-same-origin</a><dd>The <a href=#origin-2 id=origin:origin-2-25>origin</a> is an <a href=#concept-origin-alias id=origin:concept-origin-alias-12>alias</a> to the
+     <a href=#origin-2 id=origin:origin-2-26>origin</a> of the <a href=#media-element id=origin:media-element>media element</a>'s <a id=origin:node-document-5 href=https://dom.spec.whatwg.org/#concept-node-document data-x-internal=node-document>node document</a>.</dl>
 
-    <p><a href=#media-element id=origin:media-element-2>Media elements</a> do not have an <a href=#effective-script-origin id=origin:effective-script-origin-18>effective script
+    <p><a href=#media-element id=origin:media-element-2>Media elements</a> do not have an <a href=#effective-script-origin id=origin:effective-script-origin-19>effective script
     origin</a>.</p>
 
    <dt>For fonts<dd>
 
-    <p>The <a href=#origin-2 id=origin:origin-2-26>origin</a> of a downloadable Web font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-13>alias</a> to the <a href=#origin-2 id=origin:origin-2-27>origin</a> of the <a href=#absolute-url id=origin:absolute-url>absolute
+    <p>The <a href=#origin-2 id=origin:origin-2-27>origin</a> of a downloadable Web font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-13>alias</a> to the <a href=#origin-2 id=origin:origin-2-28>origin</a> of the <a href=#absolute-url id=origin:absolute-url>absolute
     URL</a> used to obtain the font (after any redirects). <a href=#refsCSSFONTS>[CSSFONTS]</a>
     <a href=#refsCSSFONTLOAD>[CSSFONTLOAD]</a></p> 
 
-    <p>The <a href=#origin-2 id=origin:origin-2-28>origin</a> of a locally installed system font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-14>alias</a> to the <a href=#origin-2 id=origin:origin-2-29>origin</a> of the
+    <p>The <a href=#origin-2 id=origin:origin-2-29>origin</a> of a locally installed system font is an <a href=#concept-origin-alias id=origin:concept-origin-alias-14>alias</a> to the <a href=#origin-2 id=origin:origin-2-30>origin</a> of the
     <code id=origin:document-23><a href=#document>Document</a></code> in which that font is being used.</p>
 
-    <p>Fonts do not have an <a href=#effective-script-origin id=origin:effective-script-origin-19>effective script origin</a>.</p>
+    <p>Fonts do not have an <a href=#effective-script-origin id=origin:effective-script-origin-20>effective script origin</a>.</p>
 
    </dl>
 
@@ -58205,40 +58230,40 @@
   <hr>
 
   <p>The <dfn id=unicode-serialisation-of-an-origin>Unicode serialisation of an origin</dfn> is the string obtained by applying the
-  following algorithm to the given <a href=#origin-2 id=origin:origin-2-30>origin</a>:</p>
+  following algorithm to the given <a href=#origin-2 id=origin:origin-2-31>origin</a>:</p>
 
-  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-31>origin</a> in question is not a scheme/host/port tuple, then return the
-   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-32>origin</a>
+  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-32>origin</a> in question is not a scheme/host/port tuple, then return the
+   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-33>origin</a>
    tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li><p>Apply the <a href=#domain-to-unicode id=origin:domain-to-unicode>domain to Unicode</a> algorithm to each component of the host
-   part of the <a href=#origin-2 id=origin:origin-2-33>origin</a> tuple, and append the results — each component, in the same
-   order, separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a><li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-34>origin</a> tuple gives a port that is different from the
-   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-35>origin</a> tuple, then
+   part of the <a href=#origin-2 id=origin:origin-2-34>origin</a> tuple, and append the results — each component, in the same
+   order, separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a><li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-35>origin</a> tuple gives a port that is different from the
+   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-36>origin</a> tuple, then
    append a U+003A COLON character (:) and the given port, in base ten, to <var>result</var>.<li><p>Return <var>result</var>.</ol>
 
 
   <p>The <dfn id=ascii-serialisation-of-an-origin>ASCII serialisation of an origin</dfn> is the string obtained by applying the
-  following algorithm to the given <a href=#origin-2 id=origin:origin-2-36>origin</a>:</p>
+  following algorithm to the given <a href=#origin-2 id=origin:origin-2-37>origin</a>:</p>
 
-  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-37>origin</a> in question is not a scheme/host/port tuple, then return the
-   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-38>origin</a>
+  <ol><li><p>If the <a href=#origin-2 id=origin:origin-2-38>origin</a> in question is not a scheme/host/port tuple, then return the
+   literal string "<code>null</code>" and abort these steps.<li><p>Otherwise, let <var>result</var> be the scheme part of the <a href=#origin-2 id=origin:origin-2-39>origin</a>
    tuple.<li><p>Append the string "<code>://</code>" to <var>result</var>.<li>
 
     <p>Apply the <a href=#domain-to-ascii id=origin:domain-to-ascii>domain to ASCII</a> algorithm to each component of the host part of
-    the <a href=#origin-2 id=origin:origin-2-39>origin</a> tuple, and append the results — each component, in the same order,
+    the <a href=#origin-2 id=origin:origin-2-40>origin</a> tuple, and append the results — each component, in the same order,
     separated by U+002E FULL STOP characters (.) — to <var>result</var>. <a href=#refsURL>[URL]</a></p>
 
     <p>If the <a href=#domain-to-ascii id=origin:domain-to-ascii-2>domain to ASCII</a> algorithm returns failure, e.g. because a component is too long or because it contains
     invalid characters, then throw a <code id=origin:securityerror-2><a href=#securityerror>SecurityError</a></code> exception and abort these steps.</p>
 
-   <li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-40>origin</a> tuple gives a port that is different from the
-   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-41>origin</a> tuple, then
+   <li><p>If the port part of the <a href=#origin-2 id=origin:origin-2-41>origin</a> tuple gives a port that is different from the
+   default port for the protocol given by the scheme part of the <a href=#origin-2 id=origin:origin-2-42>origin</a> tuple, then
    append a U+003A COLON character (:) and the given port, in base ten, to <var>result</var>.<li><p>Return <var>result</var>.</ol>
 
 
-  <p>Two <a href=#origin-2 id=origin:origin-2-42>origins</a> are said to be the <dfn id=same-origin>same origin</dfn> if the
+  <p>Two <a href=#origin-2 id=origin:origin-2-43>origins</a> are said to be the <dfn id=same-origin>same origin</dfn> if the
   following algorithm returns true:</p>
 
-  <ol><li><p>Let <var>A</var> be the first <a href=#origin-2 id=origin:origin-2-43>origin</a> being compared, and <var>B</var> be the second <a href=#origin-2 id=origin:origin-2-44>origin</a> being compared.<li><p>If <var>A</var> and <var>B</var> are both opaque identifiers, and their
+  <ol><li><p>Let <var>A</var> be the first <a href=#origin-2 id=origin:origin-2-44>origin</a> being compared, and <var>B</var> be the second <a href=#origin-2 id=origin:origin-2-45>origin</a> being compared.<li><p>If <var>A</var> and <var>B</var> are both opaque identifiers, and their
    value is equal, then return true.<li><p>Otherwise, if either <var>A</var> or <var>B</var> or both are opaque
    identifiers, return false.<li><p>If <var>A</var> and <var>B</var> have scheme components that are not
    identical, return false.<li><p>If <var>A</var> and <var>B</var> have host components that are not

Modified: source
===================================================================
--- source	2014-09-18 16:53:24 UTC (rev 8786)
+++ source	2014-09-18 20:37:46 UTC (rev 8787)
@@ -2624,6 +2624,7 @@
 
     <ul class="brief">
      <li><dfn>URL</dfn>
+     <li><dfn data-x="concept-url-origin" data-x-href="https://url.spec.whatwg.org/#concept-url-origin">Origin</dfn> of URLs
      <li><dfn>Absolute URL</dfn>
      <li><dfn>Relative URL</dfn>
      <li><dfn data-x="concept-url-scheme-relative">Relative schemes</dfn>
@@ -78274,13 +78275,40 @@
   <hr>
 
   <p>The <dfn>origin</dfn> of a resource and the <dfn>effective script origin</dfn> of a resource
-  are both either opaque identifiers or tuples consisting of a scheme component, a host component, a
-  port component, and optionally extra data.</p>
+  are each one of the following:</p>
 
-  <p class="note">The extra data could include the certificate of the site when using encrypted
-  connections, to ensure that if the site's secure certificate changes, the origin is considered to
-  change as well.</p>
+  <dl>
 
+
+   <dt>Opaque identifiers
+
+   <dd>
+
+    <p>Internal values, with no serialisation, for which the only meaningful operation is testing
+    for equality.</p>
+
+
+   <dt>Tuples
+
+   <dd>
+
+    <p>Tuples consisting of a scheme component, a host component, a port component, and optionally
+    extra data.</p>
+
+    <p class="note">The extra data could include the certificate of the site when using encrypted
+    connections, to ensure that if the site's secure certificate changes, the origin is considered to
+    change as well.</p>
+
+
+   <dt>Aliases
+
+   <dd>
+
+    <p>A reference to another <span>origin</span> or <span>effective script origin</span>.</p>
+
+
+  </dl>
+
   <div w-nodev>
 
   <p>An <span>origin</span> or <span>effective script origin</span> can be defined as an <dfn
@@ -78298,7 +78326,7 @@
    <dd>
 
     <p>The <span>origin</span> and <span>effective script origin</span> of the <span>URL</span> are
-    the origin defined in <cite>The Web Origin Concept</cite>. <ref spec=ORIGIN></p>
+    the <span data-x="concept-url-origin">URL origin</span> defined in the WHATWG URL standard. <ref spec=URL></p>
 
    </dd>
 



More information about the Commit-Watchers mailing list