summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/fonts
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2012-05-08 10:52:15 -0700
committerVictoria Lease <violets@google.com>2012-05-08 10:52:15 -0700
commit6aba9e528d4df20fbf9710d151753373d04a77d3 (patch)
treec3fa332d1db24d2951646e8a276cbaa1115291c7 /Source/WebCore/platform/graphics/android/fonts
parentb3d68a4f5f6b7a491646e2d158c0c7aedccd9eb4 (diff)
downloadexternal_webkit-6aba9e528d4df20fbf9710d151753373d04a77d3.zip
external_webkit-6aba9e528d4df20fbf9710d151753373d04a77d3.tar.gz
external_webkit-6aba9e528d4df20fbf9710d151753373d04a77d3.tar.bz2
Add Kanana, Malayalam, and Telugu fallback fonts
Bug: 6232193 Change-Id: I99616a1ccd82e6ee03f30b61e4d51e7d6183a6bc
Diffstat (limited to 'Source/WebCore/platform/graphics/android/fonts')
-rw-r--r--Source/WebCore/platform/graphics/android/fonts/FontAndroid.cpp15
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 827a531..3d9cc74 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;