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

stylo: Update clip-path glue.

Browse source
This commit is contained in:
cku 2017-03-17 00:19:09 +08:00
parent 8835e1d887
commit e8d8b9984f
3 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

28
components/style/gecko/conversions.rs
View file

@ -439,13 +439,13 @@ pub mod basic_shape {
fn from(reference: GeometryBox) -> Self { fn from(reference: GeometryBox) -> Self {
use gecko_bindings::structs::StyleGeometryBox::*; use gecko_bindings::structs::StyleGeometryBox::*;
match reference { match reference {
GeometryBox::ShapeBox(ShapeBox::Content) => Content, GeometryBox::ShapeBox(ShapeBox::ContentBox) => ContentBox,
GeometryBox::ShapeBox(ShapeBox::Padding) => Padding, GeometryBox::ShapeBox(ShapeBox::PaddingBox) => PaddingBox,
GeometryBox::ShapeBox(ShapeBox::Border) => Border, GeometryBox::ShapeBox(ShapeBox::BorderBox) => BorderBox,
GeometryBox::ShapeBox(ShapeBox::Margin) => Margin, GeometryBox::ShapeBox(ShapeBox::MarginBox) => MarginBox,
GeometryBox::Fill => Fill, GeometryBox::FillBox => FillBox,
GeometryBox::Stroke => Stroke, GeometryBox::StrokeBox => StrokeBox,
GeometryBox::View => View, GeometryBox::ViewBox => ViewBox,
} }
} }
} }
@ -457,13 +457,13 @@ pub mod basic_shape {
fn from(reference: StyleGeometryBox) -> Self { fn from(reference: StyleGeometryBox) -> Self {
use gecko_bindings::structs::StyleGeometryBox::*; use gecko_bindings::structs::StyleGeometryBox::*;
match reference { match reference {
Content => GeometryBox::ShapeBox(ShapeBox::Content), ContentBox => GeometryBox::ShapeBox(ShapeBox::ContentBox),
Padding => GeometryBox::ShapeBox(ShapeBox::Padding), PaddingBox => GeometryBox::ShapeBox(ShapeBox::PaddingBox),
Border => GeometryBox::ShapeBox(ShapeBox::Border), BorderBox => GeometryBox::ShapeBox(ShapeBox::BorderBox),
Margin => GeometryBox::ShapeBox(ShapeBox::Margin), MarginBox => GeometryBox::ShapeBox(ShapeBox::MarginBox),
Fill => GeometryBox::Fill, FillBox => GeometryBox::FillBox,
Stroke => GeometryBox::Stroke, StrokeBox => GeometryBox::StrokeBox,
View => GeometryBox::View, ViewBox => GeometryBox::ViewBox,
other => panic!("Unexpected StyleGeometryBox::{:?} while converting to GeometryBox", other), other => panic!("Unexpected StyleGeometryBox::{:?} while converting to GeometryBox", other),
} }
} }

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

@ -2000,13 +2000,13 @@ fn static_assert() {
use properties::longhands::${shorthand}_clip::single_value::computed_value::T; use properties::longhands::${shorthand}_clip::single_value::computed_value::T;
match servo { match servo {
T::border_box => StyleGeometryBox::Border, T::border_box => StyleGeometryBox::BorderBox,
T::padding_box => StyleGeometryBox::Padding, T::padding_box => StyleGeometryBox::PaddingBox,
T::content_box => StyleGeometryBox::Content, T::content_box => StyleGeometryBox::ContentBox,
% if shorthand == "mask": % if shorthand == "mask":
T::fill_box => StyleGeometryBox::Fill, T::fill_box => StyleGeometryBox::FillBox,
T::stroke_box => StyleGeometryBox::Stroke, T::stroke_box => StyleGeometryBox::StrokeBox,
T::view_box => StyleGeometryBox::View, T::view_box => StyleGeometryBox::ViewBox,
T::no_clip => StyleGeometryBox::NoClip, T::no_clip => StyleGeometryBox::NoClip,
% elif shorthand == "background": % elif shorthand == "background":
T::text => StyleGeometryBox::Text, T::text => StyleGeometryBox::Text,
@ -2019,13 +2019,13 @@ fn static_assert() {
use properties::longhands::${shorthand}_origin::single_value::computed_value::T; use properties::longhands::${shorthand}_origin::single_value::computed_value::T;
match servo { match servo {
T::border_box => StyleGeometryBox::Border, T::border_box => StyleGeometryBox::BorderBox,
T::padding_box => StyleGeometryBox::Padding, T::padding_box => StyleGeometryBox::PaddingBox,
T::content_box => StyleGeometryBox::Content, T::content_box => StyleGeometryBox::ContentBox,
% if shorthand == "mask": % if shorthand == "mask":
T::fill_box => StyleGeometryBox::Fill, T::fill_box => StyleGeometryBox::FillBox,
T::stroke_box => StyleGeometryBox::Stroke, T::stroke_box => StyleGeometryBox::StrokeBox,
T::view_box => StyleGeometryBox::View, T::view_box => StyleGeometryBox::ViewBox,
% endif % endif
} }
</%self:simple_image_array_property> </%self:simple_image_array_property>

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

@ -859,9 +859,9 @@ impl ToCss for FillRule {
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[allow(missing_docs)] #[allow(missing_docs)]
pub enum GeometryBox { pub enum GeometryBox {
Fill, FillBox,
Stroke, StrokeBox,
View, ViewBox,
ShapeBox(ShapeBox), ShapeBox(ShapeBox),
} }
@ -871,9 +871,9 @@ impl Parse for GeometryBox {
Ok(GeometryBox::ShapeBox(shape_box)) Ok(GeometryBox::ShapeBox(shape_box))
} else { } else {
match_ignore_ascii_case! { &try!(input.expect_ident()), match_ignore_ascii_case! { &try!(input.expect_ident()),
"fill-box" => Ok(GeometryBox::Fill), "fill-box" => Ok(GeometryBox::FillBox),
"stroke-box" => Ok(GeometryBox::Stroke), "stroke-box" => Ok(GeometryBox::StrokeBox),
"view-box" => Ok(GeometryBox::View), "view-box" => Ok(GeometryBox::ViewBox),
_ => Err(()) _ => Err(())
} }
} }
@ -883,9 +883,9 @@ impl Parse for GeometryBox {
impl ToCss for GeometryBox { impl ToCss for GeometryBox {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self { match *self {
GeometryBox::Fill => dest.write_str("fill-box"), GeometryBox::FillBox => dest.write_str("fill-box"),
GeometryBox::Stroke => dest.write_str("stroke-box"), GeometryBox::StrokeBox => dest.write_str("stroke-box"),
GeometryBox::View => dest.write_str("view-box"), GeometryBox::ViewBox => dest.write_str("view-box"),
GeometryBox::ShapeBox(s) => s.to_css(dest), GeometryBox::ShapeBox(s) => s.to_css(dest),
} }
} }
@ -898,20 +898,20 @@ impl ComputedValueAsSpecified for GeometryBox {}
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
#[allow(missing_docs)] #[allow(missing_docs)]
pub enum ShapeBox { pub enum ShapeBox {
Margin, MarginBox,
// https://drafts.csswg.org/css-backgrounds-3/#box // https://drafts.csswg.org/css-backgrounds-3/#box
Border, BorderBox,
Padding, PaddingBox,
Content, ContentBox,
} }
impl Parse for ShapeBox { impl Parse for ShapeBox {
fn parse(_context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse(_context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
match_ignore_ascii_case! { &try!(input.expect_ident()), match_ignore_ascii_case! { &try!(input.expect_ident()),
"margin-box" => Ok(ShapeBox::Margin), "margin-box" => Ok(ShapeBox::MarginBox),
"border-box" => Ok(ShapeBox::Border), "border-box" => Ok(ShapeBox::BorderBox),
"padding-box" => Ok(ShapeBox::Padding), "padding-box" => Ok(ShapeBox::PaddingBox),
"content-box" => Ok(ShapeBox::Content), "content-box" => Ok(ShapeBox::ContentBox),
_ => Err(()) _ => Err(())
} }
} }
@ -920,10 +920,10 @@ impl Parse for ShapeBox {
impl ToCss for ShapeBox { impl ToCss for ShapeBox {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self { match *self {
ShapeBox::Margin => dest.write_str("margin-box"), ShapeBox::MarginBox => dest.write_str("margin-box"),
ShapeBox::Border => dest.write_str("border-box"), ShapeBox::BorderBox => dest.write_str("border-box"),
ShapeBox::Padding => dest.write_str("padding-box"), ShapeBox::PaddingBox => dest.write_str("padding-box"),
ShapeBox::Content => dest.write_str("content-box"), ShapeBox::ContentBox => dest.write_str("content-box"),
} }
} }
} }