From 46288f9c4631629edd7ad979d8e2d61e646f6ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 13 Sep 2017 13:08:49 +0200 Subject: [PATCH] Share more code for the primary style resolution. The code before predated the existence of CascadeInputs, I believe. MozReview-Commit-ID: 2zPVfWZkgoh --- components/style/style_resolver.rs | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/components/style/style_resolver.rs b/components/style/style_resolver.rs index 546a38ed221..4d806f92de1 100644 --- a/components/style/style_resolver.rs +++ b/components/style/style_resolver.rs @@ -140,34 +140,19 @@ where None }; - let mut visited_style = None; - let should_compute_visited_style = - relevant_link_found || - parent_style.and_then(|s| s.get_visited_style()).is_some(); - - if should_compute_visited_style { - visited_style = Some(self.cascade_style( - visited_rules.as_ref().or(Some(&primary_results.rule_node)), - /* style_if_visited = */ None, + PrimaryStyle { + style: self.cascade_style_and_visited( + CascadeInputs { + rules: Some(primary_results.rule_node), + visited_rules, + }, parent_style, layout_parent_style, - CascadeVisitedMode::Visited, /* pseudo = */ None, - )); + ), } - let style = self.cascade_style( - Some(&primary_results.rule_node), - visited_style, - parent_style, - layout_parent_style, - CascadeVisitedMode::Unvisited, - /* pseudo = */ None, - ); - - PrimaryStyle { style, } } - /// Resolve the style of a given element, and all its eager pseudo-elements. pub fn resolve_style( &mut self,