diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs index 59ff135c303..8e5159f3188 100644 --- a/components/style/values/specified/mod.rs +++ b/components/style/values/specified/mod.rs @@ -233,25 +233,6 @@ impl CSSColor { } } -#[derive(Clone, PartialEq, Debug)] -#[cfg_attr(feature = "servo", derive(HeapSizeOf))] -#[allow(missing_docs)] -pub struct CSSRGBA { - pub parsed: cssparser::RGBA, - pub authored: Option>, -} - -no_viewport_percentage!(CSSRGBA); - -impl ToCss for CSSRGBA { - fn to_css(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { - match self.authored { - Some(ref s) => dest.write_str(s), - None => self.parsed.to_css(dest), - } - } -} - /// Parse an `` value, handling `calc()` correctly. pub fn parse_integer(context: &ParserContext, input: &mut Parser) -> Result { match try!(input.next()) { diff --git a/components/style/values/specified/mod.rs.rej b/components/style/values/specified/mod.rs.rej new file mode 100644 index 00000000000..0136e286c72 --- /dev/null +++ b/components/style/values/specified/mod.rs.rej @@ -0,0 +1,44 @@ +--- components/style/values/specified/mod.rs ++++ components/style/values/specified/mod.rs +@@ -4,40 +4,38 @@ + + //! Specified values. + //! + //! TODO(emilio): Enhance docs. + + use Namespace; + use context::QuirksMode; + use cssparser::{self, Parser, Token, serialize_identifier}; +-use itoa; + use parser::{ParserContext, Parse}; + use self::grid::TrackSizeOrRepeat; + use self::url::SpecifiedUrl; + use std::ascii::AsciiExt; + use std::f32; + use std::fmt; +-use std::io::Write; + use style_traits::ToCss; + use style_traits::values::specified::AllowedNumericType; + use super::{Auto, CSSFloat, CSSInteger, Either, None_}; + use super::computed::{self, Context}; + use super::computed::{Shadow as ComputedShadow, ToComputedValue}; + use super::generics::grid::{TrackBreadth as GenericTrackBreadth, TrackSize as GenericTrackSize}; + use super::generics::grid::TrackList as GenericTrackList; + use values::computed::ComputedValueAsSpecified; + use values::specified::calc::CalcNode; + + #[cfg(feature = "gecko")] + pub use self::align::{AlignItems, AlignJustifyContent, AlignJustifySelf, JustifyItems}; + pub use self::background::BackgroundSize; + pub use self::border::{BorderCornerRadius, BorderImageSlice, BorderImageWidth}; + pub use self::border::{BorderImageSideWidth, BorderRadius, BorderSideWidth}; +-pub use self::color::Color; ++pub use self::color::{CSSColor, Color}; + pub use self::rect::LengthOrNumberRect; + pub use super::generics::grid::GridLine; + pub use self::image::{ColorStop, EndingShape as GradientEndingShape, Gradient}; + pub use self::image::{GradientItem, GradientKind, Image, ImageRect, ImageLayer}; + pub use self::length::AbsoluteLength; + pub use self::length::{FontRelativeLength, ViewportPercentageLength, CharacterWidth, Length, CalcLengthOrPercentage}; + pub use self::length::{Percentage, LengthOrNone, LengthOrNumber, LengthOrPercentage, LengthOrPercentageOrAuto}; + pub use self::length::{LengthOrPercentageOrNone, LengthOrPercentageOrAutoOrContent, NoCalcLength};