diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-06-04 08:30:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-04 08:30:39 -0400 |
| commit | fe8aad722749e8e5c9223800b98fc4e87b9ab161 (patch) | |
| tree | 31150ecb4738828a3afd66fa1b1e76d0bf785550 /components/script_layout_interface | |
| parent | 6e83856d7bcb79d1a937f026ef4fcf1a3256c2c6 (diff) | |
| parent | c155639bc5d8357d8c6e27535bc64f72bb8d2562 (diff) | |
| download | servo-fe8aad722749e8e5c9223800b98fc4e87b9ab161.tar.gz servo-fe8aad722749e8e5c9223800b98fc4e87b9ab161.zip | |
Auto merge of #23503 - emilio:gecko-sync, r=emilio
style: sync changes from mozilla-central
See each individual commit for details. This also cherry-picks #23463 with a few fixes that were needed in Gecko-only code.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23503)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script_layout_interface')
| -rw-r--r-- | components/script_layout_interface/wrapper_traits.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index 0e1df2ac4c8..ae559474d06 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -391,7 +391,7 @@ pub trait ThreadSafeLayoutElement: #[inline] fn get_details_summary_pseudo(&self) -> Option<Self> { - if self.local_name() == &local_name!("details") && self.namespace() == &ns!(html) { + if self.has_local_name(&local_name!("details")) && self.has_namespace(&ns!(html)) { Some(self.with_pseudo(PseudoElementType::DetailsSummary)) } else { None @@ -400,8 +400,8 @@ pub trait ThreadSafeLayoutElement: #[inline] fn get_details_content_pseudo(&self) -> Option<Self> { - if self.local_name() == &local_name!("details") && - self.namespace() == &ns!(html) && + if self.has_local_name(&local_name!("details")) && + self.has_namespace(&ns!(html)) && self.get_attr(&ns!(), &local_name!("open")).is_some() { Some(self.with_pseudo(PseudoElementType::DetailsContent)) |