Bug 964225 addendum - Adjust gfx to use Encoding Standard encoding names when decoding the names of legacy Chinese Mac fonts. r=emk.
authorHenri Sivonen <hsivonen@hsivonen.fi>
Mon, 29 Sep 2014 15:05:15 +0300
changeset 207679 529d26ff3f59ee3083a92f772bc2cebaee6dc2d4
parent 207678 e538372b2413da7eb1036543c832933cd699c5d4
child 207680 3c98330df76f138b27dad5d0621d1993345b6766
push id27564
push userryanvm@gmail.com
push dateMon, 29 Sep 2014 18:57:04 +0000
treeherdermozilla-central@ce9a0b34225e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemk
bugs964225
milestone35.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 964225 addendum - Adjust gfx to use Encoding Standard encoding names when decoding the names of legacy Chinese Mac fonts. r=emk.
gfx/thebes/gfxFontUtils.cpp
--- a/gfx/thebes/gfxFontUtils.cpp
+++ b/gfx/thebes/gfxFontUtils.cpp
@@ -1303,18 +1303,18 @@ const gfxFontUtils::MacFontNameCharsetMa
     { ENCODING_ID_MAC_ARABIC,       ANY,                      "x-mac-arabic"    },
     { ENCODING_ID_MAC_HEBREW,       LANG_ID_MAC_HEBREW,       "x-mac-hebrew"    },
     { ENCODING_ID_MAC_HEBREW,       ANY,                      "x-mac-hebrew"    },
     { ENCODING_ID_MAC_GREEK,        ANY,                      "x-mac-greek"     },
     { ENCODING_ID_MAC_CYRILLIC,     ANY,                      "x-mac-cyrillic"  },
     { ENCODING_ID_MAC_DEVANAGARI,   ANY,                      "x-mac-devanagari"},
     { ENCODING_ID_MAC_GURMUKHI,     ANY,                      "x-mac-gurmukhi"  },
     { ENCODING_ID_MAC_GUJARATI,     ANY,                      "x-mac-gujarati"  },
-    { ENCODING_ID_MAC_SIMP_CHINESE, LANG_ID_MAC_SIMP_CHINESE, "GB2312"          },
-    { ENCODING_ID_MAC_SIMP_CHINESE, ANY,                      "GB2312"          }
+    { ENCODING_ID_MAC_SIMP_CHINESE, LANG_ID_MAC_SIMP_CHINESE, "gb18030"         },
+    { ENCODING_ID_MAC_SIMP_CHINESE, ANY,                      "gb18030"         }
 };
 
 const char* gfxFontUtils::gISOFontNameCharsets[] = 
 {
     /* 0 */ "windows-1252", /* US-ASCII */
     /* 1 */ nullptr       , /* spec says "ISO 10646" but does not specify encoding form! */
     /* 2 */ "windows-1252"  /* ISO-8859-1 */
 };