[giow] (3) Attempt to slightly more closely align with reality.

Affected topics: HTML Syntax and Parsing git-svn-id: http://svn.whatwg.org/webapps@7324 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Sep 7, 2012 · 3b61b87 · 3b61b87
1 parent d97799a
commit 3b61b87
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 13 deletions.
diff --git a/complete.html b/complete.html
@@ -88178,10 +88178,18 @@ <h5 id=determining-the-character-encoding><span class=secno>12.2.2.1 </span>Dete
   <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <ol><li><p>If the user has explicitly instructed the user agent to
-   override the document's character encoding with a specific
-   encoding, optionally return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
-   <i>certain</i> and abort these steps.</li>
+  <ol><li>
+
+    <p>If the user has explicitly instructed the user agent to
+    override the document's character encoding with a specific
+    encoding, optionally return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+    <i>certain</i> and abort these steps.</p>
+
+    <p class=note>Typically, user agents remember such user requests
+    across sessions, and in some cases apply them to documents in
+    <code><a href=#the-iframe-element>iframe</a></code>s as well.</p>
+
+   </li>
 
    <li><p>If the transport layer specifies an encoding, and it is
    supported, return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
@@ -88259,6 +88267,13 @@ <h5 id=determining-the-character-encoding><span class=secno>12.2.2.1 </span>Dete
 
    </li>
 
+   <li><p>Otherwise, if the <code><a href=#document>Document</a></code> is in a <a href=#nested-browsing-context>nested
+   browsing context</a>, return the encoding of the <a href=#browsing-context-container>browsing
+   context container</a>'s <code><a href=#document>Document</a></code>'s <a href="#document's-character-encoding" title="document's character encoding">character encoding</a>,
+   with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+   <i>tentative</i>, and abort these steps.</li> <!-- not
+   carefully tested -->
+
    <li><p>Otherwise, if the user agent has information on the likely
    encoding for this page, e.g. based on the encoding of the page when
    it was last visited, then return that encoding, with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>

diff --git a/index b/index
@@ -88178,10 +88178,18 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
   <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <ol><li><p>If the user has explicitly instructed the user agent to
-   override the document's character encoding with a specific
-   encoding, optionally return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
-   <i>certain</i> and abort these steps.</li>
+  <ol><li>
+
+    <p>If the user has explicitly instructed the user agent to
+    override the document's character encoding with a specific
+    encoding, optionally return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+    <i>certain</i> and abort these steps.</p>
+
+    <p class=note>Typically, user agents remember such user requests
+    across sessions, and in some cases apply them to documents in
+    <code><a href=#the-iframe-element>iframe</a></code>s as well.</p>
+
+   </li>
 
    <li><p>If the transport layer specifies an encoding, and it is
    supported, return that encoding with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
@@ -88259,6 +88267,13 @@ dictionary <dfn id=storageeventinit>StorageEventInit</dfn> : <a href=#eventinit>
 
    </li>
 
+   <li><p>Otherwise, if the <code><a href=#document>Document</a></code> is in a <a href=#nested-browsing-context>nested
+   browsing context</a>, return the encoding of the <a href=#browsing-context-container>browsing
+   context container</a>'s <code><a href=#document>Document</a></code>'s <a href="#document's-character-encoding" title="document's character encoding">character encoding</a>,
+   with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>
+   <i>tentative</i>, and abort these steps.</li> <!-- not
+   carefully tested -->
+
    <li><p>Otherwise, if the user agent has information on the likely
    encoding for this page, e.g. based on the encoding of the page when
    it was last visited, then return that encoding, with the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a>

diff --git a/source b/source
@@ -102306,11 +102306,19 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
 
   <ol>
 
-   <li><p>If the user has explicitly instructed the user agent to
-   override the document's character encoding with a specific
-   encoding, optionally return that encoding with the <span
-   title="concept-encoding-confidence">confidence</span>
-   <i>certain</i> and abort these steps.</p></li>
+   <li>
+
+    <p>If the user has explicitly instructed the user agent to
+    override the document's character encoding with a specific
+    encoding, optionally return that encoding with the <span
+    title="concept-encoding-confidence">confidence</span>
+    <i>certain</i> and abort these steps.</p>
+
+    <p class="note">Typically, user agents remember such user requests
+    across sessions, and in some cases apply them to documents in
+    <code>iframe</code>s as well.</p>
+
+   </li>
 
    <li><p>If the transport layer specifies an encoding, and it is
    supported, return that encoding with the <span
@@ -102401,6 +102409,15 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
 
    </li>
 
+   <li><p>Otherwise, if the <code>Document</code> is in a <span>nested
+   browsing context</span>, return the encoding of the <span>browsing
+   context container</span>'s <code>Document</code>'s <span
+   title="document's character encoding">character encoding</span>,
+   with the <span
+   title="concept-encoding-confidence">confidence</span>
+   <i>tentative</i>, and abort these steps.</p></li> <!-- not
+   carefully tested -->
+
    <li><p>Otherwise, if the user agent has information on the likely
    encoding for this page, e.g. based on the encoding of the page when
    it was last visited, then return that encoding, with the <span