mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Update stylo for latest changes. (#33079)
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
parent
ce5ebbcf77
commit
3d3621b652
23 changed files with 28 additions and 966 deletions
|
@ -28,6 +28,7 @@ use style::values::computed::font::{
|
|||
};
|
||||
use style::values::computed::{FontLanguageOverride, XLang};
|
||||
use style::values::generics::font::LineHeight;
|
||||
use style::ArcSlice;
|
||||
use webrender_api::{FontInstanceFlags, FontInstanceKey, FontKey, IdNamespace};
|
||||
|
||||
#[derive(Clone)]
|
||||
|
@ -152,19 +153,16 @@ fn style() -> FontStyleStruct {
|
|||
}
|
||||
|
||||
fn font_family(names: Vec<&str>) -> FontFamily {
|
||||
let names: Vec<SingleFontFamily> = names
|
||||
.into_iter()
|
||||
.map(|name| {
|
||||
SingleFontFamily::FamilyName(FamilyName {
|
||||
name: Atom::from(name),
|
||||
syntax: FontFamilyNameSyntax::Quoted,
|
||||
})
|
||||
let names = names.into_iter().map(|name| {
|
||||
SingleFontFamily::FamilyName(FamilyName {
|
||||
name: Atom::from(name),
|
||||
syntax: FontFamilyNameSyntax::Quoted,
|
||||
})
|
||||
.collect();
|
||||
});
|
||||
|
||||
FontFamily {
|
||||
families: FontFamilyList {
|
||||
list: names.into_boxed_slice(),
|
||||
list: ArcSlice::from_iter(names),
|
||||
},
|
||||
is_system_font: false,
|
||||
is_initial: false,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue