Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Replace ColorOrAuto by CaretColor

Browse source 
This is its only use.
This commit is contained in:
Anthony Ramine 2018-02-28 10:24:06 +01:00
parent 6fbf2c1e3c
commit c4efbb4d51
8 changed files with 65 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/style/values/specified/mod.rs
View file

@ -63,11 +63,11 @@ pub use self::list::ListStyleType;
pub use self::outline::OutlineStyle;
pub use self::rect::LengthOrNumberRect;
pub use self::percentage::Percentage;
pub use self::position::{GridAutoFlow, GridTemplateAreas, Position};
pub use self::position::{PositionComponent, ZIndex};
pub use self::pointing::Cursor;
pub use self::pointing::{CaretColor, Cursor};
#[cfg(feature = "gecko")]
pub use self::pointing::CursorImage;
pub use self::position::{GridAutoFlow, GridTemplateAreas, Position};
pub use self::position::{PositionComponent, ZIndex};
pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
pub use self::svg::MozContextProperties;
@ -693,9 +693,6 @@ impl ClipRectOrAuto {
}
}
/// <color> | auto
pub type ColorOrAuto = Either<Color, Auto>;
/// Whether quirks are allowed in this context.
#[derive(Clone, Copy, PartialEq)]
pub enum AllowQuirks {

20
components/style/values/specified/pointing.rs
View file

@ -6,7 +6,12 @@
//!
//! https://drafts.csswg.org/css-ui/#pointing-keyboard
use cssparser::Parser;
use parser::{Parse, ParserContext};
use style_traits::ParseError;
use style_traits::cursor::CursorKind;
use values::generics::pointing::CaretColor as GenericCaretColor;
use values::specified::color::Color;
#[cfg(feature = "gecko")]
use values::specified::url::SpecifiedUrl;
@ -38,3 +43,18 @@ pub struct CursorImage {
/// The <x> and <y> coordinates.
pub hotspot: Option<(f32, f32)>,
}
/// A specified value for the `caret-color` property.
pub type CaretColor = GenericCaretColor<Color>;
impl Parse for CaretColor {
fn parse<'i, 't>(
context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
if input.try(|i| i.expect_ident_matching("auto")).is_ok() {
return Ok(GenericCaretColor::Auto);
}
Ok(GenericCaretColor::Color(Color::parse(context, input)?))
}
}