Bug 1120813 - Add support for the MS932 label of Shift_JIS. r=emk, r=Ms2ger
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Mon, 29 Feb 2016 20:53:50 +0200
changeset 322476 d686bf9e479fef8b98decc57b28a50dbf65321b9
parent 322475 6866466b1d718cfe4d1305916336d8e133fc19b8
child 322477 7d0c95cfa2e04d4e4994a550dde885f46f91ab7c
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemk, Ms2ger
bugs1120813
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1120813 - Add support for the MS932 label of Shift_JIS. r=emk, r=Ms2ger
dom/encoding/labelsencodings.properties
dom/encoding/test/test_TextDecoder.js
testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
testing/web-platform/tests/encoding/resources/encodings.js
--- a/dom/encoding/labelsencodings.properties
+++ b/dom/encoding/labelsencodings.properties
@@ -194,16 +194,17 @@ cn-big5=Big5
 csbig5=Big5
 x-x-big5=Big5
 cseucpkdfmtjapanese=EUC-JP
 euc-jp=EUC-JP
 x-euc-jp=EUC-JP
 csiso2022jp=ISO-2022-JP
 iso-2022-jp=ISO-2022-JP
 csshiftjis=Shift_JIS
+ms932=Shift_JIS
 ms_kanji=Shift_JIS
 shift-jis=Shift_JIS
 shift_jis=Shift_JIS
 sjis=Shift_JIS
 windows-31j=Shift_JIS
 x-sjis=Shift_JIS
 cseuckr=EUC-KR
 csksc56011987=EUC-KR
--- a/dom/encoding/test/test_TextDecoder.js
+++ b/dom/encoding/test/test_TextDecoder.js
@@ -354,17 +354,17 @@ function testDecoderGetEncoding()
     {encoding: "windows-1257", labels: ["cp1257", "windows-1257", "x-cp1257"]},
     {encoding: "windows-1258", labels: ["cp1258", "windows-1258", "x-cp1258"]},
     {encoding: "x-mac-cyrillic", labels: ["x-mac-cyrillic", "x-mac-ukrainian"]},
     {encoding: "gbk", labels: ["chinese", "csgb2312", "csiso58gb231280", "gb2312", "gb_2312", "gb_2312-80", "gbk", "iso-ir-58", "x-gbk"]},
     {encoding: "gb18030", labels: ["gb18030"]},
     {encoding: "big5", labels: ["big5", "cn-big5", "csbig5", "x-x-big5", "big5-hkscs"]},
     {encoding: "euc-jp", labels: ["cseucpkdfmtjapanese", "euc-jp", "x-euc-jp"]},
     {encoding: "iso-2022-jp", labels: ["csiso2022jp", "iso-2022-jp"]},
-    {encoding: "shift_jis", labels: ["csshiftjis", "ms_kanji", "shift-jis", "shift_jis", "sjis", "windows-31j", "x-sjis"]},
+    {encoding: "shift_jis", labels: ["csshiftjis", "ms932", "ms_kanji", "shift-jis", "shift_jis", "sjis", "windows-31j", "x-sjis"]},
     {encoding: "euc-kr", labels: ["cseuckr", "csksc56011987", "euc-kr", "iso-ir-149", "korean", "ks_c_5601-1987", "ks_c_5601-1989", "ksc5601", "ksc_5601", "windows-949"]},
     {encoding: "utf-16le", labels: ["utf-16", "utf-16le"]},
     {encoding: "utf-16be", labels: ["utf-16be"]},
     {encoding: "x-user-defined", labels: ["x-user-defined"]},
     {error: "RangeError", labels: ["x-windows-949", "\u0130SO-8859-1", "csiso2022kr", "iso-2022-kr", "iso-2022-cn", "iso-2022-cn-ext", "replacement", "hz-gb-2312"]},
   ];
 
   for (var le of labelEncodings) {
--- a/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
+++ b/testing/web-platform/tests/dom/nodes/Document-characterSet-normalization.html
@@ -277,16 +277,17 @@ var encodingMap = {
     "x-euc-jp",
   ],
   "iso-2022-jp": [
     "csiso2022jp",
     "iso-2022-jp",
   ],
   "shift_jis": [
     "csshiftjis",
+    "ms932",
     "ms_kanji",
     "shift-jis",
     "shift_jis",
     "sjis",
     "windows-31j",
     "x-sjis",
   ],
   "euc-kr": [
--- a/testing/web-platform/tests/encoding/resources/encodings.js
+++ b/testing/web-platform/tests/encoding/resources/encodings.js
@@ -414,16 +414,17 @@ var encodings_table =
           "csiso2022jp",
           "iso-2022-jp"
         ],
         "name": "iso-2022-jp"
       },
       {
         "labels": [
           "csshiftjis",
+          "ms932",
           "ms_kanji",
           "shift-jis",
           "shift_jis",
           "sjis",
           "windows-31j",
           "x-sjis"
         ],
         "name": "shift_jis"