Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add attr_equals to TElement.

Browse source 
Same reasons as the previous patch.
This commit is contained in:
Bobby Holley 2016-06-23 15:36:25 -07:00
parent 96af00fbb9
commit 364c8e2976
4 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/style/matching.rs
View file

@ -39,11 +39,9 @@ fn create_common_style_affecting_attributes_from_element<E: TElement>(element: &
}
}
CommonStyleAffectingAttributeMode::IsEqual(target_value, flag) => {
match element.get_attr(&ns!(), &attribute_info.atom) {
Some(element_value) if element_value == target_value => {
flags.insert(flag)
}
_ => {}
let atom = Atom::from(target_value); // FIXME(bholley): This goes away in the next patch.
if element.attr_equals(&ns!(), &attribute_info.atom, &atom) {
flags.insert(flag)
}
}
}
@ -301,19 +299,14 @@ impl<C: ComputedValues> StyleSharingCandidate<C> {
}
}
CommonStyleAffectingAttributeMode::IsEqual(target_value, flag) => {
match element.get_attr(&ns!(), &attribute_info.atom) {
Some(ref element_value) if self.common_style_affecting_attributes
.contains(flag) &&
*element_value != target_value => {
let atom = Atom::from(target_value); // FIXME(bholley): This goes away in the next patch.
let contains = self.common_style_affecting_attributes.contains(flag);
if element.has_attr(&ns!(), &attribute_info.atom) {
if !contains || !element.attr_equals(&ns!(), &attribute_info.atom, &atom) {
return false
}
Some(_) if !self.common_style_affecting_attributes.contains(flag) => {
return false
}
None if self.common_style_affecting_attributes.contains(flag) => {
return false
}
_ => {}
} else if contains {
return false
}
}
}