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

Rename HAS_TEXT_DECORATION_LINE to match gecko side name.

Browse source
This commit is contained in:
Xidorn Quan 2017-07-14 10:33:50 +10:00
parent 5270b766c1
commit 2a05c29c30
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/matching.rs
View file

@ -329,8 +329,8 @@ trait PrivateMatchMethods: TElement {
// We need to cascade the children in order to ensure the // We need to cascade the children in order to ensure the
// correct propagation of text-decoration-line, which is a reset // correct propagation of text-decoration-line, which is a reset
// property. // property.
if old_values.flags.contains(HAS_TEXT_DECORATION_LINE) != if old_values.flags.contains(HAS_TEXT_DECORATION_LINES) !=
new_values.flags.contains(HAS_TEXT_DECORATION_LINE) { new_values.flags.contains(HAS_TEXT_DECORATION_LINES) {
return ChildCascadeRequirement::MustCascadeChildren; return ChildCascadeRequirement::MustCascadeChildren;
} }
ChildCascadeRequirement::CanSkipCascade ChildCascadeRequirement::CanSkipCascade

10
components/style/properties/computed_value_flags.rs
View file

@ -9,12 +9,12 @@ use properties::{ComputedValues, StyleBuilder};
bitflags! { bitflags! {
/// Misc information about a given computed style. /// Misc information about a given computed style.
pub flags ComputedValueFlags: u8 { pub flags ComputedValueFlags: u8 {
/// Whether the style or any of the ancestors has a text-decoration /// Whether the style or any of the ancestors has a text-decoration-line
/// property that should get propagated to descendants. /// property that should get propagated to descendants.
/// ///
/// text-decoration is a reset property, but gets propagated in the /// text-decoration-line is a reset property, but gets propagated in the
/// frame/box tree. /// frame/box tree.
const HAS_TEXT_DECORATION_LINE = 1 << 0, const HAS_TEXT_DECORATION_LINES = 1 << 0,
} }
} }
@ -35,9 +35,9 @@ impl ComputedValueFlags {
// layout_parent_style, but the way it works in Gecko means it's not // layout_parent_style, but the way it works in Gecko means it's not
// needed (we'd recascade a bit more when it changes, but that's fine), // needed (we'd recascade a bit more when it changes, but that's fine),
// and this way it simplifies the code for text styles and similar. // and this way it simplifies the code for text styles and similar.
if parent_style.flags.contains(HAS_TEXT_DECORATION_LINE) || if parent_style.flags.contains(HAS_TEXT_DECORATION_LINES) ||
!this_style.get_text().clone_text_decoration_line().is_empty() { !this_style.get_text().clone_text_decoration_line().is_empty() {
ret.insert(HAS_TEXT_DECORATION_LINE); ret.insert(HAS_TEXT_DECORATION_LINES);
} }
ret ret