Backed out changeset 1fdcd69d2524 for Build Bustage. r=backout on a CLOSED TREE

Backs out https://github.com/servo/servo/pull/19376
This commit is contained in:
Gecko Backout 2017-11-26 11:00:42 +00:00 committed by moz-servo-sync
parent 286ac51c07
commit 9651a5572e
7 changed files with 272 additions and 915 deletions

View file

@ -27,7 +27,7 @@ pub enum GeometryBox {
}
/// A float area shape, for `shape-outside`.
pub type FloatAreaShape<BasicShape, Image> = ShapeSource<BasicShape, ShapeBox, Image>;
pub type FloatAreaShape<BasicShape, Url> = ShapeSource<BasicShape, ShapeBox, Url>;
// https://drafts.csswg.org/css-shapes-1/#typedef-shape-box
define_css_keyword_enum!(ShapeBox:
@ -41,9 +41,9 @@ add_impls_for_keyword_enum!(ShapeBox);
/// A shape source, for some reference box.
#[allow(missing_docs)]
#[derive(Animate, Clone, Debug, MallocSizeOf, PartialEq, ToComputedValue, ToCss)]
pub enum ShapeSource<BasicShape, ReferenceBox, ImageOrUrl> {
pub enum ShapeSource<BasicShape, ReferenceBox, Url> {
#[animation(error)]
ImageOrUrl(ImageOrUrl),
Url(Url),
Shape(
BasicShape,
#[animation(constant)]