Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Rename AttrHelpersForLayout methods

Browse source
This commit is contained in:
Anthony Ramine 2020-03-31 13:56:19 +02:00
parent 4c16729a01
commit 4db84bede8
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/script/dom/attr.rs
View file

@ -235,9 +235,9 @@ impl Attr {
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub trait AttrHelpersForLayout<'dom> { pub trait AttrHelpersForLayout<'dom> {
fn value(self) -> &'dom AttrValue; fn value(self) -> &'dom AttrValue;
fn value_ref_forever(self) -> &'dom str; fn as_str(self) -> &'dom str;
fn value_tokens(self) -> Option<&'dom [Atom]>; fn as_tokens(self) -> Option<&'dom [Atom]>;
fn local_name_atom(self) -> LocalName; fn local_name(self) -> LocalName;
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
@ -248,12 +248,12 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
} }
#[inline] #[inline]
fn value_ref_forever(self) -> &'dom str { fn as_str(self) -> &'dom str {
&**self.value() &**self.value()
} }
#[inline] #[inline]
fn value_tokens(self) -> Option<&'dom [Atom]> { fn as_tokens(self) -> Option<&'dom [Atom]> {
// This transmute is used to cheat the lifetime restriction. // This transmute is used to cheat the lifetime restriction.
match *self.value() { match *self.value() {
AttrValue::TokenList(_, ref tokens) => Some(tokens), AttrValue::TokenList(_, ref tokens) => Some(tokens),
@ -262,7 +262,7 @@ impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
} }
#[inline] #[inline]
fn local_name_atom(self) -> LocalName { fn local_name(self) -> LocalName {
unsafe { self.unsafe_get().identifier.local_name.clone() } unsafe { self.unsafe_get().identifier.local_name.clone() }
} }
} }

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

@ -578,7 +578,7 @@ pub unsafe fn get_attr_for_layout<'dom>(
.iter() .iter()
.find(|attr| { .find(|attr| {
let attr = attr.to_layout(); let attr = attr.to_layout();
*name == attr.local_name_atom() && (*attr.unsafe_get()).namespace() == namespace *name == attr.local_name() && (*attr.unsafe_get()).namespace() == namespace
}) })
.map(|attr| attr.to_layout()) .map(|attr| attr.to_layout())
} }
@ -600,7 +600,7 @@ impl RawLayoutElementHelpers for Element {
namespace: &Namespace, namespace: &Namespace,
name: &LocalName, name: &LocalName,
) -> Option<&'a str> { ) -> Option<&'a str> {
get_attr_for_layout(self, namespace, name).map(|attr| attr.value_ref_forever()) get_attr_for_layout(self, namespace, name).map(|attr| attr.as_str())
} }
#[inline] #[inline]
@ -610,7 +610,7 @@ impl RawLayoutElementHelpers for Element {
.iter() .iter()
.filter_map(|attr| { .filter_map(|attr| {
let attr = attr.to_layout(); let attr = attr.to_layout();
if *name == attr.local_name_atom() { if *name == attr.local_name() {
Some(attr.value()) Some(attr.value())
} else { } else {
None None
@ -656,7 +656,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class")).map_or( get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class")).map_or(
false, false,
|attr| { |attr| {
attr.value_tokens() attr.as_tokens()
.unwrap() .unwrap()
.iter() .iter()
.any(|atom| case_sensitivity.eq_atom(atom, name)) .any(|atom| case_sensitivity.eq_atom(atom, name))
@ -668,7 +668,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> {
#[inline] #[inline]
unsafe fn get_classes_for_layout(self) -> Option<&'dom [Atom]> { unsafe fn get_classes_for_layout(self) -> Option<&'dom [Atom]> {
get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class")) get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class"))
.map(|attr| attr.value_tokens().unwrap()) .map(|attr| attr.as_tokens().unwrap())
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]