Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-02 17:49:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update stylo for latest changes. (#33079)

Browse source 
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
This commit is contained in:
Josh Matthews 2024-08-16 06:47:12 -04:00 • committed by GitHub
parent ce5ebbcf77
commit 3d3621b652
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 28 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/fonts/tests/font_context.rs
View file

@ -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,

2
components/layout/display_list/builder.rs
View file

@ -793,7 +793,7 @@ impl Fragment {
}
},
Image::CrossFade(..) | Image::ImageSet(..) => {
unreachable!("Shouldn't be parsed by Servo for now")
// TODO: Add support for ImageSet and CrossFade rendering.
},
}
}

2
components/layout_2020/display_list/mod.rs
View file

@ -840,7 +840,7 @@ impl<'a> BuilderForBoxFragment<'a> {
// TODO: Add support for PaintWorklet rendering.
},
Image::ImageSet(..) | Image::CrossFade(..) => {
unreachable!("Shouldn't be parsed on Servo for now")
// TODO: Add support for ImageSet and CrossFade rendering.
},
}
}

6
components/script/dom/element.rs
View file

@ -57,7 +57,7 @@ use style::stylesheets::layer_rule::LayerOrder;
use style::stylesheets::{CssRuleType, UrlExtraData};
use style::values::generics::NonNegative;
use style::values::{computed, specified, AtomIdent, AtomString, CSSFloat};
use style::{dom_apis, thread_state, CaseSensitivityExt};
use style::{dom_apis, thread_state, ArcSlice, CaseSensitivityExt};
use style_dom::ElementState;
use xml5ever::serialize as xmlSerialize;
use xml5ever::serialize::TraversalScope::{
@ -762,7 +762,9 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
shared_lock,
PropertyDeclaration::FontFamily(font_family::SpecifiedValue::Values(
computed::font::FontFamilyList {
list: HTMLFontElement::parse_face_attribute(font_face).into_boxed_slice(),
list: ArcSlice::from_iter(
HTMLFontElement::parse_face_attribute(font_face).into_iter(),
),
},
)),
));