Merge WHATWG change: Minor cleanup around URL handling.
--- a/Overview.html Thu May 09 22:18:49 2013 +0900
+++ b/Overview.html Thu May 09 23:03:09 2013 +0900
@@ -730,12 +730,8 @@
<a href="#synchronous-flag">synchronous flag</a>.</p>
<p>Throws a "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" exception if
- one of the following is true:</p>
-
- <ul>
- <li><var title="">method</var> is not a valid HTTP method.</li>
- <li><var title="">url</var> cannot be parsed.</li>
- </ul>
+ either <var title="">method</var> is not a valid HTTP method or
+ <var title="">url</var> cannot be parsed.
<p>Throws a "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#securityerror">SecurityError</a></code>" exception
if <var title="">method</var> is a case-insensitive match for
@@ -843,20 +839,6 @@
"<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#syntaxerror">SyntaxError</a></code>" exception and terminate
these steps.
- <li><p>If <var>async</var> is false, the
- <a class="external" href="http://dev.w3.org/html5/spec/infrastructure.html#javascript-global-environment">JavaScript global environment</a> is a
- <a class="external" href="http://dev.w3.org/html5/spec/webappapis.html#document-environment">document environment</a>, and either the
- <a href="#anonymous-flag">anonymous flag</a> is set, the
- <code title="dom-XMLHttpRequest-timeout"><a href="#dom-xmlhttprequest-timeout">timeout</a></code> attribute value is
- not zero, the
- <code title="dom-XMLHttpRequest-withCredentials"><a href="#dom-xmlhttprequest-withcredentials">withCredentials</a></code>
- attribute value is true, or the
- <code title="dom-XMLHttpRequest-responseType"><a href="#dom-xmlhttprequest-responsetype">responseType</a></code>
- attribute value is not the empty string,
- <a class="external" href="http://dev.w3.org/2006/webapi/DOM4Core/#concept-throw" title="concept-throw">throw</a> an
- "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidaccesserror">InvalidAccessError</a></code>" exception and
- terminate these steps.
-
<li>
<p>If <var title="">parsed URL</var>'s
<a class="external" href="http://url.spec.whatwg.org/#relative-flag">relative flag</a> is set, run these
@@ -875,6 +857,20 @@
<var>password</var>.
</ol>
+ <li><p>If <var>async</var> is false, the
+ <a class="external" href="http://dev.w3.org/html5/spec/infrastructure.html#javascript-global-environment">JavaScript global environment</a> is a
+ <a class="external" href="http://dev.w3.org/html5/spec/webappapis.html#document-environment">document environment</a>, and either the
+ <a href="#anonymous-flag">anonymous flag</a> is set, the
+ <code title="dom-XMLHttpRequest-timeout"><a href="#dom-xmlhttprequest-timeout">timeout</a></code> attribute value is
+ not zero, the
+ <code title="dom-XMLHttpRequest-withCredentials"><a href="#dom-xmlhttprequest-withcredentials">withCredentials</a></code>
+ attribute value is true, or the
+ <code title="dom-XMLHttpRequest-responseType"><a href="#dom-xmlhttprequest-responsetype">responseType</a></code>
+ attribute value is not the empty string,
+ <a class="external" href="http://dev.w3.org/2006/webapi/DOM4Core/#concept-throw" title="concept-throw">throw</a> an
+ "<code class="external"><a href="http://dev.w3.org/2006/webapi/DOM4Core/#invalidaccesserror">InvalidAccessError</a></code>" exception and
+ terminate these steps.
+
<li><p><a href="#terminate-abort()" title="terminate abort()">Terminate the <code>abort()</code> algorithm</a>.</li>
<li><p><a href="#terminate-send()" title="terminate send()">Terminate the <code>send()</code> algorithm</a>.</li>
@@ -1401,7 +1397,7 @@
<a href="#request-url">request URL</a> from <i title="">origin</i>
<a href="#source-origin">source origin</a>, using
<a href="#referrer-source">referrer source</a> as
- <i title="">override referer source</i>, with the
+ <i title="">override referrer source</i>, with the
<i title="">synchronous flag</i> set if the
<a href="#synchronous-flag">synchronous flag</a> is set, using HTTP method
<a href="#request-method">request method</a>, taking into account the
@@ -1469,9 +1465,9 @@
<dt>source origin</dt>
<dd>The <a href="#source-origin">source origin</a>.</dd>
- <dt>referer source
+ <dt>referrer source
<dd>If the <a href="#anonymous-flag">anonymous flag</a> is set, the
- <a class="external" href="http://dev.w3.org/html5/spec/urls.html#url">URL</a>
+ <a class="external" href="http://url.spec.whatwg.org/#url">URL</a>
"<code title="">about:blank</code>", and the
<a href="#referrer-source">referrer source</a> otherwise.
@@ -1627,7 +1623,7 @@
<ol>
<li><p>Set the <a href="#request-url">request URL</a> to the
- <a class="external" href="http://dev.w3.org/html5/spec/urls.html#url">URL</a> conveyed by the
+ <a class="external" href="http://url.spec.whatwg.org/#url">URL</a> conveyed by the
<code>Location</code> header.</li>
<li><p>If the <a href="#source-origin">source origin</a> and the
@@ -2820,7 +2816,7 @@
<span><code>data:</code> URL</span>, or the default otherwise.
<li><p>Set the <a href="#response-entity-body">response entity body</a> to the data the
- <a class="external" href="http://dev.w3.org/html5/spec/urls.html#url">URL</a> encodes, base64 decoded if the
+ <a class="external" href="http://url.spec.whatwg.org/#url">URL</a> encodes, base64 decoded if the
"<code title="">;base64</code>" flag is present.
</ul>
--- a/Overview.src.html Thu May 09 22:18:49 2013 +0900
+++ b/Overview.src.html Thu May 09 23:03:09 2013 +0900
@@ -739,12 +739,8 @@
<span>synchronous flag</span>.</p>
<p>Throws a "<code data-anolis-spec=dom>SyntaxError</code>" exception if
- one of the following is true:</p>
-
- <ul>
- <li><var title>method</var> is not a valid HTTP method.</li>
- <li><var title>url</var> cannot be parsed.</li>
- </ul>
+ either <var title>method</var> is not a valid HTTP method or
+ <var title>url</var> cannot be parsed.
<p>Throws a "<code data-anolis-spec=dom>SecurityError</code>" exception
if <var title>method</var> is a case-insensitive match for
@@ -852,20 +848,6 @@
"<code data-anolis-spec=dom>SyntaxError</code>" exception and terminate
these steps.
- <li><p>If <var>async</var> is false, the
- <span data-anolis-spec=html>JavaScript global environment</span> is a
- <span data-anolis-spec=html>document environment</span>, and either the
- <span>anonymous flag</span> is set, the
- <code title=dom-XMLHttpRequest-timeout>timeout</code> attribute value is
- not zero, the
- <code title=dom-XMLHttpRequest-withCredentials>withCredentials</code>
- attribute value is true, or the
- <code title=dom-XMLHttpRequest-responseType>responseType</code>
- attribute value is not the empty string,
- <span data-anolis-spec=dom title=concept-throw>throw</span> an
- "<code data-anolis-spec=dom>InvalidAccessError</code>" exception and
- terminate these steps.
-
<li>
<p>If <var title>parsed URL</var>'s
<span data-anolis-spec=url>relative flag</span> is set, run these
@@ -884,6 +866,20 @@
<var>password</var>.
</ol>
+ <li><p>If <var>async</var> is false, the
+ <span data-anolis-spec=html>JavaScript global environment</span> is a
+ <span data-anolis-spec=html>document environment</span>, and either the
+ <span>anonymous flag</span> is set, the
+ <code title=dom-XMLHttpRequest-timeout>timeout</code> attribute value is
+ not zero, the
+ <code title=dom-XMLHttpRequest-withCredentials>withCredentials</code>
+ attribute value is true, or the
+ <code title=dom-XMLHttpRequest-responseType>responseType</code>
+ attribute value is not the empty string,
+ <span data-anolis-spec=dom title=concept-throw>throw</span> an
+ "<code data-anolis-spec=dom>InvalidAccessError</code>" exception and
+ terminate these steps.
+
<li><p><span title="terminate abort()">Terminate the <code>abort()</code> algorithm</span>.</p></li>
<li><p><span title="terminate send()">Terminate the <code>send()</code> algorithm</span>.</p></li>
@@ -1410,7 +1406,7 @@
<span>request URL</span> from <i title>origin</i>
<span>source origin</span>, using
<span>referrer source</span> as
- <i title>override referer source</i>, with the
+ <i title>override referrer source</i>, with the
<i title>synchronous flag</i> set if the
<span>synchronous flag</span> is set, using HTTP method
<span>request method</span>, taking into account the
@@ -1478,9 +1474,9 @@
<dt>source origin</dt>
<dd>The <span>source origin</span>.</dd>
- <dt>referer source
+ <dt>referrer source
<dd>If the <span>anonymous flag</span> is set, the
- <span data-anolis-spec=html>URL</span>
+ <span data-anolis-spec=url>URL</span>
"<code title>about:blank</code>", and the
<span>referrer source</span> otherwise.
@@ -1636,7 +1632,7 @@
<ol>
<li><p>Set the <span>request URL</span> to the
- <span data-anolis-spec=html>URL</span> conveyed by the
+ <span data-anolis-spec=url>URL</span> conveyed by the
<code>Location</code> header.</p></li>
<li><p>If the <span>source origin</span> and the
@@ -2829,7 +2825,7 @@
<span><code>data:</code> URL</span>, or the default otherwise.
<li><p>Set the <span>response entity body</span> to the data the
- <span data-anolis-spec=html>URL</span> encodes, base64 decoded if the
+ <span data-anolis-spec=url>URL</span> encodes, base64 decoded if the
"<code title>;base64</code>" flag is present.
</ul>