Skip to content

Commit

Permalink
[e] (0) Fix lack of consistency of naming of confidence flags. (bug 6…
Browse files Browse the repository at this point in the history
…423) (credit: hs)

git-svn-id: http://svn.whatwg.org/webapps@3122 340c8d12-0b0e-0410-8428-c7bf67bfef74
  • Loading branch information
Hixie committed May 24, 2009
1 parent de216ed commit a78a4c3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions index
Original file line number Diff line number Diff line change
Expand Up @@ -59012,7 +59012,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
<dfn id=concept-encoding-confidence title=concept-encoding-confidence>confidence</dfn>. The
confidence is either <i>tentative</i>, <i>certain</i>, or
<i>irrelevant</i>. The encoding used, and whether the confidence in
that encoding is <i>tentative</i> or <i>confident</i>, is <a href=#meta-charset-during-parse>used during the parsing</a> to
that encoding is <i>tentative</i> or <i>certain</i>, is <a href=#meta-charset-during-parse>used during the parsing</a> to
determine whether to <a href=#change-the-encoding>change the encoding</a>. If no
encoding is necessary, e.g. because the parser is operating on a
stream of Unicode characters and doesn't have to use an encoding at
Expand Down Expand Up @@ -59453,7 +59453,7 @@ interface <dfn id=messageport>MessagePort</dfn> {
<li>If the new encoding is identical or equivalent to the encoding
that is already being used to interpret the input stream, then set
the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
<i>confident</i> and abort these steps. This happens when the
<i>certain</i> and abort these steps. This happens when the
encoding information found in the file matches what the
<a href=#encoding-sniffing-algorithm>encoding sniffing algorithm</a> determined to be the
encoding, and in the second pass through the parser if the first
Expand All @@ -59467,21 +59467,21 @@ interface <dfn id=messageport>MessagePort</dfn> {
to the new converter for the encoding on the fly. Set the
<a href="#document's-character-encoding">document's character encoding</a> and the encoding used to
convert the input stream to the new encoding, set the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
<i>confident</i>, and abort these steps.</li>
<i>certain</i>, and abort these steps.</li>

<li>Otherwise, <a href=#navigate>navigate</a> to the document again, with
<a href=#replacement-enabled>replacement enabled</a>, and using the same <a href=#source-browsing-context>source
browsing context</a>, but this time skip the <a href=#encoding-sniffing-algorithm>encoding
sniffing algorithm</a> and instead just set the encoding to the
new encoding and the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
<i>confident</i>. Whenever possible, this should be done without
<i>certain</i>. Whenever possible, this should be done without
actually contacting the network layer (the bytes should be
re-parsed from memory), even if, e.g., the document is marked as
not being cacheable. If this is not possible and contacting the
network layer would involve repeating a request that uses a method
other than HTTP GET (<a href=#concept-http-equivalent-get title=concept-http-equivalent-get>or
equivalent</a> for non-HTTP URLs), then instead set the <a href=#concept-encoding-confidence title=concept-encoding-confidence>confidence</a> to
<i>confident</i> and ignore the new encoding. The resource will be
<i>certain</i> and ignore the new encoding. The resource will be
misinterpreted. User agents may notify the user of the situation,
to aid in application development.</li>

Expand Down
10 changes: 5 additions & 5 deletions source
Original file line number Diff line number Diff line change
Expand Up @@ -72463,7 +72463,7 @@ interface <dfn>MessagePort</dfn> {
<dfn title="concept-encoding-confidence">confidence</dfn>. The
confidence is either <i>tentative</i>, <i>certain</i>, or
<i>irrelevant</i>. The encoding used, and whether the confidence in
that encoding is <i>tentative</i> or <i>confident</i>, is <a
that encoding is <i>tentative</i> or <i>certain</i>, is <a
href="#meta-charset-during-parse">used during the parsing</a> to
determine whether to <span>change the encoding</span>. If no
encoding is necessary, e.g. because the parser is operating on a
Expand Down Expand Up @@ -72990,7 +72990,7 @@ interface <dfn>MessagePort</dfn> {
<li>If the new encoding is identical or equivalent to the encoding
that is already being used to interpret the input stream, then set
the <span title="concept-encoding-confidence">confidence</span> to
<i>confident</i> and abort these steps. This happens when the
<i>certain</i> and abort these steps. This happens when the
encoding information found in the file matches what the
<span>encoding sniffing algorithm</span> determined to be the
encoding, and in the second pass through the parser if the first
Expand All @@ -73005,23 +73005,23 @@ interface <dfn>MessagePort</dfn> {
<span>document's character encoding</span> and the encoding used to
convert the input stream to the new encoding, set the <span
title="concept-encoding-confidence">confidence</span> to
<i>confident</i>, and abort these steps.</li>
<i>certain</i>, and abort these steps.</li>

<li>Otherwise, <span>navigate</span> to the document again, with
<span>replacement enabled</span>, and using the same <span>source
browsing context</span>, but this time skip the <span>encoding
sniffing algorithm</span> and instead just set the encoding to the
new encoding and the <span
title="concept-encoding-confidence">confidence</span> to
<i>confident</i>. Whenever possible, this should be done without
<i>certain</i>. Whenever possible, this should be done without
actually contacting the network layer (the bytes should be
re-parsed from memory), even if, e.g., the document is marked as
not being cacheable. If this is not possible and contacting the
network layer would involve repeating a request that uses a method
other than HTTP GET (<span title="concept-http-equivalent-get">or
equivalent</span> for non-HTTP URLs), then instead set the <span
title="concept-encoding-confidence">confidence</span> to
<i>confident</i> and ignore the new encoding. The resource will be
<i>certain</i> and ignore the new encoding. The resource will be
misinterpreted. User agents may notify the user of the situation,
to aid in application development.</li>

Expand Down

0 comments on commit a78a4c3

Please sign in to comment.