aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/traversal.rs
diff options
context:
space:
mode:
authorEmilio Cobos Álvarez <emilio@crisal.io>2018-02-20 12:59:21 +0100
committerEmilio Cobos Álvarez <emilio@crisal.io>2018-02-20 12:59:21 +0100
commit94b687306f33dfe32d3c97d8bc95a69d86172933 (patch)
treed4d03d0cbb71fb70c41e669741342f471df0201a /components/style/traversal.rs
parenta98da8ce939e8afe7bac737ac02e3bcb226a1ea9 (diff)
downloadservo-94b687306f33dfe32d3c97d8bc95a69d86172933.tar.gz
servo-94b687306f33dfe32d3c97d8bc95a69d86172933.zip
style: Cleanup always-false argument to Servo_ResolveStyleLazily.
I changed this setup in https://bugzilla.mozilla.org/show_bug.cgi?id=1414999, because it was totally unsound.
Diffstat (limited to 'components/style/traversal.rs')
-rw-r--r--components/style/traversal.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/components/style/traversal.rs b/components/style/traversal.rs
index 6a99d597d1b..8944752f642 100644
--- a/components/style/traversal.rs
+++ b/components/style/traversal.rs
@@ -300,7 +300,6 @@ pub fn resolve_style<E>(
context: &mut StyleContext<E>,
element: E,
rule_inclusion: RuleInclusion,
- ignore_existing_style: bool,
pseudo: Option<&PseudoElement>,
) -> ElementStyles
where
@@ -309,7 +308,6 @@ where
use style_resolver::StyleResolverForElement;
debug_assert!(rule_inclusion == RuleInclusion::DefaultOnly ||
- ignore_existing_style ||
pseudo.map_or(false, |p| p.is_before_or_after()) ||
element.borrow_data().map_or(true, |d| !d.has_styles()),
"Why are we here?");
@@ -321,7 +319,7 @@ where
let mut style = None;
let mut ancestor = element.traversal_parent();
while let Some(current) = ancestor {
- if rule_inclusion == RuleInclusion::All && !ignore_existing_style {
+ if rule_inclusion == RuleInclusion::All {
if let Some(data) = current.borrow_data() {
if let Some(ancestor_style) = data.styles.get_primary() {
style = Some(ancestor_style.clone());