diff --git a/src/components/gfx/font_list.rs b/src/components/gfx/font_list.rs index ceda9619eb5..686d72d1ad6 100644 --- a/src/components/gfx/font_list.rs +++ b/src/components/gfx/font_list.rs @@ -18,7 +18,7 @@ pub type FontFamilyMap = HashMap<~str, FontFamily>; trait FontListHandleMethods { fn get_available_families(&self, fctx: &FontContextHandle) -> FontFamilyMap; fn load_variations_for_family(&self, family: &mut FontFamily); - fn get_last_resort_font_families() -> ~[~str]; + fn get_last_resort_font_families() -> Vec<~str>; } /// The platform-independent font list abstraction. @@ -75,9 +75,8 @@ impl FontList { } } - pub fn get_last_resort_font_families() -> ~[~str] { - let last_resort = FontListHandle::get_last_resort_font_families(); - last_resort + pub fn get_last_resort_font_families() -> Vec<~str> { + FontListHandle::get_last_resort_font_families() } } diff --git a/src/components/gfx/platform/android/font_list.rs b/src/components/gfx/platform/android/font_list.rs index 90bfcf0e481..8d5649096b7 100644 --- a/src/components/gfx/platform/android/font_list.rs +++ b/src/components/gfx/platform/android/font_list.rs @@ -129,8 +129,8 @@ impl FontListHandle { } } - pub fn get_last_resort_font_families() -> ~[~str] { - ~["Roboto".to_owned()] + pub fn get_last_resort_font_families() -> Vec<~str> { + vec!("Roboto".to_owned()) } } diff --git a/src/components/gfx/platform/linux/font_list.rs b/src/components/gfx/platform/linux/font_list.rs index cb3bcc5ed16..d64c90e9db9 100644 --- a/src/components/gfx/platform/linux/font_list.rs +++ b/src/components/gfx/platform/linux/font_list.rs @@ -131,8 +131,8 @@ impl FontListHandle { } } - pub fn get_last_resort_font_families() -> ~[~str] { - ~["Arial".to_owned()] + pub fn get_last_resort_font_families() -> Vec<~str> { + vec!("Arial".to_owned()) } } diff --git a/src/components/gfx/platform/macos/font_list.rs b/src/components/gfx/platform/macos/font_list.rs index a260cf23c4f..9171bd3d0f6 100644 --- a/src/components/gfx/platform/macos/font_list.rs +++ b/src/components/gfx/platform/macos/font_list.rs @@ -58,7 +58,7 @@ impl FontListHandle { } } - pub fn get_last_resort_font_families() -> ~[~str] { - ~["Arial Unicode MS".to_owned(),"Arial".to_owned()] + pub fn get_last_resort_font_families() -> Vec<~str> { + vec!("Arial Unicode MS".to_owned(), "Arial".to_owned()) } }