HTML5 Tracker

Diff (omit for latest revision)
Filter

Short URL: http://html5.org/r/7324

SVNBugCommentTime (UTC)
7324[Gecko] [Internet Explorer] [Opera] [Webkit] Attempt to slightly more closely align with reality.2012-09-07 04:02
Index: source
===================================================================
--- source	(revision 7323)
+++ source	(revision 7324)
@@ -102306,12 +102306,20 @@
 
   <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
    title="concept-encoding-confidence">confidence</span>
@@ -102401,6 +102409,15 @@
 
    </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

|