Merge Anne's change: Oct 10, 2012, Use the utf-8 decode algorithm for JSON
authorJungkee Song <jungkee.song@samsung.com>
Mon, 12 Nov 2012 18:34:54 +0900
changeset 84 9cb42e7aacd8
parent 83 5b5b543bf1b0
child 85 cff809cbf044
Merge Anne's change: Oct 10, 2012, Use the utf-8 decode algorithm for JSON
Overview.html
Overview.src.html
--- a/Overview.html	Mon Nov 12 18:28:24 2012 +0900
+++ b/Overview.html	Mon Nov 12 18:34:54 2012 +0900
@@ -2371,7 +2371,7 @@
      <li><p>If <var>charset</var> is null, set <var>charset</var> to
      <a class="external" href="http://encoding.spec.whatwg.org/#utf-8">utf-8</a>.
 
-     <li><p><a class="external" href="http://encoding.spec.whatwg.org/#decode">Decode</a> the byte stream
+     <li><p><a class="external" href="http://encoding.spec.whatwg.org/#decode">Decode</a> byte stream
      <a href="#response-entity-body">response entity body</a> using fallback encoding
      <var>charset</var> and then let <var title="">document</var> be a
      <a class="external" href="http://dev.w3.org/2006/webapi/DOM4Core/#concept-document" title="concept-document">document</a> that
@@ -2421,9 +2421,9 @@
 algorithm:</p>
 
 <ol>
- <li><p>Let <var title="">JSON text</var> be the
- <a href="#response-entity-body">response entity body</a> decoded using UTF-8. Remove one leading
- U+FEFF BYTE ORDER MARK character, if present.</li>
+ <li><p>Let <var title="">JSON text</var> be the result of running
+ <a class="external" href="http://encoding.spec.whatwg.org/#utf-8-decode">utf-8 decode</a> on byte stream
+ <a href="#response-entity-body">response entity body</a>.
 
  <li><p>Return the result of invoking the <code title="">parse</code> function
  of the <code title="">JSON</code> object defined in ECMAScript, with
@@ -2461,9 +2461,9 @@
    <li><p>If <var>charset</var> is null, set <var>charset</var> to
    <a class="external" href="http://encoding.spec.whatwg.org/#utf-8">utf-8</a>.
 
-   <li><p>Return the result of
-   <a class="external" href="http://encoding.spec.whatwg.org/#decode" title="decode">decoding</a> the
-   byte stream <a href="#response-entity-body">response entity body</a> using fallback encoding
+   <li><p>Return the result of running
+   <a class="external" href="http://encoding.spec.whatwg.org/#decode">decode</a> on byte stream
+   <a href="#response-entity-body">response entity body</a> using fallback encoding
    <var>charset</var>.
   </ol>
 
--- a/Overview.src.html	Mon Nov 12 18:28:24 2012 +0900
+++ b/Overview.src.html	Mon Nov 12 18:34:54 2012 +0900
@@ -2335,7 +2335,7 @@
      <li><p>If <var>charset</var> is null, set <var>charset</var> to
      <span data-anolis-spec=encoding>utf-8</span>.
 
-     <li><p><span data-anolis-spec=encoding>Decode</span> the byte stream
+     <li><p><span data-anolis-spec=encoding>Decode</span> byte stream
      <span>response entity body</span> using fallback encoding
      <var>charset</var> and then let <var title>document</var> be a
      <span data-anolis-spec=dom title=concept-document>document</span> that
@@ -2385,9 +2385,9 @@
 algorithm:</p>
 
 <ol>
- <li><p>Let <var title>JSON text</var> be the
- <span>response entity body</span> decoded using UTF-8. Remove one leading
- U+FEFF BYTE ORDER MARK character, if present.</li>
+ <li><p>Let <var title>JSON text</var> be the result of running
+ <span data-anolis-spec=encoding>utf-8 decode</span> on byte stream
+ <span>response entity body</span>.
 
  <li><p>Return the result of invoking the <code title>parse</code> function
  of the <code title>JSON</code> object defined in ECMAScript, with
@@ -2425,9 +2425,9 @@
    <li><p>If <var>charset</var> is null, set <var>charset</var> to
    <span data-anolis-spec=encoding>utf-8</span>.
 
-   <li><p>Return the result of
-   <span data-anolis-spec=encoding title=decode>decoding</span> the
-   byte stream <span>response entity body</span> using fallback encoding
+   <li><p>Return the result of running
+   <span data-anolis-spec=encoding>decode</span> on byte stream
+   <span>response entity body</span> using fallback encoding
    <var>charset</var>.
   </ol>