[giow] (2) Allow UAs to provide encoding override UI.

git-svn-id: http://svn.whatwg.org/webapps@5270 340c8d12-0b0e-0410-8428-c7bf67bfef74
whatwg · Aug 10, 2010 · b425a89 · b425a89
1 parent f2e7c6a
commit b425a89
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/complete.html b/complete.html
@@ -78197,7 +78197,12 @@ <h5 id=determining-the-character-encoding><span class=secno>12.2.2.1 </span>Dete
   all, then the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <ol><li><p>If the transport layer specifies an encoding, and it is
+  <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>
+
+   <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>
    <i>certain</i>, and abort these steps.</li>
 

diff --git a/index b/index
@@ -71307,7 +71307,12 @@ interface <dfn id=messageport>MessagePort</dfn> {
   all, then the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> is
   <i>irrelevant</i>.</p>
 
-  <ol><li><p>If the transport layer specifies an encoding, and it is
+  <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>
+
+   <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>
    <i>certain</i>, and abort these steps.</li>
 

diff --git a/source b/source
@@ -89208,6 +89208,12 @@ interface <dfn>SQLTransactionSync</dfn> {
 
   <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 transport layer specifies an encoding, and it is
    supported, return that encoding with the <span
    title="concept-encoding-confidence">confidence</span>