Merge WHATWG change: Change sequence in document response entity body algorithm.
authorJungkee Song <jungkee.song@samsung.com>
Thu, 09 May 2013 23:18:24 +0900
changeset 114 349ab61f9358
parent 113 1acf8c7152b7
child 115 4d5b8dfde786
Merge WHATWG change: Change sequence in document response entity body algorithm.
Overview.html
Overview.src.html
--- a/Overview.html	Thu May 09 23:03:09 2013 +0900
+++ b/Overview.html	Thu May 09 23:18:24 2013 +0900
@@ -773,7 +773,7 @@
      <a class="external" href="http://dev.w3.org/html5/spec/urls.html#document-base-url">document base URL</a> of
      <a href="#concept-xmlhttprequest-document" title="concept-XMLHttpRequest-document">document</a>.
 
-     <li><p>Set <a href="#source-origin">source origin</a> to a globally unique identifier,
+     <li><p>Set <a href="#source-origin">source origin</a> to a globally unique identifier
      if the <a href="#anonymous-flag">anonymous flag</a> is set, and the
      <a class="external" href="http://dev.w3.org/html5/spec/browsers.html#origin">origin</a> of
      <a href="#concept-xmlhttprequest-document" title="concept-XMLHttpRequest-document">document</a> otherwise.
@@ -2321,11 +2321,7 @@
     executed, resources referenced will not be loaded and no associated XSLT
     will be applied.</p> <!-- XXX more formally?! -->
 
-    <!-- XXX what about document's encoding? -->
-
-   <li><p>Set <var title="">document</var>'s
-   <a class="external" href="http://dev.w3.org/html5/spec/browsers.html#origin">origin</a> to the
-   <a href="#source-origin">source origin</a>.
+   <!-- XXX what about document's encoding? -->
 
    <li><p>Set <var title="">document</var>'s
    <a class="external" href="http://dev.w3.org/2006/webapi/DOM4Core/#concept-document-content-type" title="concept-document-content-type">content type</a>
@@ -2335,6 +2331,10 @@
    <a class="external" href="http://dev.w3.org/2006/webapi/DOM4Core/#concept-document-url" title="concept-document-url">URL</a> to
    <a href="#request-url">request URL</a>.
 
+   <li><p>Set <var title="">document</var>'s
+   <a class="external" href="http://dev.w3.org/html5/spec/browsers.html#origin">origin</a> to the
+   <a href="#source-origin">source origin</a>.
+
    <li><p>Return <var title="">document</var>.
   </ol>
 
--- a/Overview.src.html	Thu May 09 23:03:09 2013 +0900
+++ b/Overview.src.html	Thu May 09 23:18:24 2013 +0900
@@ -543,7 +543,7 @@
     <span data-anolis-spec=html>JavaScript global environment</span> is a
     <span data-anolis-spec=html>document environment</span>, set
     <span title=concept-XMLHttpRequest-document>document</span> to the
-    <span title=concept-document data-anolis-spec=dom>document</span>
+    <span data-anolis-spec=dom title=concept-document>document</span>
     associated with the global object of <var title>xhr</var>'s interface
     object.
 
@@ -782,7 +782,7 @@
      <span data-anolis-spec=html>document base URL</span> of
      <span title=concept-XMLHttpRequest-document>document</span>.
 
-     <li><p>Set <span>source origin</span> to a globally unique identifier,
+     <li><p>Set <span>source origin</span> to a globally unique identifier
      if the <span>anonymous flag</span> is set, and the
      <span data-anolis-spec=html>origin</span> of
      <span title=concept-XMLHttpRequest-document>document</span> otherwise.
@@ -2330,11 +2330,7 @@
     executed, resources referenced will not be loaded and no associated XSLT
     will be applied.</p> <!-- XXX more formally?! -->
 
-    <!-- XXX what about document's encoding? -->
-
-   <li><p>Set <var title>document</var>'s
-   <span data-anolis-spec=html>origin</span> to the
-   <span>source origin</span>.
+   <!-- XXX what about document's encoding? -->
 
    <li><p>Set <var title>document</var>'s
    <span data-anolis-spec=dom title=concept-document-content-type>content type</span>
@@ -2344,6 +2340,10 @@
    <span data-anolis-spec=dom title=concept-document-url>URL</span> to
    <span>request URL</span>.
 
+   <li><p>Set <var title>document</var>'s
+   <span data-anolis-spec=html>origin</span> to the
+   <span>source origin</span>.
+
    <li><p>Return <var title>document</var>.
   </ol>