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

Auto merge of #16994 - servo:derive-all-the-things, r=emilio

Browse source 
Refactor basic shapes and fix a silly bug

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16994)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-22 11:37:28 -05:00 • committed by GitHub
commit 9a5e6fb553
7 changed files with 511 additions and 618 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/properties/gecko.mako.rs
View file

@ -3853,8 +3853,7 @@ fn static_assert() {
use gecko_bindings::structs::{StyleFillRule, StyleGeometryBox, StyleShapeSource};
use gecko::conversions::basic_shape::set_corners_from_radius;
use gecko::values::GeckoStyleCoordConvertible;
use values::computed::basic_shape::BasicShape;
use values::generics::basic_shape::{ShapeSource, FillRule};
use values::generics::basic_shape::{BasicShape, FillRule, ShapeSource};
let ref mut ${ident} = self.gecko.${gecko_ffi_name};
// clean up existing struct
unsafe { Gecko_DestroyShapeSource(${ident}) };

2
components/style/properties/longhand/box.mako.rs
View file

@ -2432,7 +2432,7 @@ ${helpers.single_keyword("-moz-orient",
}
</%helpers:longhand>
${helpers.predefined_type("shape-outside", "basic_shape::ShapeWithShapeBox",
${helpers.predefined_type("shape-outside", "basic_shape::FloatAreaShape",
"generics::basic_shape::ShapeSource::None",
products="gecko", boxed="True",
animation_value_type="none",

2
components/style/properties/longhand/svg.mako.rs
View file

@ -58,7 +58,7 @@ ${helpers.single_keyword("mask-type", "luminance alpha",
products="gecko", animation_value_type="none",
spec="https://drafts.fxtf.org/css-masking/#propdef-mask-type")}
${helpers.predefined_type("clip-path", "basic_shape::ShapeWithGeometryBox",
${helpers.predefined_type("clip-path", "basic_shape::ClippingShape",
"generics::basic_shape::ShapeSource::None",
products="gecko", boxed="True",
animation_value_type="none", flags="CREATES_STACKING_CONTEXT",