- From: poot <cvsmail@w3.org>
- Date: Fri, 27 Jun 2008 07:49:43 +0900 (JST)
- To: public-html-diffs@w3.org
URLification of origin. (whatwg r1808) (changed by: Ian Hickson)
Diff: http://people.w3.org/mike/diffs/html5/spec/Overview.1.997.html
Cumulative diff: http://people.w3.org/mike/diffs/html5/spec/Overview.diff.html
http://dev.w3.org/cvsweb/html5/spec/Overview.html?r1=1.996&r2=1.997&f=h
http://dev.w3.org/html5/spec/Overview.html
http://html5.org/tools/web-apps-tracker?from=1807&to=1808
===================================================================
RCS file: /sources/public/html5/spec/Overview.html,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -d -r1.996 -r1.997
--- Overview.html 26 Jun 2008 10:21:02 -0000 1.996
+++ Overview.html 26 Jun 2008 22:47:46 -0000 1.997
@@ -30448,7 +30448,6 @@
<code>Document</code>, sorted in document order of the elements nesting
those browsing contexts.</p>
<!-- XXX DOMB -->
- <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->
<h3 id=origin><span class=secno>5.3 </span>Origin</h3>
<!-- Hallowed are the Ori -->
@@ -30460,52 +30459,45 @@
<p>These characteristics are defined as follows:
- <dl><!-- XXXURL change to URL -->
-
- <dt>For URIs
+ <dl>
+ <dt>For URLs
<dd>
<p>The <a href="#origin0">origin</a> and <a href="#effective3">effective
- script origin</a> of the URI is whatever is returned by the following
- algorithm:</p>
+ script origin</a> of the <a href="#url">URL</a> is whatever is returned
+ by the following algorithm:</p>
- <ol><!-- XXXURL change to URL -->
+ <ol>
+ <li>
+ <p>Let <var title="">url</var> be the <a href="#url">URL</a> for which
+ the <a href="#origin0">origin</a> is being determined.
<li>
- <p>Let <var title="">uri</var> be the URI for which the <a
- href="#origin0">origin</a> is being determined.
- </li>
- <!-- XXXURL apply algorithms -->
+ <p><a href="#parse0" title="parse a url">Parse</a> <var
+ title="">url</var>.
<li>
- <p>Parse <var title="">uri</var> according to the rules described in
- RFC 3986 and RFC 3987. <a href="#references">[RFC3986]</a> <a
- href="#references">[RFC3987]</a>
- </li>
- <!-- XXXURL change to URL -->
+ <p>If <var title="">url</var> does not use a server-based naming
+ authority, or if parsing <var title="">url</var> failed, or if <var
+ title="">url</var> is not an <a href="#absolute">absolute URL</a>,
+ then return a new globally unique identifier.
<li>
- <p>If <var title="">uri</var> does not use a server-based naming
- authority, then return a new globally unique identifier.
- </li>
- <!-- XXXURL use algorithms -->
+ <p>Let <var title="">scheme</var> be the <a href="#ltschemegt"
+ title=url-scheme><scheme></a> component of the URI, converted to
+ lowercase<!-- XXX -->.
<li>
- <p>Let <var title="">scheme</var> be the <scheme> component of
- the URI, converted to lowercase. If the UA doesn't support the given
- protocol, then return a new globally unique identifier.
+ <p>If the UA doesn't support the protocol given by <var
+ title="">scheme</var>, then return a new globally unique identifier.
<li>
- <p>If the scheme is "<code title="">file</code>", then the user agent
- may return a UA-specific value.
- </li>
- <!-- XXXURL use algorithms -->
+ <p>If <var title="">scheme</var> is "<code title="">file</code>", then
+ the user agent may return a UA-specific value.
<li>
- <p>Let <var title="">host</var> be the <host>/<ihost>
- component of the URI.
- </li>
- <!-- XXXURL use algorithms -->
+ <p>Let <var title="">host</var> be the <a href="#lthostgt"
+ title=url-host><host></a> component of <var title="">url</var>.
<li>
<p>Apply the IDNA ToASCII algorithm to <var title="">host</var>, with
@@ -30519,15 +30511,14 @@
<li>
<p>Let <var title="">host</var> be the result of converting <var
- title="">host</var> to lowercase.
- </li>
- <!-- XXXURL use algorithms -->
+ title="">host</var> to lowercase<!-- XXX -->.
<li>
- <p>If no port is explicitly listed, then let <var title="">port</var>
- be the default port for the protocol given by <var
- title="">scheme</var>. Otherwise, let <var title="">port</var> be the
- <port> component of the URI.
+ <p>If there is no <a href="#ltportgt" title=url-port><port></a>
+ component, then let <var title="">port</var> be the default port for
+ the protocol given by <var title="">scheme</var>. Otherwise, let <var
+ title="">port</var> be the <a href="#ltportgt"
+ title=url-port><port></a> component of <var title="">url</var>.
<li>
<p>Return the tuple (<var title="">scheme</var>, <var
@@ -30557,62 +30548,52 @@
<dt>If a script is a function or other code reference created by another
script
- <dd>The owner is the script that created it.</dd>
- <!-- XXXURL JSURL issue -->
+ <dd>The owner is the script that created it.
<dt>If a script is a <a href="#the-javascript" title="javascript
- protocol"><code title="">javascript:</code> URI</a> that was returned
- as the location of an HTTP redirect (or equivalent in other protocols)</dt>
- <!-- XXXURL JSURL issue -->
+ protocol"><code title="">javascript:</code> URL</a> that was returned
+ as the location of an HTTP redirect (or equivalent in other protocols)
- <dd>The owner is the URI that redirected to the <a
+ <dd>The owner is the <a href="#url">URL</a> that redirected to the <a
href="#the-javascript" title="javascript protocol"><code
- title="">javascript:</code> URI</a>.</dd>
- <!-- XXXURL JSURL issue -->
+ title="">javascript:</code> URL</a>.
<dt>If a script is a <a href="#the-javascript" title="javascript
- protocol"><code title="">javascript:</code> URI</a> in an attribute
+ protocol"><code title="">javascript:</code> URL</a> in an attribute
<dd>The owner is the <code>Document</code> of the element on which the
- attribute is found.</dd>
- <!-- XXXURL JSURL issue -->
+ attribute is found.
<dt>If a script is a <a href="#the-javascript" title="javascript
- protocol"><code title="">javascript:</code> URI</a> in a style sheet</dt>
- <!-- XXXURL use url -->
+ protocol"><code title="">javascript:</code> URL</a> in a style sheet
- <dd>The owner is the URI of the style sheet.</dd>
- <!-- XXXURL JSURL issue -->
+ <dd>The owner is the <a href="#url">URL</a> of the style sheet.
<dt>If a script is a <a href="#the-javascript" title="javascript
- protocol"><code title="">javascript:</code> URI</a> to which a <a
+ protocol"><code title="">javascript:</code> URL</a> to which a <a
href="#browsing1">browsing context</a> is being <a href="#navigate"
- title=navigate>navigated</a>, the URI having been provided by the user
+ title=navigate>navigated</a>, the URL having been provided by the user
(e.g. by using a <i>bookmarklet</i>)
<dd>The owner is the <code>Document</code> of the <a
href="#browsing1">browsing context</a>'s <a href="#active">active
- document</a>.</dd>
- <!-- XXXURL JSURL issue -->
+ document</a>.
<dt>If a script is a <a href="#the-javascript" title="javascript
- protocol"><code title="">javascript:</code> URI</a> to which a <a
+ protocol"><code title="">javascript:</code> URL</a> to which a <a
href="#browsing1">browsing context</a> is being <a href="#navigate"
- title=navigate>navigated</a>, the URI having been declared in markup</dt>
- <!-- XXXURL use url -->
+ title=navigate>navigated</a>, the URL having been declared in markup
<dd>The owner is the <code>Document</code> of the element (e.g. an
<code><a href="#a">a</a></code> or <code><a
- href="#area">area</a></code> element) that declared the URI.</dd>
- <!-- XXXURL JSURL issue -->
+ href="#area">area</a></code> element) that declared the URL.
<dt>If a script is a <a href="#the-javascript" title="javascript
- protocol"><code title="">javascript:</code> URI</a> to which a <a
+ protocol"><code title="">javascript:</code> URL</a> to which a <a
href="#browsing1">browsing context</a> is being <a href="#navigate"
- title=navigate>navigated</a>, the URI having been provided by script</dt>
- <!-- XXXURL use url -->
+ title=navigate>navigated</a>, the URL having been provided by script
- <dd>The owner is the script that provided the URI.
+ <dd>The owner is the script that provided the URL.
</dl>
<p>The <a href="#origin0">origin</a> of the script is then equal to the
@@ -30644,64 +30625,54 @@
track the <code>Document</code> to which the
<code>XMLHttpRequest</code> object's <a
href="http://dev.w3.org/2006/webapi/XMLHttpRequest-2/Overview.html#document-pointer"><code>Document</code>
- pointer</a> pointed when it was created.) <a href="#references">[XHR]</a></dd>
- <!-- XXXURL JSURL issue -->
+ pointer</a> pointed when it was created.) <a href="#references">[XHR]</a>
<dt>If a <code>Document</code> or image was generated from a <a
href="#the-javascript" title="javascript
- protocol"><code>javascript:</code> URI</a></dt>
- <!-- XXXURL JSURL issue -->
+ protocol"><code>javascript:</code> URL</a>
<dd>The <a href="#origin0">origin</a> is equal to the <a
href="#origin0">origin</a> of the script of that <a
href="#the-javascript" title="javascript
- protocol"><code>javascript:</code> URI</a>.</dd>
- <!-- XXXURL use url -->
+ protocol"><code>javascript:</code> URL</a>.
<dt>If a <code>Document</code> or image was served over the network and
- has an address that uses a URI scheme with a server-based naming
- authority</dt>
- <!-- XXXURL use url -->
+ has an address that uses a URL scheme with a server-based naming
+ authority
<dd>The <a href="#origin0">origin</a> is the <a
href="#origin0">origin</a> of the <span title="the document's
- address">full URI</span><!--
- XXXDOCURL --> of the
- <code>Document</code> or image.</dd>
- <!-- XXXURL use url -->
+ address">address</span><!-- XXXDOCURL
+ --> of the
+ <code>Document</code> or image.
<dt>If a <code>Document</code> or image was generated from a <code
- title="">data:</code> URI that was returned as the location of an HTTP
- redirect (or equivalent in other protocols)</dt>
- <!-- XXXURL use url -->
+ title="">data:</code> URL that was returned as the location of an HTTP
+ redirect (or equivalent in other protocols)
<dd>The <a href="#origin0">origin</a> is the <a
- href="#origin0">origin</a> of the URI that redirected to the <code
- title="">data:</code> URI.</dd>
- <!-- XXXURL use url -->
+ href="#origin0">origin</a> of the <a href="#url">URL</a> that
+ redirected to the <code title="">data:</code> URL.
<dt>If a <code>Document</code> or image was generated from a <code
- title="">data:</code> URI found in another <code>Document</code> or in
- a script</dt>
- <!-- XXXURL use url -->
+ title="">data:</code> URL found in another <code>Document</code> or in
+ a script
<dd>The <a href="#origin0">origin</a> is the <a
href="#origin0">origin</a> of the <code>Document</code> or script in
- which the <code title="">data:</code> URI was found.</dd>
- <!-- XXXURL use url -->
- <!-- XXXDOCURL use the document's address? -->
+ which the <code title="">data:</code> URL was found.
- <dt>If a <code>Document</code> has the URI "<code>about:blank</code>"
+ <dt>If a <code>Document</code> has the <span title="the document's
+ address">address</span><!-- XXXDOCURL --> "<code>about:blank</code>"
<dd>The <a href="#origin0">origin</a> of the <code>Document</code> is <a
href="#about-blank-origin">the <span>origin</span> it was assigned when
- its browsing context was created</a>.</dd>
- <!-- XXXURL data: URL issue -->
+ its browsing context was created</a>.
<dt>If a <code>Document</code> or image was obtained in some other
- manner (e.g. a <code title="">data:</code> URI typed in by the user, a
+ manner (e.g. a <code title="">data:</code> URL typed in by the user, a
<code>Document</code> created using the <code
- title="">createDocument()</code> API, a <code title="">data:</code> URI
+ title="">createDocument()</code> API, a <code title="">data:</code> URL
returned as the location of an HTTP redirect, etc)
<dd>The <a href="#origin0">origin</a> is a globally unique identifier
@@ -30870,11 +30841,10 @@
limited to:
<ul>
- <li>Processing of <code><a href="#script1">script</a></code> elements.</li>
- <!-- XXXURL JSURL issue -->
+ <li>Processing of <code><a href="#script1">script</a></code> elements.
<li>Processing of inline <code title="javascript protocol"><a
- href="#the-javascript">javascript:</a></code> URIs (e.g. the <code
+ href="#the-javascript">javascript:</a></code> URLs (e.g. the <code
title=attr-img-src><a href="#src">src</a></code> attribute of <code><a
href="#img">img</a></code> elements, or an <code title="">@import</code>
rule in a CSS <code><a href="#style1">style</a></code> element block).
@@ -30963,13 +30933,14 @@
<p>Every script whose <a href="#script2">script execution context</a> is a
<code><a href="#window">Window</a></code> object is also associated with a
<code>Document</code> object, known as its <dfn id=script4>script document
- context</dfn>. It is used to resolve URLs. The document is assigned when
- the script is created, as with the <a href="#script3">script browsing
- context</a>.
+ context</dfn>. It is used to <a href="#resolve" title="resolve a
+ url">resolve</a> URLs. The document is assigned when the script is
+ created, as with the <a href="#script3">script browsing context</a>.
<h4 id=security4><span class=secno>5.4.2 </span>Security exceptions</h4>
<p class=big-issue>Define <dfn id=security9>security exception</dfn>.</p>
+ <!-- XXXURL XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX \(URI\|IRI\|URL\) -->
<!-- SCRIPT EXEC -->
<h4 id=javascript-protocol><span class=secno>5.4.3 </span><dfn
Received on Thursday, 26 June 2008 22:50:25 UTC