summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-08 19:48:08 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-08 19:48:08 +0000
commit942dd7327db269b13d8f1e3155f13165af723395 (patch)
tree2daa2dce8891dad20850daa429e55e71866cb0cc /webkit
parentc6e66b5f5dbba15f0ba19c7773a3105646a02159 (diff)
downloadchromium_src-942dd7327db269b13d8f1e3155f13165af723395.zip
chromium_src-942dd7327db269b13d8f1e3155f13165af723395.tar.gz
chromium_src-942dd7327db269b13d8f1e3155f13165af723395.tar.bz2
Lowercase 'Arial Unicode MS' to avoid caching it twice in intl test.
BUG=1241039,1314945,971960,1314940 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/platform/graphics/FontCacheWin.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/webkit/port/platform/graphics/FontCacheWin.cpp b/webkit/port/platform/graphics/FontCacheWin.cpp
index 24b5b8a..480dbd9 100644
--- a/webkit/port/platform/graphics/FontCacheWin.cpp
+++ b/webkit/port/platform/graphics/FontCacheWin.cpp
@@ -293,6 +293,8 @@ static bool fontContainsCharacter(const FontPlatformData* font_data,
i++;
}
cmap->freeze();
+ // We don't lowercase |family| because all of them are under our control
+ // and they're already lowercased.
fontCmapCache->set(family, cmap);
return cmap->contains(character);
}
@@ -335,15 +337,16 @@ const SimpleFontData* FontCache::getFontDataForCharacters(const Font& font,
// large repertoire. Eventually, we need to scan all the fonts
// on the system to have a Firefox-like coverage and this needs
// to move to base/gfx.
+ // Make sure that all of them are lowercased.
const static wchar_t* const cjkFonts[] = {
- L"Arial Unicode MS",
+ L"arial unicode ms",
L"ms pgothic",
L"simsun",
L"gulim",
L"pmingliu",
L"code2000",
- L"Bitstream Cyberbit",
- L"Titus Cyberbit Basic",
+ L"bitstream cyberbit",
+ L"titus cyberbit basic",
};
const static wchar_t* const commonFonts[] = {