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

style: Implement parsing for CSS conic-gradient syntax.

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D62148
This commit is contained in:
Tim Nguyen 2020-02-19 17:43:04 +00:00 • committed by Emilio Cobos Álvarez
parent 31187b0180
commit 61712d1a03
3 changed files with 114 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

64
components/style/values/generics/image.rs
View file

@ -9,6 +9,7 @@
use crate::custom_properties;
use crate::values::serialize_atom_identifier;
use crate::Atom;
use crate::Zero;
use servo_arc::Arc;
use std::fmt::{self, Write};
use style_traits::{CssWriter, ToCss};
@ -57,6 +58,8 @@ pub enum GenericGradient<
NonNegativeLength,
NonNegativeLengthPercentage,
Position,
Angle,
AngleOrPercentage,
Color,
> {
/// A linear gradient.
@ -83,6 +86,17 @@ pub enum GenericGradient<
/// Compatibility mode.
compat_mode: GradientCompatMode,
},
/// A conic gradient.
Conic {
/// Start angle of gradient
angle: Angle,
/// Center of gradient
position: Position,
/// The color stops and interpolation hints.
items: crate::OwnedSlice<GenericGradientItem<Color, AngleOrPercentage>>,
/// True if this is a repeating gradient.
repeating: bool,
},
}
pub use self::GenericGradient as Gradient;
@ -308,13 +322,15 @@ where
}
}
impl<D, LP, NL, NLP, P, C> ToCss for Gradient<D, LP, NL, NLP, P, C>
impl<D, LP, NL, NLP, P, A: Zero, AoP, C> ToCss for Gradient<D, LP, NL, NLP, P, A, AoP, C>
where
D: LineDirection,
LP: ToCss,
NL: ToCss,
NLP: ToCss,
P: ToCss,
A: ToCss,
AoP: ToCss,
C: ToCss,
{
fn to_css<W>(&self, dest: &mut CssWriter<W>) -> fmt::Result
@ -324,6 +340,7 @@ where
let (compat_mode, repeating) = match *self {
Gradient::Linear { compat_mode, repeating, .. } => (compat_mode, repeating),
Gradient::Radial { compat_mode, repeating, .. } => (compat_mode, repeating),
Gradient::Conic { repeating, .. } => (GradientCompatMode::Modern, repeating),
};
match compat_mode {
@ -336,17 +353,24 @@ where
dest.write_str("repeating-")?;
}
let (items, mut skip_comma) = match *self {
Gradient::Linear { ref direction, compat_mode, ref items, .. } => {
match *self {
Gradient::Linear { ref direction, ref items, compat_mode, .. } => {
dest.write_str("linear-gradient(")?;
if !direction.points_downwards(compat_mode) {
let mut skip_comma = if !direction.points_downwards(compat_mode) {
direction.to_css(dest, compat_mode)?;
(items, false)
false
} else {
(items, true)
true
};
for item in &**items {
if !skip_comma {
dest.write_str(", ")?;
}
skip_comma = false;
item.to_css(dest)?;
}
},
Gradient::Radial { ref shape, ref position, compat_mode, ref items, .. } => {
Gradient::Radial { ref shape, ref position, ref items, compat_mode, .. } => {
dest.write_str("radial-gradient(")?;
let omit_shape = match *shape {
EndingShape::Ellipse(Ellipse::Extent(ShapeExtent::Cover)) |
@ -367,15 +391,25 @@ where
shape.to_css(dest)?;
}
}
(items, false)
for item in &**items {
dest.write_str(", ")?;
item.to_css(dest)?;
}
},
Gradient::Conic { ref angle, ref position, ref items, .. } => {
dest.write_str("conic-gradient(")?;
if !angle.is_zero() {
dest.write_str("from ")?;
angle.to_css(dest)?;
dest.write_str(" ")?;
}
dest.write_str("at ")?;
position.to_css(dest)?;
for item in &**items {
dest.write_str(", ")?;
item.to_css(dest)?;
}
},
};
for item in &**items {
if !skip_comma {
dest.write_str(", ")?;
}
skip_comma = false;
item.to_css(dest)?;
}
dest.write_str(")")
}