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

Revert "Auto merge of #17868 - ferjm:bug1380259.radial.gradients, r=xidorn"

Browse source 
This reverts commit ef233381cc, reversing
changes made to f61528d297.

This broke a bunch of tests in m-c, like:

  https://treeherder.mozilla.org/logviewer.html#?job_id=118007409&repo=autoland
This commit is contained in:
Emilio Cobos Álvarez 2017-07-26 14:25:22 +02:00
parent ef233381cc
commit 75a844cd32
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 20 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,11 +7,10 @@
//! [images]: https://drafts.csswg.org/css-images/#image-values
use Atom;
use cssparser::{serialize_identifier, Parser};
use parser::{ParserContext, Parse};
use selectors::parser::SelectorParseError;
use cssparser::serialize_identifier;
use std::fmt;
use style_traits::{HasViewportPercentage, ParseError, ToCss};
use style_traits::{HasViewportPercentage, ToCss};
use values::computed::ComputedValueAsSpecified;
use values::specified::url::SpecifiedUrl;
/// An [image].
@ -102,54 +101,16 @@ pub enum Ellipse<LengthOrPercentage> {
}
/// https://drafts.csswg.org/css-images/#typedef-extent-keyword
#[derive(Clone, Copy, Debug, HasViewportPercentage, PartialEq, ToComputedValue)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum ShapeExtent {
/// The gradient's ending shape meets the side of the box closest to its center (for circles) or
/// meets both the vertical and horizontal sides closest to the center (for ellipses).
ClosestSide,
/// Similar to closest-side, except the ending shape is sized to meet the side of the box
/// farthest from its center (or vertical and horizontal sides).
FarthestSide,
/// The gradient's ending shape is sized so that it exactly meets the closest corner of the box
/// from its center.
ClosestCorner,
/// The gradient's ending shape is sized so that it exactly meets the closest corner of the box
/// from its center.
FarthestCorner,
/// Legacy value, equivalent to ClosestSide.
Contain,
/// Legacy value, equivalent to FarthestCorner.
Cover,
}
impl Parse for ShapeExtent {
fn parse<'i, 't>(_: &ParserContext, input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
let ident = input.expect_ident()?;
Ok(match_ignore_ascii_case! { &ident,
"closest-side" => ShapeExtent::ClosestSide,
"farthest-side" => ShapeExtent::FarthestSide,
"closest-corner" => ShapeExtent::ClosestCorner,
"farthest-corner" => ShapeExtent::FarthestCorner,
"contain" => ShapeExtent::ClosestSide,
"cover" => ShapeExtent::FarthestCorner,
_ => return Err(SelectorParseError::UnexpectedIdent(ident.clone()).into()),
})
}
}
impl ToCss for ShapeExtent {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self {
ShapeExtent::ClosestSide |
ShapeExtent::Contain => dest.write_str("closest-side"),
ShapeExtent::FarthestSide => dest.write_str("farthest-side"),
ShapeExtent::ClosestCorner => dest.write_str("closest-corner"),
ShapeExtent::FarthestCorner |
ShapeExtent::Cover => dest.write_str("farthest-corner"),
}
}
}
define_css_keyword_enum!(ShapeExtent:
"closest-side" => ClosestSide,
"farthest-side" => FarthestSide,
"closest-corner" => ClosestCorner,
"farthest-corner" => FarthestCorner,
"contain" => Contain,
"cover" => Cover
);
no_viewport_percentage!(ShapeExtent);
impl ComputedValueAsSpecified for ShapeExtent {}
/// A gradient item.
/// https://drafts.csswg.org/css-images-4/#color-stop-syntax
@ -259,12 +220,7 @@ impl<D, L, LoP, P, C, A> ToCss for Gradient<D, L, LoP, P, C, A>
{
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match self.compat_mode {
CompatMode::WebKit => {
match self.kind {
GradientKind::Radial(_, _, _) => {},
_ => dest.write_str("-webkit-")?
}
},
CompatMode::WebKit => dest.write_str("-webkit-")?,
CompatMode::Moz => dest.write_str("-moz-")?,
_ => {},
}
@ -295,11 +251,6 @@ impl<D, L, LoP, P, C, A> ToCss for Gradient<D, L, LoP, P, C, A>
}
dest.write_str("at ")?;
position.to_css(dest)?;
} else if self.compat_mode == CompatMode::WebKit {
if !omit_shape {
shape.to_css(dest)?;
}
} else {
position.to_css(dest)?;
if let Some(ref a) = *angle {