From 00b42fc6ef6c123c4ab1bb97ac65603e13e20d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 23 May 2018 20:11:22 +0200 Subject: [PATCH] style: Remove some cfgs. --- components/style/properties/declaration_block.rs | 4 +--- .../style/properties/helpers/animated_properties.mako.rs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/components/style/properties/declaration_block.rs b/components/style/properties/declaration_block.rs index 4e368c0c2b7..2319ded2e14 100644 --- a/components/style/properties/declaration_block.rs +++ b/components/style/properties/declaration_block.rs @@ -24,7 +24,7 @@ use style_traits::{CssWriter, ParseError, ParsingMode, StyleParseErrorKind, ToCs use stylesheets::{CssRuleType, Origin, UrlExtraData}; use super::*; use values::computed::Context; -#[cfg(feature = "gecko")] use properties::animated_properties::AnimationValueMap; +use properties::animated_properties::AnimationValueMap; /// The animation rules. /// @@ -667,7 +667,6 @@ impl PropertyDeclarationBlock { } /// Convert AnimationValueMap to PropertyDeclarationBlock. - #[cfg(feature = "gecko")] pub fn from_animation_value_map(animation_value_map: &AnimationValueMap) -> Self { let len = animation_value_map.len(); let mut declarations = Vec::with_capacity(len); @@ -687,7 +686,6 @@ impl PropertyDeclarationBlock { /// Returns true if the declaration block has a CSSWideKeyword for the given /// property. - #[cfg(feature = "gecko")] pub fn has_css_wide_keyword(&self, property: &PropertyId) -> bool { if let Some(id) = property.longhand_id() { if !self.longhands.contains(id) { diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs index de0e48c782d..7a34cc4ade4 100644 --- a/components/style/properties/helpers/animated_properties.mako.rs +++ b/components/style/properties/helpers/animated_properties.mako.rs @@ -25,7 +25,7 @@ use servo_arc::Arc; use smallvec::SmallVec; use std::{cmp, ptr}; use std::mem::{self, ManuallyDrop}; -#[cfg(feature = "gecko")] use hash::FnvHashMap; +use hash::FnvHashMap; use super::ComputedValues; use values::CSSFloat; use values::animated::{Animate, Procedure, ToAnimatedValue, ToAnimatedZero}; @@ -229,8 +229,8 @@ impl AnimatedProperty { /// A collection of AnimationValue that were composed on an element. /// This HashMap stores the values that are the last AnimationValue to be /// composed for each TransitionProperty. -#[cfg(feature = "gecko")] pub type AnimationValueMap = FnvHashMap; + #[cfg(feature = "gecko")] unsafe impl HasFFI for AnimationValueMap { type FFIType = RawServoAnimationValueMap;