Changeset 74186 in webkit


Ignore:
Timestamp:
Dec 16, 2010 6:31:32 AM (13 years ago)
Author:
xan@webkit.org
Message:

2010-12-16 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r74162.
​http://trac.webkit.org/changeset/74162
​https://bugs.webkit.org/show_bug.cgi?id=51185

More breakage in GTK+ (Requested by xan_ on #webkit).

  • fast/encoding/char-decoding-expected.txt:
  • fast/encoding/char-decoding.html:
  • fast/encoding/resources/char-decoding-utils.js: (decode):

2010-12-16 Sheriff Bot <​webkit.review.bot@gmail.com>

Unreviewed, rolling out r74162.
​http://trac.webkit.org/changeset/74162
​https://bugs.webkit.org/show_bug.cgi?id=51185

More breakage in GTK+ (Requested by xan_ on #webkit).

  • platform/text/TextCodecUTF16.cpp: (WebCore::TextCodecUTF16::registerEncodingNames):
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r74185 r74186  
     12010-12-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74162.
     4        http://trac.webkit.org/changeset/74162
     5        https://bugs.webkit.org/show_bug.cgi?id=51185
     6
     7        More breakage in GTK+ (Requested by xan_ on #webkit).
     8
     9        * fast/encoding/char-decoding-expected.txt:
     10        * fast/encoding/char-decoding.html:
     11        * fast/encoding/resources/char-decoding-utils.js:
     12        (decode):
     13
    1142010-12-16  Alexander Pavlov  <apavlov@chromium.org>
    215

  • trunk/LayoutTests/fast/encoding/char-decoding-expected.txt

    r74162 r74186  
    156156PASS decode('dos-874', '%A1') is 'U+0E01'
    157157PASS decode('dos-874', '%DB') is 'U+F8C1'
    158 PASS decode('UTF-7', '+AD4') is 'U+002B/U+0041/U+0044/U+0034'
    159 PASS decode('utf-7', '+AD4') is 'U+002B/U+0041/U+0044/U+0034'
    160 PASS decode('UTF-16BE', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    161 PASS decode('UTF-16', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    162 PASS decode('ISO-10646-UCS-2', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    163 PASS decode('UCS-2', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    164 PASS decode('Unicode', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    165 PASS decode('csUnicode', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    166 PASS decode('unicodeFFFE', '%D8%69%DE%D6') is 'U+D869/U+DED6'
    167 PASS decode('UTF-16LE', '%69%D8%D6%DE') is 'U+D869/U+DED6'
    168 PASS decode('unicodeFEFF', '%69%D8%D6%DE') is 'U+D869/U+DED6'
     158PASS decode('UTF-7', '+AD4') is 'U+002B'
     159PASS decode('utf-7', '+AD4') is 'U+002B'
    169160PASS successfullyParsed is true
    170161

  • trunk/LayoutTests/fast/encoding/char-decoding.html

    r74162 r74186  
    9090// UTF-7 is expressly forbidden, so decoding it should not work correctly.
    9191// This attempts to decode '<' as UTF-7 (+AD4) but it ends up being decoded
    92 // as a '+AD4'.
    93 testDecode('UTF-7', '+AD4', 'U+002B/U+0041/U+0044/U+0034');
    94 testDecode('utf-7', '+AD4', 'U+002B/U+0041/U+0044/U+0034');
    95 
    96 // UTF-16 and variants.
    97 testDecode('UTF-16BE', '%D8%69%DE%D6', 'U+D869/U+DED6');
    98 testDecode('UTF-16', '%D8%69%DE%D6', 'U+D869/U+DED6');
    99 testDecode('ISO-10646-UCS-2', '%D8%69%DE%D6', 'U+D869/U+DED6');
    100 testDecode('UCS-2', '%D8%69%DE%D6', 'U+D869/U+DED6');
    101 testDecode('Unicode', '%D8%69%DE%D6', 'U+D869/U+DED6');
    102 testDecode('csUnicode', '%D8%69%DE%D6', 'U+D869/U+DED6');
    103 testDecode('unicodeFFFE', '%D8%69%DE%D6', 'U+D869/U+DED6');
    104 testDecode('UTF-16LE', '%69%D8%D6%DE', 'U+D869/U+DED6');
    105 testDecode('unicodeFEFF', '%69%D8%D6%DE', 'U+D869/U+DED6');
     92// as a '+'.
     93testDecode('UTF-7', '+AD4', 'U+002B');
     94testDecode('utf-7', '+AD4', 'U+002B');
    10695
    10796successfullyParsed = true;

  • trunk/LayoutTests/fast/encoding/resources/char-decoding-utils.js

    r74162 r74186  
    1010}
    1111
    12 function decodeText(charsetName, characterSequence)
     12function decode(charsetName, characterSequence)
    1313{
    1414    var req = new XMLHttpRequest;
    … …  
    1616    req.overrideMimeType('text/plain; charset="' + charsetName + '"');
    1717    req.send('');
    18     return req.responseText;
    19 }
    20 
    21 function decode(charsetName, characterSequence)
    22 {
    23     var decodedText = decodeText(charsetName, characterSequence);
    24     var result = "";
    25     for (var i = 0; i < decodedText.length; ++i) {
    26         var code = hex(decodedText.charCodeAt(i));
    27         if (i)
    28             result += "/";
    29         result += "U+" + ("0000" + code).substr(code.length, 4);
    30     }
    31     return result;
     18    var code = hex(req.responseText.charCodeAt(0));
     19    return "U+" + ("0000" + code).substr(code.length, 4);
    3220}
    3321

  • trunk/WebCore/ChangeLog

    r74185 r74186  
     12010-12-16  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74162.
     4        http://trac.webkit.org/changeset/74162
     5        https://bugs.webkit.org/show_bug.cgi?id=51185
     6
     7        More breakage in GTK+ (Requested by xan_ on #webkit).
     8
     9        * platform/text/TextCodecUTF16.cpp:
     10        (WebCore::TextCodecUTF16::registerEncodingNames):
     11
    1122010-12-16  Alexander Pavlov  <apavlov@chromium.org>
    213

  • trunk/WebCore/platform/text/TextCodecUTF16.cpp

    r74162 r74186  
    4141    registrar("UTF-16BE", "UTF-16BE");
    4242
    43     registrar("ISO-10646-UCS-2", "UTF-16BE");
    44     registrar("UCS-2", "UTF-16BE");
    45     registrar("UTF-16", "UTF-16BE");
    46     registrar("Unicode", "UTF-16BE");
    47     registrar("csUnicode", "UTF-16BE");
     43    registrar("ISO-10646-UCS-2", "UTF-16LE");
     44    registrar("UCS-2", "UTF-16LE");
     45    registrar("UTF-16", "UTF-16LE");
     46    registrar("Unicode", "UTF-16LE");
     47    registrar("csUnicode", "UTF-16LE");
     48    registrar("unicodeFEFF", "UTF-16LE");
    4849
    49     registrar("unicodeFEFF", "UTF-16LE");
    5050    registrar("unicodeFFFE", "UTF-16BE");
    5151}
Note: See TracChangeset for help on using the changeset viewer.