diff options
| author | Victoria Lease <violets@google.com> | 2012-05-11 16:52:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-11 16:52:12 -0700 |
| commit | 443f7b177ec738bcf4495cdf9d15c7b7284df057 (patch) | |
| tree | 8a05b9ec0fa05d9eff229790497971b2fb0fa6ba /Source/WebCore/platform/graphics/android/fonts | |
| parent | be16d66d673ed469bbc744af8b4cd99210cbabc3 (diff) | |
| parent | 6aba9e528d4df20fbf9710d151753373d04a77d3 (diff) | |
| download | external_webkit-443f7b177ec738bcf4495cdf9d15c7b7284df057.zip external_webkit-443f7b177ec738bcf4495cdf9d15c7b7284df057.tar.gz external_webkit-443f7b177ec738bcf4495cdf9d15c7b7284df057.tar.bz2 | |
Merge "Add Kanana, Malayalam, and Telugu fallback fonts" into jb-dev
Diffstat (limited to 'Source/WebCore/platform/graphics/android/fonts')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp b/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp index 6c76965..0bd443b 100644 --- a/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp +++ b/Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp @@ -461,9 +461,12 @@ private: Devanagari, Hebrew, HebrewBold, + Kannada, + Malayalam, Naskh, Tamil, TamilBold, + Telugu, Thai, NUM_SCRIPTS }; @@ -521,9 +524,12 @@ const char* TextRunWalker::paths[] = { "/system/fonts/DroidSansDevanagari-Regular.ttf", "/system/fonts/DroidSansHebrew-Regular.ttf", "/system/fonts/DroidSansHebrew-Bold.ttf", + "/system/fonts/Lohit-Kannada.ttf", + "/system/fonts/AnjaliNewLipi-light.ttf", "/system/fonts/DroidNaskh-Regular.ttf", "/system/fonts/DroidSansTamil-Regular.ttf", "/system/fonts/DroidSansTamil-Bold.ttf", + "/system/fonts/Lohit-Telugu.ttf", "/system/fonts/DroidSansThai.ttf" }; @@ -730,6 +736,12 @@ void TextRunWalker::setupFontForScriptRun() break; } break; + case HB_Script_Kannada: + complexPlatformData = setupComplexFont(Kannada, platformData); + break; + case HB_Script_Malayalam: + complexPlatformData = setupComplexFont(Malayalam, platformData); + break; case HB_Script_Arabic: complexPlatformData = setupComplexFont(Naskh, platformData); break; @@ -746,6 +758,9 @@ void TextRunWalker::setupFontForScriptRun() break; } break; + case HB_Script_Telugu: + complexPlatformData = setupComplexFont(Telugu, platformData); + break; case HB_Script_Thai: complexPlatformData = setupComplexFont(Thai, platformData); break; |