diff options
author | Boris Chiou <boris.chiou@gmail.com> | 2019-09-16 23:24:48 +0000 |
---|---|---|
committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-10-09 13:21:35 +0200 |
commit | 5e77ba9bf49ee2d16b32c690336a3b0fd996e3c1 (patch) | |
tree | 5883dc06a79b95101848f7258b78b82ce1a0df2a /components/style/gecko/conversions.rs | |
parent | 35a98af0ed5bb99735a513911184036e1a15d9db (diff) | |
download | servo-5e77ba9bf49ee2d16b32c690336a3b0fd996e3c1.tar.gz servo-5e77ba9bf49ee2d16b32c690336a3b0fd996e3c1.zip |
style: Support ray() in offset-path and make it animatable.
1. Add `generics::motion::OffsetPath`, and use specified `Angle` and
computed `Angle` to define specified `OffsetPath` and computed `OffsetPath`.
2. Add `ray` function into `OffsetPath`.
We also tweak the degree from 150deg to 135deg in wpt (e.g.
offset-path-ray-001.html and others) to avoid floating point precision issues.
For example:
```
// offset-path: ray(150deg ...);
// offset-distance: 20px;
matrix:
{
{0.500000 0.866025 0.000000 0.000000},
{-0.866025 0.500000 0.000000 0.000000},
{0.000000 0.000000 1.000000 0.000000},
{10.000000 17.320509 0.000000 1.000000}
}
// rotate(60deg) translate(20px)
matrix:
{
{0.500000 0.866025 0.000000 0.000000},
{-0.866025 0.500000 0.000000 0.000000},
{0.000000 0.000000 1.000000 0.000000},
{10.000000 17.320507 0.000000 1.000000}
}
```
Their translate parts, 17.320509 vs 17.320507, are almost the same (only
tiny difference), which may cause the reftest failed.
Differential Revision: https://phabricator.services.mozilla.com/D42721
Diffstat (limited to 'components/style/gecko/conversions.rs')
-rw-r--r-- | components/style/gecko/conversions.rs | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/components/style/gecko/conversions.rs b/components/style/gecko/conversions.rs index 5b777e89033..e2b959431a4 100644 --- a/components/style/gecko/conversions.rs +++ b/components/style/gecko/conversions.rs @@ -42,7 +42,7 @@ impl nsStyleImage { image_rect.left, ); } - }, + } GenericImage::Element(ref element) => unsafe { bindings::Gecko_SetImageElement(self, element.as_ptr()); }, @@ -76,16 +76,16 @@ impl nsStyleImage { left: rect.3, }))) } - }, + } nsStyleImageType::eStyleImageType_Gradient => { let gradient: &Gradient = &**self.__bindgen_anon_1.mGradient.as_ref(); Some(GenericImage::Gradient(Box::new(gradient.clone()))) - }, + } nsStyleImageType::eStyleImageType_Element => { use crate::gecko_string_cache::Atom; let atom = bindings::Gecko_GetImageElement(self); Some(GenericImage::Element(Atom::from_raw(atom))) - }, + } } } @@ -128,13 +128,13 @@ pub mod basic_shape { Some(self.mReferenceBox.into()) }; Some(ShapeSource::Shape(shape, reference_box)) - }, + } StyleShapeSourceType::Image => None, StyleShapeSourceType::Path => { let path = self.to_svg_path().expect("expect an SVGPathData"); let fill = unsafe { &*self.__bindgen_anon_1.mSVGPath.as_ref().mPtr }.mFillRule; Some(ShapeSource::Path(Path { fill, path })) - }, + } } } @@ -144,7 +144,7 @@ pub mod basic_shape { StyleShapeSourceType::Path => { let gecko_path = unsafe { &*self.__bindgen_anon_1.mSVGPath.as_ref().mPtr }; Some(SVGPathData(gecko_path.mPath.clone())) - }, + } _ => None, } } @@ -187,14 +187,15 @@ pub mod basic_shape { impl<'a> From<&'a StyleShapeSource> for OffsetPath { fn from(other: &'a StyleShapeSource) -> Self { + use crate::values::generics::motion::GenericOffsetPath; match other.mType { - StyleShapeSourceType::Path => { - OffsetPath::Path(other.to_svg_path().expect("Cannot convert to SVGPathData")) - }, + StyleShapeSourceType::Path => GenericOffsetPath::Path( + other.to_svg_path().expect("Cannot convert to SVGPathData"), + ), StyleShapeSourceType::None => OffsetPath::none(), - StyleShapeSourceType::Shape | - StyleShapeSourceType::Box | - StyleShapeSourceType::Image => unreachable!("Unsupported offset-path type"), + StyleShapeSourceType::Shape + | StyleShapeSourceType::Box + | StyleShapeSourceType::Image => unreachable!("Unsupported offset-path type"), } } } |