diff options
| -rw-r--r-- | components/malloc_size_of/Cargo.toml | 3 | ||||
| -rw-r--r-- | components/malloc_size_of/lib.rs | 2 | ||||
| -rw-r--r-- | components/style/animation.rs | 8 | ||||
| -rw-r--r-- | components/style/gecko/media_features.rs | 4 |
4 files changed, 14 insertions, 3 deletions
diff --git a/components/malloc_size_of/Cargo.toml b/components/malloc_size_of/Cargo.toml index 8a401dd012f..cd05b5d50c0 100644 --- a/components/malloc_size_of/Cargo.toml +++ b/components/malloc_size_of/Cargo.toml @@ -15,6 +15,7 @@ servo = [ "mozjs", "serde", "serde_bytes", + "servo_channel", "string_cache", "time", "url", @@ -34,7 +35,7 @@ selectors = { path = "../selectors" } serde = { version = "1.0.27", optional = true } serde_bytes = { version = "0.10", optional = true } servo_arc = { path = "../servo_arc" } -servo_channel = {path = "../channel"} +servo_channel = { path = "../channel", optional = true } smallbitvec = "2.1.0" smallvec = "0.6" string_cache = { version = "0.7", optional = true } diff --git a/components/malloc_size_of/lib.rs b/components/malloc_size_of/lib.rs index d39d162f6b3..72b7f81595a 100644 --- a/components/malloc_size_of/lib.rs +++ b/components/malloc_size_of/lib.rs @@ -59,6 +59,7 @@ extern crate serde; #[cfg(feature = "servo")] extern crate serde_bytes; extern crate servo_arc; +#[cfg(feature = "servo")] extern crate servo_channel; extern crate smallbitvec; extern crate smallvec; @@ -1024,6 +1025,7 @@ where // Placeholder for unique case where internals of Sender cannot be measured. // malloc size of is 0 macro complains about type supplied! +#[cfg(feature = "servo")] impl<T> MallocSizeOf for servo_channel::Sender<T> { fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize { 0 diff --git a/components/style/animation.rs b/components/style/animation.rs index bcb42653cbd..5c0a7103426 100644 --- a/components/style/animation.rs +++ b/components/style/animation.rs @@ -4,6 +4,10 @@ //! CSS transitions and animations. +// NOTE(emilio): This code isn't really executed in Gecko, but we don't want to +// compile it out so that people remember it exists, thus the cfg'd Sender +// import. + use Atom; use bezier::Bezier; use context::SharedStyleContext; @@ -15,8 +19,11 @@ use properties::longhands::animation_direction::computed_value::single_value::T use properties::longhands::animation_play_state::computed_value::single_value::T as AnimationPlayState; use rule_tree::CascadeLevel; use servo_arc::Arc; +#[cfg(feature = "servo")] use servo_channel::Sender; use std::fmt; +#[cfg(feature = "gecko")] +use std::sync::mpsc::Sender; use stylesheets::keyframes_rule::{KeyframesAnimation, KeyframesStep, KeyframesStepValue}; use timer::Timer; use values::computed::Time; @@ -25,6 +32,7 @@ use values::computed::transform::TimingFunction; use values::generics::box_::AnimationIterationCount; use values::generics::transform::{StepPosition, TimingFunction as GenericTimingFunction}; + /// This structure represents a keyframes animation current iteration state. /// /// If the iteration count is infinite, there's no other state, otherwise we diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs index 5999e8a2434..5c744f24220 100644 --- a/components/style/gecko/media_features.rs +++ b/components/style/gecko/media_features.rs @@ -322,7 +322,7 @@ fn all_pointer_capabilities(device: &Device) -> PointerCapabilities { ) } -#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)] +#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)] #[repr(u8)] enum Pointer { None, @@ -356,7 +356,7 @@ fn eval_any_pointer(device: &Device, query_value: Option<Pointer>) -> bool { eval_pointer_capabilities(query_value, all_pointer_capabilities(device)) } -#[derive(Debug, Copy, Clone, FromPrimitive, ToCss, Parse)] +#[derive(Clone, Copy, Debug, FromPrimitive, Parse, ToCss)] #[repr(u8)] enum Hover { None, |