From 4db84bede8ec9330568c01fcf243a0ace0cef18b Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 31 Mar 2020 13:56:19 +0200 Subject: Rename AttrHelpersForLayout methods --- components/script/dom/element.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components/script/dom/element.rs') diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 602cb148d7a..35f952a676c 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -578,7 +578,7 @@ pub unsafe fn get_attr_for_layout<'dom>( .iter() .find(|attr| { 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()) } @@ -600,7 +600,7 @@ impl RawLayoutElementHelpers for Element { namespace: &Namespace, name: &LocalName, ) -> 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] @@ -610,7 +610,7 @@ impl RawLayoutElementHelpers for Element { .iter() .filter_map(|attr| { let attr = attr.to_layout(); - if *name == attr.local_name_atom() { + if *name == attr.local_name() { Some(attr.value()) } else { 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( false, |attr| { - attr.value_tokens() + attr.as_tokens() .unwrap() .iter() .any(|atom| case_sensitivity.eq_atom(atom, name)) @@ -668,7 +668,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { #[inline] unsafe fn get_classes_for_layout(self) -> Option<&'dom [Atom]> { 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)] -- cgit v1.2.3 From 47c9f1912150b41695810f6c987f0ca208547bd4 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 31 Mar 2020 14:02:14 +0200 Subject: Don't clone the result of AttrHelpersForLayout::local_name There is no need to do that. Embrace returning borrows from the DOM, it good. --- components/script/dom/element.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/element.rs') diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 35f952a676c..6875d302e67 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -578,7 +578,7 @@ pub unsafe fn get_attr_for_layout<'dom>( .iter() .find(|attr| { let attr = attr.to_layout(); - *name == attr.local_name() && (*attr.unsafe_get()).namespace() == namespace + name == attr.local_name() && (*attr.unsafe_get()).namespace() == namespace }) .map(|attr| attr.to_layout()) } @@ -610,7 +610,7 @@ impl RawLayoutElementHelpers for Element { .iter() .filter_map(|attr| { let attr = attr.to_layout(); - if *name == attr.local_name() { + if name == attr.local_name() { Some(attr.value()) } else { None -- cgit v1.2.3 From 3e875ce3eb5270d31a13fbe0bd9796687465fcff Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 31 Mar 2020 14:06:22 +0200 Subject: Introduce AttrHelpersForLayout::namespace --- components/script/dom/element.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/element.rs') diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 6875d302e67..7d167bf2574 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -578,7 +578,7 @@ pub unsafe fn get_attr_for_layout<'dom>( .iter() .find(|attr| { let attr = attr.to_layout(); - name == attr.local_name() && (*attr.unsafe_get()).namespace() == namespace + name == attr.local_name() && namespace == attr.namespace() }) .map(|attr| attr.to_layout()) } -- cgit v1.2.3