Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Regression: do not use "get an output encoding" for decoding #1118

Merged
merged 1 commit into from
Apr 25, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions source
Original file line number Diff line number Diff line change
Expand Up @@ -100113,10 +100113,10 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {

<!-- the next two steps are redundant with steps in the 'change the encoding' algorithm -->

<li><p>Set <var>charset</var> to the result of <span data-x="get an output encoding">getting
an output encoding</span> from <var>charset</var>.</p></li>
<li><p>If <var>charset</var> is a <span>UTF-16 encoding</span>, then set <var>charset</var>
to <span>UTF-8</span>.

<li><p>If <var>charset</var> is <span>x-user-defined</span>, set <var>charset</var> to
<li><p>If <var>charset</var> is <span>x-user-defined</span>, then set <var>charset</var> to
<span>windows-1252</span>.</p></li>

<li><p>Abort the <span>prescan a byte stream to determine its encoding</span> algorithm,
Expand Down Expand Up @@ -100378,10 +100378,10 @@ dictionary <dfn>StorageEventInit</dfn> : <span>EventInit</span> {
<!-- the next two steps are redundant with similar logic in the sniffer -->
<!-- if you add anything else here, then factor it out into a common algorithm -->

<li><p>Set the new encoding to the result of <span data-x="get an output encoding">getting an
output encoding</span> from the new encoding.</p></li>
<li><p>If the new encoding is a <span>UTF-16 encoding</span>, then change it to
<span>UTF-8</span>.</p></li>

<li><p>If the new encoding is <span>x-user-defined</span>, change it to
<li><p>If the new encoding is <span>x-user-defined</span>, then change it to
<span>windows-1252</span>.</p></li> <!-- apparently this was a Chrome invention, later picked up
by Mozilla -->

Expand Down