Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Support building for Magic Leap.

Browse source
This commit is contained in:
Alan Jeffrey 2018-09-12 17:21:51 -05:00
parent e580250d5d
commit dab8f4a97f
34 changed files with 1601 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/gfx/platform/freetype/android/font_list.rs
View file

@ -127,7 +127,7 @@ struct FontList {
impl FontList {
fn new() -> FontList {
// Possible paths containing the font mapping xml file.
let paths = ["/etc/fonts.xml", "/system/etc/system_fonts.xml"];
let paths = ["/etc/fonts.xml", "/system/etc/system_fonts.xml", "/package/etc/fonts.xml"];
// Try to load and parse paths until one of them success.
let mut result = None;
@ -136,6 +136,10 @@ impl FontList {
!result.is_some()
});
if result.is_none() {
warn!("Couldn't find font list");
}
match result {
Some(result) => result,
// If no xml mapping file is found fallback to some default
@ -209,6 +213,7 @@ impl FontList {
let alternatives = [
("sans-serif", "Roboto-Regular.ttf"),
("Droid Sans", "DroidSans.ttf"),
("Lomino", "/system/etc/ml/kali/Fonts/Lomino/Medium/LominoUI_Md.ttf"),
];
alternatives
@ -225,7 +230,11 @@ impl FontList {
// All Android fonts are located in /system/fonts
fn font_absolute_path(filename: &str) -> String {
format!("/system/fonts/{}", filename)
if filename.starts_with("/") {
String::from(filename)
} else {
format!("/system/fonts/{}", filename)
}
}
fn find_family(&self, name: &str) -> Option<&FontFamily> {