diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-01-02 12:45:28 +0100 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2015-01-08 09:58:46 -0500 |
commit | 16c7060bc8ff91527ae97f8a3feee5706747b9c5 (patch) | |
tree | 0cc29f2cc50c729d3a8f9521a22991fad67b9afd /components/msg/compositor_msg.rs | |
parent | cf616b90a236f88058dbad74b568b4d4379d2829 (diff) | |
download | servo-16c7060bc8ff91527ae97f8a3feee5706747b9c5.tar.gz servo-16c7060bc8ff91527ae97f8a3feee5706747b9c5.zip |
Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19.
Diffstat (limited to 'components/msg/compositor_msg.rs')
-rw-r--r-- | components/msg/compositor_msg.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/components/msg/compositor_msg.rs b/components/msg/compositor_msg.rs index 9d280cef673..2b220652a03 100644 --- a/components/msg/compositor_msg.rs +++ b/components/msg/compositor_msg.rs @@ -14,13 +14,13 @@ use std::fmt; use constellation_msg::PipelineId; /// The status of the painter. -#[deriving(PartialEq, Clone)] +#[deriving(PartialEq, Eq, Clone, Copy)] pub enum PaintState { Idle, Painting, } -#[deriving(Eq, Ord, PartialEq, PartialOrd, Clone, Show)] +#[deriving(Eq, Ord, PartialEq, PartialOrd, Clone, Show, Copy)] pub enum ReadyState { /// Informs the compositor that nothing has been done yet. Used for setting status Blank, @@ -33,7 +33,7 @@ pub enum ReadyState { } /// A newtype struct for denoting the age of messages; prevents race conditions. -#[deriving(PartialEq, Show)] +#[deriving(PartialEq, Eq, Show, Copy)] pub struct Epoch(pub uint); impl Epoch { @@ -43,7 +43,7 @@ impl Epoch { } } -#[deriving(Clone, PartialEq)] +#[deriving(Clone, PartialEq, Eq, Copy)] pub struct LayerId(pub uint, pub uint); impl Show for LayerId { @@ -61,7 +61,7 @@ impl LayerId { } /// The scrolling policy of a layer. -#[deriving(Clone, PartialEq)] +#[deriving(Clone, PartialEq, Eq, Copy)] pub enum ScrollPolicy { /// These layers scroll when the parent receives a scrolling message. Scrollable, @@ -71,6 +71,7 @@ pub enum ScrollPolicy { /// All layer-specific information that the painting task sends to the compositor other than the /// buffer contents of the layer itself. +#[deriving(Copy)] pub struct LayerMetadata { /// An opaque ID. This is usually the address of the flow and index of the box within it. pub id: LayerId, |