#62777

r=mkaply, a=blizzard
1255 and 1256 are not supported on OS/2 - use 862 and 864 instead

gfx/src/os2/nsFontMetricsOS2.cpp

@@ -111,12 +111,11 @@ static nsCharSetInfo gCharSetInfo[eCharSet_COUNT] =
   { "RUSSIAN",     FM_DEFN_CYRILLIC, 1251, "x-cyrillic" },
   { "GREEK",       FM_DEFN_GREEK,    813, "el" },
   { "TURKISH",     0,                1254, "tr" },
-  { "HEBREW",      FM_DEFN_HEBREW,   1255, "he" },
-  { "ARABIC",      FM_DEFN_ARABIC,   1256, "ar" },
+  { "HEBREW",      FM_DEFN_HEBREW,   862, "he" },
+  { "ARABIC",      FM_DEFN_ARABIC,   864, "ar" },
   { "BALTIC",      0,                1257, "x-baltic" },
   { "THAI",        FM_DEFN_THAI,     874,  "th" },
   { "SHIFTJIS",    FM_DEFN_KANA,     932,  "ja" },
-//  { "GB2312",      FM_DEFN_KANA,     936,  "zh-CN" },
   { "GB2312",      FM_DEFN_KANA,     1381, "zh-CN" },
   { "HANGEUL",     FM_DEFN_KANA,     949,  "ko" },
   { "CHINESEBIG5", FM_DEFN_KANA,     950,  "zh-TW" },

gfx/src/os2/nsGfxDefs.h

@@ -87,8 +87,8 @@ static nsUconvInfo gUconvInfo[15  /* eCharSet_COUNT from nsFontMetricsOS2.cpp */
   { "RUSSIAN",     1251, NULL },
   { "GREEK",       1253, NULL },
   { "TURKISH",     1254, NULL },
-  { "HEBREW",      1255, NULL },
-  { "ARABIC",      1256, NULL },
+  { "HEBREW",      862,  NULL },
+  { "ARABIC",      864,  NULL },
   { "BALTIC",      1257, NULL },
   { "THAI",        874,  NULL },
   { "SHIFTJIS",    932,  NULL },