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

Introduce <LayoutDom<Element>>::attrs()

Browse source 
This safe method is the basic block to access element attributes from layout.
We reuse it in the other attr-related layout methods to remove a pretty big
source of rampant unsafe code between script and layout.
This commit is contained in:
Anthony Ramine 2020-03-31 18:46:49 +02:00
parent 0bda174823
commit 5ff931d171
16 changed files with 203 additions and 301 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/dom/htmlfontelement.rs
View file

@ -107,32 +107,24 @@ pub trait HTMLFontElementLayoutHelpers {
}
impl HTMLFontElementLayoutHelpers for LayoutDom<'_, HTMLFontElement> {
#[allow(unsafe_code)]
fn get_color(self) -> Option<RGBA> {
unsafe {
self.upcast::<Element>()
.get_attr_for_layout(&ns!(), &local_name!("color"))
.and_then(AttrValue::as_color)
.cloned()
}
self.upcast::<Element>()
.get_attr_for_layout(&ns!(), &local_name!("color"))
.and_then(AttrValue::as_color)
.cloned()
}
#[allow(unsafe_code)]
fn get_face(self) -> Option<Atom> {
unsafe {
self.upcast::<Element>()
.get_attr_for_layout(&ns!(), &local_name!("face"))
.map(AttrValue::as_atom)
.cloned()
}
self.upcast::<Element>()
.get_attr_for_layout(&ns!(), &local_name!("face"))
.map(AttrValue::as_atom)
.cloned()
}
#[allow(unsafe_code)]
fn get_size(self) -> Option<u32> {
let size = unsafe {
self.upcast::<Element>()
.get_attr_for_layout(&ns!(), &local_name!("size"))
};
let size = self
.upcast::<Element>()
.get_attr_for_layout(&ns!(), &local_name!("size"));
match size {
Some(&AttrValue::UInt(_, s)) => Some(s),
_ => None,