diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index a68bb735233..4c83089c504 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -17,7 +17,6 @@ use smallbitvec::SmallBitVec; use std::borrow::Cow; use std::{fmt, mem, ops}; use std::cell::RefCell; -#[cfg(feature = "gecko")] use std::ptr; #[cfg(feature = "servo")] use cssparser::RGBA; use cssparser::{CowRcStr, Parser, TokenSerializationType, serialize_identifier}; @@ -2660,8 +2659,8 @@ impl<'a> StyleBuilder<'a> { debug_assert_eq!(parent_style.is_some(), parent_style_ignoring_first_line.is_some()); #[cfg(feature = "gecko")] debug_assert!(parent_style.is_none() || - ptr::eq(parent_style.unwrap(), - parent_style_ignoring_first_line.unwrap()) || + ::std::ptr::eq(parent_style.unwrap(), + parent_style_ignoring_first_line.unwrap()) || parent_style.unwrap().pseudo() == Some(PseudoElement::FirstLine)); let reset_style = device.default_computed_values(); let inherited_style = parent_style.unwrap_or(reset_style); @@ -3130,11 +3129,6 @@ pub fn cascade( rule_cache_conditions: &mut RuleCacheConditions, ) -> Arc { debug_assert_eq!(parent_style.is_some(), parent_style_ignoring_first_line.is_some()); - #[cfg(feature = "gecko")] - debug_assert!(parent_style.is_none() || - ptr::eq(parent_style.unwrap(), - parent_style_ignoring_first_line.unwrap()) || - parent_style.unwrap().pseudo() == Some(PseudoElement::FirstLine)); let empty = SmallBitVec::new(); let iter_declarations = || { rule_node.self_and_ancestors().flat_map(|node| { @@ -3218,8 +3212,8 @@ where debug_assert_eq!(parent_style.is_some(), parent_style_ignoring_first_line.is_some()); #[cfg(feature = "gecko")] debug_assert!(parent_style.is_none() || - ptr::eq(parent_style.unwrap(), - parent_style_ignoring_first_line.unwrap()) || + ::std::ptr::eq(parent_style.unwrap(), + parent_style_ignoring_first_line.unwrap()) || parent_style.unwrap().pseudo() == Some(PseudoElement::FirstLine)); let (inherited_style, layout_parent_style) = match parent_style { Some(parent_style) => { diff --git a/components/style/traversal.rs b/components/style/traversal.rs index c8ec158bf6e..a1eb17b5002 100644 --- a/components/style/traversal.rs +++ b/components/style/traversal.rs @@ -13,11 +13,8 @@ use selector_parser::PseudoElement; use sharing::StyleSharingTarget; use smallvec::SmallVec; use style_resolver::{PseudoElementResolution, StyleResolverForElement}; -#[cfg(feature = "servo")] use style_traits::ToCss; use stylist::RuleInclusion; use traversal_flags::{TraversalFlags, self}; -#[cfg(feature = "servo")] use values::Either; -#[cfg(feature = "servo")] use values::generics::image::Image; /// A per-traversal-level chunk of data. This is sent down by the traversal, and /// currently only holds the dom depth for the bloom filter. @@ -783,6 +780,10 @@ fn notify_paint_worklet(context: &StyleContext, data: &ElementData) where E: TElement, { + use style_traits::ToCss; + use values::Either; + use values::generics::image::Image; + // We speculatively evaluate any paint worklets during styling. // This allows us to run paint worklets in parallel with style and layout. // Note that this is wasted effort if the size of the node has