diff --git a/components/style/animation.rs b/components/style/animation.rs index 685d3933512..bbf847d7f14 100644 --- a/components/style/animation.rs +++ b/components/style/animation.rs @@ -3,7 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ //! CSS transitions and animations. -#![deny(missing_docs)] use Atom; use bezier::Bezier; @@ -409,7 +408,6 @@ impl PropertyAnimation { /// Inserts transitions into the queue of running animations as applicable for /// the given style difference. This is called from the layout worker threads. /// Returns true if any animations were kicked off and false otherwise. -#[cfg(feature = "servo")] pub fn start_transitions_if_applicable( new_animations_sender: &Sender, opaque_node: OpaqueNode, @@ -629,6 +627,7 @@ pub fn update_style_for_animation_frame( true } + /// Updates a single animation and associated style based on the current time. pub fn update_style_for_animation( context: &SharedStyleContext, diff --git a/components/style/lib.rs b/components/style/lib.rs index 538dce92b87..20a54c62680 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -103,7 +103,6 @@ extern crate void; #[macro_use] mod macros; -#[cfg(feature = "servo")] pub mod animation; pub mod applicable_declarations; #[allow(missing_docs)] // TODO. diff --git a/components/style/properties/helpers/animated_properties.mako.rs b/components/style/properties/helpers/animated_properties.mako.rs index 387507516e8..fa6166e17ae 100644 --- a/components/style/properties/helpers/animated_properties.mako.rs +++ b/components/style/properties/helpers/animated_properties.mako.rs @@ -196,7 +196,6 @@ pub fn nscsspropertyid_is_transitionable(property: nsCSSPropertyID) -> bool { /// An animated property interpolation between two computed values for that /// property. -#[cfg(feature = "servo")] #[derive(Clone, Debug, PartialEq)] #[cfg_attr(feature = "servo", derive(MallocSizeOf))] pub enum AnimatedProperty { @@ -213,7 +212,6 @@ pub enum AnimatedProperty { % endfor } -#[cfg(feature = "servo")] impl AnimatedProperty { /// Get the name of this property. pub fn name(&self) -> &'static str { @@ -255,9 +253,12 @@ impl AnimatedProperty { /// Update `style` with the proper computed style corresponding to this /// animation at `progress`. + #[cfg_attr(feature = "gecko", allow(unused))] pub fn update(&self, style: &mut ComputedValues, progress: f64) { - match *self { - % for prop in data.longhands: + #[cfg(feature = "servo")] + { + match *self { + % for prop in data.longhands: % if prop.animatable: AnimatedProperty::${prop.camel_case}(ref from, ref to) => { // https://drafts.csswg.org/web-animations/#discrete-animation-type @@ -276,7 +277,8 @@ impl AnimatedProperty { style.mutate_${prop.style_struct.name_lower}().set_${prop.ident}(value); } % endif - % endfor + % endfor + } } }