[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit a1da23e522cc55e442e25f5413ae1e83cd70d4f6
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 25 06:32:11 2010 +0000

    2010-02-24  Jungshik Shin  <jshin at chromium.org>
    
            Reviewed by David Levin.
    
            [Chromium] Traditional Chinese Chrome on Windows should use PMingLiu instead of Simsun for Han characters
            https://bugs.webkit.org/show_bug.cgi?id=35319
    
            No visible change in the layout test.
    
            * platform/graphics/chromium/FontUtilsChromiumWin.cpp:
            (WebCore::):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55223 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3f3fbf6..f4e2747 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-02-24  Jungshik Shin  <jshin at chromium.org>
+
+        Reviewed by David Levin.
+
+        [Chromium] Traditional Chinese Chrome on Windows should use PMingLiu instead of Simsun for Han characters
+        https://bugs.webkit.org/show_bug.cgi?id=35319
+
+        No visible change in the layout test.
+
+        * platform/graphics/chromium/FontUtilsChromiumWin.cpp:
+        (WebCore::):
+
 2010-02-24  Anthony Ricaud  <rik at webkit.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp b/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
index 4e2a226..324262b 100644
--- a/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
+++ b/WebCore/platform/graphics/chromium/FontUtilsChromiumWin.cpp
@@ -60,6 +60,7 @@ void initializeScriptFontMap(ScriptToFontMap& scriptFontMap)
         {USCRIPT_GREEK, L"times new roman"},
         {USCRIPT_CYRILLIC, L"times new roman"},
         {USCRIPT_SIMPLIFIED_HAN, L"simsun"},
+        {USCRIPT_TRADITIONAL_HAN, L"pmingliu"},
         {USCRIPT_HIRAGANA, L"ms pgothic"},
         {USCRIPT_KATAKANA, L"ms pgothic"},
         {USCRIPT_KATAKANA_OR_HIRAGANA, L"ms pgothic"},
@@ -106,14 +107,10 @@ void initializeScriptFontMap(ScriptToFontMap& scriptFontMap)
         localeFamily = scriptFontMap[USCRIPT_HIRAGANA];
     else if (locale == icu::Locale::getKorean())
         localeFamily = scriptFontMap[USCRIPT_HANGUL];
+    else if (locale == icu::Locale::getTraditionalChinese())
+        localeFamily = scriptFontMap[USCRIPT_TRADITIONAL_HAN];
     else {
-        // Use Simplified Chinese font for all other locales including
-        // Traditional Chinese because Simsun (SC font) has a wider
-        // coverage (covering both SC and TC) than PMingLiu (TC font).
-        // Note that |fontMap| does not have a separate entry for
-        // USCRIPT_TRADITIONAL_HAN for that reason.
-        // This also speeds up the TC version of Chrome when rendering SC
-        // pages.
+        // For other locales, use the simplified Chinese font for Han.
         localeFamily = scriptFontMap[USCRIPT_SIMPLIFIED_HAN];
     }
     if (localeFamily)

-- 
WebKit Debian packaging