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

style: Some preparation to start using cbindgen for shape-outside and clip-path.

Browse source 
Tweak the ShapeSourceRepresentation so that it doesn't store Option<>s.

Some renames so that GeometryBox doesn't conflict with the Gecko type, and some
other usual bits / re-exports to deal with cbindgen and generics.

Also, drive-by derive parsing of GeometryBox as it's trivial.

Doing this unfortunately is not possible without removing nsStyleImage first, so
let's do that before.

This makes us serialize in the shortest form for shape-outside, but that's what
we should do anyway.

(aside: the shapes code is a bit too generic, maybe we should unify
ClippingShape and FloatAreaShape...)

Differential Revision: https://phabricator.services.mozilla.com/D62163
This commit is contained in:
Emilio Cobos Álvarez 2020-02-11 20:56:13 +00:00
parent 08175a494e
commit 4dadcf71a5
5 changed files with 76 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/style/values/specified/basic_shape.rs
View file

@ -9,8 +9,7 @@
use crate::parser::{Parse, ParserContext};
use crate::values::generics::basic_shape as generic;
use crate::values::generics::basic_shape::{GeometryBox, Path, PolygonCoord};
use crate::values::generics::basic_shape::{ShapeBox, ShapeSource};
use crate::values::generics::basic_shape::{Path, PolygonCoord, ShapeSource};
use crate::values::generics::rect::Rect;
use crate::values::specified::border::BorderRadius;
use crate::values::specified::image::Image;
@ -26,13 +25,13 @@ use style_traits::{ParseError, StyleParseErrorKind};
pub use crate::values::generics::basic_shape::FillRule;
/// A specified clipping shape.
pub type ClippingShape = generic::ClippingShape<BasicShape, SpecifiedUrl>;
pub type ClippingShape = generic::GenericClippingShape<BasicShape, SpecifiedUrl>;
/// A specified float area shape.
pub type FloatAreaShape = generic::FloatAreaShape<BasicShape, Image>;
pub type FloatAreaShape = generic::GenericFloatAreaShape<BasicShape, Image>;
/// A specified basic shape.
pub type BasicShape = generic::BasicShape<
pub type BasicShape = generic::GenericBasicShape<
HorizontalPosition,
VerticalPosition,
LengthPercentage,
@ -112,7 +111,7 @@ impl Parse for FloatAreaShape {
impl<ReferenceBox, ImageOrUrl> ShapeSource<BasicShape, ReferenceBox, ImageOrUrl>
where
ReferenceBox: Parse,
ReferenceBox: Parse + Default + PartialEq,
{
/// The internal parser for ShapeSource.
fn parse_common<'i, 't>(
@ -142,7 +141,7 @@ where
}
if let Some(shp) = shape {
return Ok(ShapeSource::Shape(Box::new(shp), ref_box));
return Ok(ShapeSource::Shape(Box::new(shp), ref_box.unwrap_or_default()));
}
ref_box
@ -151,23 +150,6 @@ where
}
}
impl Parse for GeometryBox {
fn parse<'i, 't>(
_context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
if let Ok(shape_box) = input.try(ShapeBox::parse) {
return Ok(GeometryBox::ShapeBox(shape_box));
}
try_match_ident_ignore_ascii_case! { input,
"fill-box" => Ok(GeometryBox::FillBox),
"stroke-box" => Ok(GeometryBox::StrokeBox),
"view-box" => Ok(GeometryBox::ViewBox),
}
}
}
impl Parse for BasicShape {
fn parse<'i, 't>(
context: &ParserContext,