diff --git a/components/style/traversal.rs b/components/style/traversal.rs index 59a568e31a7..70eb8ce5e84 100644 --- a/components/style/traversal.rs +++ b/components/style/traversal.rs @@ -42,8 +42,6 @@ bitflags! { /// Traverse and update all elements with CSS animations since /// @keyframes rules may have changed const FOR_CSS_RULE_CHANGES = 0x08, - /// Only include user agent style sheets when selector matching. - const FOR_DEFAULT_STYLES = 0x10, } } @@ -67,12 +65,6 @@ impl TraversalFlags { pub fn for_css_rule_changes(&self) -> bool { self.contains(FOR_CSS_RULE_CHANGES) } - - /// Returns true if the traversal is to compute the default computed styles - /// for an element. - pub fn for_default_styles(&self) -> bool { - self.contains(FOR_DEFAULT_STYLES) - } } /// This structure exists to enforce that callers invoke pre_traverse, and also diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 665d20716c0..baee4e4e490 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -113,7 +113,7 @@ use style::stylist::RuleInclusion; use style::thread_state; use style::timer::Timer; use style::traversal::{ANIMATION_ONLY, DomTraversal, FOR_CSS_RULE_CHANGES, FOR_RECONSTRUCT}; -use style::traversal::{FOR_DEFAULT_STYLES, TraversalDriver, TraversalFlags, UNSTYLED_CHILDREN_ONLY}; +use style::traversal::{TraversalDriver, TraversalFlags, UNSTYLED_CHILDREN_ONLY}; use style::traversal::resolve_style; use style::values::{CustomIdent, KeyframesName}; use style::values::computed::Context; @@ -2797,16 +2797,11 @@ pub extern "C" fn Servo_ResolveStyleLazily(element: RawGeckoElementBorrowed, } } - let traversal_flags = match rule_inclusion { - RuleInclusion::All => TraversalFlags::empty(), - RuleInclusion::DefaultOnly => FOR_DEFAULT_STYLES, - }; - // We don't have the style ready. Go ahead and compute it as necessary. let shared = create_shared_context(&global_style_data, &guard, &data, - traversal_flags, + TraversalFlags::empty(), unsafe { &*snapshots }); let mut tlc = ThreadLocalStyleContext::new(&shared); let mut context = StyleContext {