Changeset 60953 in webkit

Timestamp:

Jun 10, 2010 6:31:06 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-10 Jungshik Shin <​jshin@chromium.org>

Reviewed by Kent Tamura

Bug 38224 - [chromium] Enable rendering of Ethiopic, Lao, Tibetan

and a few other scripts on Win XP

​https://bugs.webkit.org/show_bug.cgi?id=38224

Make it possible to specify a list of fonts for per-script
fallback instead of a single font per script. This is
necessary for Malayalam (for which Windows font doesn't
support Unicode 5.x fully on Vista or earlier), Ethiopic
(we want to support on XP with a 3rd party font because XP
doesn't have any Ethiopic font out of the box) and some other
scripts. This is a short-term 'fix' until we have per-script
font preferences.

No layout test is added because the test results would be
dependent on which fonts are present.

• platform/graphics/chromium/FontUtilsChromiumWin.cpp: (WebCore::): (WebCore::FontMap::ScriptToFontFamilies::):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontUtilsChromiumWin.cpp (modified) (6 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-10  Jungshik Shin  <jshin@chromium.org>
+
+        Reviewed by Kent Tamura
+
+        Bug 38224 - [chromium] Enable rendering of Ethiopic, Lao, Tibetan 
+                    and a few other scripts on Win XP
+
+        https://bugs.webkit.org/show_bug.cgi?id=38224
+
+        Make it possible to specify a list of fonts for per-script
+        fallback instead of a single font per script. This is
+        necessary for Malayalam (for which Windows font doesn't
+        support Unicode 5.x fully on Vista or earlier), Ethiopic 
+        (we want to support on XP with a 3rd party font because XP
+        doesn't have any Ethiopic font out of the box) and some other
+        scripts. This is a short-term 'fix' until we have per-script
+        font preferences.
+
+        No layout test is added because the test results would be
+        dependent on which fonts are present. 
+
+        * platform/graphics/chromium/FontUtilsChromiumWin.cpp:
+        (WebCore::):
+        (WebCore::FontMap::ScriptToFontFamilies::):
+
 2010-06-09  Andrei Popescu  <andreip@google.com>
 

trunk/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp

@@ -1 +1 @@
 /*
- * Copyright (c) 2006, 2007, 2008, Google Inc. All rights reserved.
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010, Google Inc. All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -45 +45 @@
 namespace {
 
+bool isFontPresent(const UChar* fontName)
+{
+    HFONT hfont = CreateFont(12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                             fontName);
+    if (!hfont)
+        return false;
+    HDC dc = GetDC(0);
+    HGDIOBJ oldFont = static_cast<HFONT>(SelectObject(dc, hfont));
+    WCHAR actualFontName[LF_FACESIZE];
+    GetTextFace(dc, LF_FACESIZE, actualFontName);
+    actualFontName[LF_FACESIZE - 1] = 0;
+    SelectObject(dc, oldFont);
+    DeleteObject(hfont);
+    ReleaseDC(0, dc);
+    // We don't have to worry about East Asian fonts with locale-dependent
+    // names here for now.
+    return !wcscmp(fontName, actualFontName);
+}
+
 // A simple mapping from UScriptCode to family name.  This is a sparse array,
 // which works well since the range of UScriptCode values is small.
@@ -56 +75 @@
     };
 
-    const static FontMap fontMap[] = {
+    static const FontMap fontMap[] = {
         {USCRIPT_LATIN, L"times new roman"},
         {USCRIPT_GREEK, L"times new roman"},
         {USCRIPT_CYRILLIC, L"times new roman"},
+        // FIXME: Consider trying new Vista fonts before XP fonts for CJK.
+        // Some Vista users do want to use Vista cleartype CJK fonts. If we
+        // did, the results of tests with CJK characters would have to be
+        // regenerated for Vista.
         {USCRIPT_SIMPLIFIED_HAN, L"simsun"},
         {USCRIPT_TRADITIONAL_HAN, L"pmingliu"},
@@ -73 +96 @@
         {USCRIPT_GURMUKHI, L"raavi"},
         {USCRIPT_GUJARATI, L"shruti"},
-        {USCRIPT_ORIYA, L"kalinga"},
         {USCRIPT_TAMIL, L"latha"},
         {USCRIPT_TELUGU, L"gautami"},
         {USCRIPT_KANNADA, L"tunga"},
-        {USCRIPT_MALAYALAM, L"kartika"},
-        {USCRIPT_LAO, L"dokchampa"},
-        {USCRIPT_TIBETAN, L"microsoft himalaya"},
         {USCRIPT_GEORGIAN, L"sylfaen"},
         {USCRIPT_ARMENIAN, L"sylfaen"},
-        {USCRIPT_ETHIOPIC, L"nyala"},
+        {USCRIPT_THAANA, L"mv boli"},
         {USCRIPT_CANADIAN_ABORIGINAL, L"euphemia"},
         {USCRIPT_CHEROKEE, L"plantagenet cherokee"},
-        {USCRIPT_YI, L"microsoft yi balti"},
-        {USCRIPT_SINHALA, L"iskoola pota"},
-        {USCRIPT_SYRIAC, L"estrangelo edessa"},
-        {USCRIPT_KHMER, L"daunpenh"},
-        {USCRIPT_THAANA, L"mv boli"},
         {USCRIPT_MONGOLIAN, L"mongolian balti"},
-        {USCRIPT_MYANMAR, L"padauk"},
         // For USCRIPT_COMMON, we map blocks to scripts when
         // that makes sense.
     };
-    
+
+    struct ScriptToFontFamilies {
+        UScriptCode script;
+        const UChar** families;
+    };
+
+    // Kartika on Vista or earlier lacks the support for Chillu 
+    // letters added to Unicode 5.1.
+    // Try AnjaliOldLipi (a very widely used Malaylalam font with the full
+    // Unicode 5.x support) before falling back to Kartika.
+    static const UChar* malayalamFonts[] = {L"AnjaliOldLipi", L"Lohit Malayalam", L"Kartika", L"Rachana", 0};
+    // Try Khmer OS before Vista fonts because 'Khmer OS' goes along better
+    // with Latin and looks better/larger for the same size.
+    static const UChar* khmerFonts[] = {L"Khmer OS", L"MoolBoran", L"DaunPenh", L"Code2000", 0};
+    // For the following 6 scripts, two or fonts are listed. The fonts in 
+    // the 1st slot are not available on Windows XP. To support these
+    // scripts on XP, listed in the rest of slots are widely used
+    // fonts.
+    static const UChar* ethiopicFonts[] = {L"Nyala", L"Abyssinica SIL", L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode", 0};
+    static const UChar* oriyaFonts[] = {L"Kalinga", L"ori1Uni", L"Lohit Oriya", 0};
+    static const UChar* laoFonts[] = {L"DokChampa", L"Saysettha OT", L"Phetsarath OT", L"Code2000", 0};
+    static const UChar* tibetanFonts[] = {L"Microsoft Himalaya", L"Jomolhari", L"Tibetan Machine Uni", 0};
+    static const UChar* sinhalaFonts[] = {L"Iskoola Pota", L"AksharUnicode", 0};
+    static const UChar* yiFonts[] = {L"Microsoft Yi Balti", L"Nuosu SIL", L"Code2000", 0};
+    // http://www.bethmardutho.org/support/meltho/download/index.php
+    static const UChar* syriacFonts[] = {L"Estrangelo Edessa", L"Estrangelo Nisibin", L"Code2000", 0};
+    // No Myanmar/Burmese font is shipped with Windows, yet. Try a few
+    // widely available/used ones that supports Unicode 5.1 or later. 
+    static const UChar* myanmarFonts[] = {L"Padauk", L"Parabaik", L"Myanmar3", L"Code2000", 0};
+
+    static const ScriptToFontFamilies scriptToFontFamilies[] = {
+        {USCRIPT_MALAYALAM, malayalamFonts},
+        {USCRIPT_KHMER, khmerFonts},
+        {USCRIPT_ETHIOPIC, ethiopicFonts},
+        {USCRIPT_ORIYA, oriyaFonts},
+        {USCRIPT_LAO, laoFonts},
+        {USCRIPT_TIBETAN, tibetanFonts},
+        {USCRIPT_SINHALA, sinhalaFonts},
+        {USCRIPT_YI, yiFonts},
+        {USCRIPT_SYRIAC, syriacFonts},
+        {USCRIPT_MYANMAR, myanmarFonts},
+    };
+
     for (int i = 0; i < sizeof(fontMap) / sizeof(fontMap[0]); ++i)
         scriptFontMap[fontMap[i].script] = fontMap[i].family;
+
+    // FIXME: Instead of scanning the hard-coded list, we have to 
+    // use EnumFont* to 'inspect' fonts to pick up fonts covering scripts
+    // when it's possible (e.g. using OS/2 table). If we do that, this 
+    // had better be pulled out of here.
+    for (int i = 0; i < sizeof(scriptToFontFamilies) / sizeof(scriptToFontFamilies[0]); ++i) {
+        UScriptCode script = scriptToFontFamilies[i].script;
+        scriptFontMap[script] = 0;
+        const UChar** familyPtr = scriptToFontFamilies[i].families;
+        while (*familyPtr) {
+            if (isFontPresent(*familyPtr)) {
+                scriptFontMap[script] = *familyPtr;
+                break;
+            }
+            ++familyPtr;
+        }
+    }
 
     // Initialize the locale-dependent mapping.
@@ -199 +271 @@
 typedef HashMap<String, FontData> FontDataCache;
 
-}  // namespace
+} // namespace
 
 // FIXME: this is font fallback code version 0.1
@@ -364 +436 @@
 }
 
-}  // namespace WebCore
+} // namespace WebCore