summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-08 23:32:09 +0000
committerjungshik@google.com <jungshik@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-08 23:32:09 +0000
commit52eb73acbe2820d23d555a8108cd001b9ceb51fa (patch)
tree3a38d34aac7ca3643008359217d7c3ddfde7c7c1 /webkit
parent2972facf833f59d641229c3cd9630cd5ae4ee512 (diff)
downloadchromium_src-52eb73acbe2820d23d555a8108cd001b9ceb51fa.zip
chromium_src-52eb73acbe2820d23d555a8108cd001b9ceb51fa.tar.gz
chromium_src-52eb73acbe2820d23d555a8108cd001b9ceb51fa.tar.bz2
Make sure to Arial is used for buttons and other ui elements in Latin/Greek/Cyrillic pages.
This tempoary special-casing is necessary because I added latin/greek/cyrillic entries in script2font map in base/gfx and set them to 'Times New Roman' because our default font for European Chrome is serif. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@607 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/port/rendering/RenderThemeWin.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/port/rendering/RenderThemeWin.cpp b/webkit/port/rendering/RenderThemeWin.cpp
index d0509e1..ea0eb73 100644
--- a/webkit/port/rendering/RenderThemeWin.cpp
+++ b/webkit/port/rendering/RenderThemeWin.cpp
@@ -244,7 +244,11 @@ static wchar_t* defaultGUIFont(Document* document)
UScriptCode dominantScript = document->dominantScript();
const wchar_t* family = NULL;
- if (dominantScript != USCRIPT_INVALID_CODE) {
+ // TODO(jungshik) : Special-casing of Latin/Greeek/Cyrillic should go away
+ // once GetFontFamilyForScript is enhanced to support GenericFamilyType for real.
+ // For now, we make sure that we use Arial to match IE for those scripts.
+ if (dominantScript != USCRIPT_LATIN && dominantScript != USCRIPT_CYRILLIC &&
+ dominantScript != USCRIPT_GREEK && dominantScript != USCRIPT_INVALID_CODE) {
family = gfx::GetFontFamilyForScript(dominantScript,
gfx::GenericFamilyType::GENERIC_FAMILY_NONE);
if (family)