Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1523142 - Simplify some conversion code used for mapped attributes. r=firefox-style-system-reviewers,boris

Browse Source 
These days for the types we share computed value representation we don't really
need any special code.

Differential Revision: https://phabricator.services.mozilla.com/D17763

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Emilio Cobos Álvarez 2019-01-28 00:04:06 +00:00
parent 4781ad4554
commit 7c36c5a9ae
4 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
servo/components/style/properties/longhands/border.mako.rs
View File

@ -61,15 +61,6 @@
)}
% endfor
${helpers.gecko_keyword_conversion(
Keyword('border-style',
"none solid double dotted dashed hidden groove ridge inset outset",
gecko_enum_prefix="StyleBorderStyle",
gecko_inexhaustive=True),
type="crate::values::specified::BorderStyle",
)}
// FIXME(#4126): when gfx supports painting it, make this Size2D<LengthPercentage>
% for corner in ALL_CORNERS:
<%
corner_name = corner[0]

4
servo/components/style/values/computed/box.rs
View File

@ -38,7 +38,7 @@ pub type Perspective = GenericPerspective<NonNegativeLength>;
#[allow(missing_docs)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[derive(
Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToCss,
Clone, Copy, Debug, Eq, FromPrimitive, Hash, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToCss,
)]
#[repr(u8)]
/// A computed value for the `float` property.
@ -97,7 +97,7 @@ impl ToComputedValue for SpecifiedFloat {
#[allow(missing_docs)]
#[cfg_attr(feature = "servo", derive(Deserialize, Serialize))]
#[derive(
Clone, Copy, Debug, Eq, Hash, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToCss,
Clone, Copy, Debug, Eq, FromPrimitive, Hash, MallocSizeOf, Parse, PartialEq, SpecifiedValueInfo, ToCss,
)]
/// A computed value for the `clear` property.
pub enum Clear {

1
servo/components/style/values/specified/border.rs
View File

@ -30,6 +30,7 @@ use style_traits::{CssWriter, ParseError, ToCss};
Copy,
Debug,
Eq,
FromPrimitive,
MallocSizeOf,
Ord,
Parse,

45
servo/ports/geckolib/glue.rs
View File

@ -4356,37 +4356,24 @@ pub extern "C" fn Servo_DeclarationBlock_SetKeywordValue(
use style::values::specified::Display;
use style::values::specified::{Clear, Float};
fn get_from_computed<T>(value: u32) -> T
where
T: ToComputedValue,
T::ComputedValue: FromPrimitive,
{
T::from_computed_value(&T::ComputedValue::from_u32(value).unwrap())
}
let long = get_longhand_from_id!(property);
let value = value as u32;
let prop = match_wrap_declared! { long,
MozUserModify => longhands::_moz_user_modify::SpecifiedValue::from_gecko_keyword(value),
Direction => longhands::direction::SpecifiedValue::from_gecko_keyword(value),
Display => Display::from_u32(value).unwrap(),
Float => {
const LEFT: u32 = structs::StyleFloat::Left as u32;
const RIGHT: u32 = structs::StyleFloat::Right as u32;
const NONE: u32 = structs::StyleFloat::None as u32;
match value {
LEFT => Float::Left,
RIGHT => Float::Right,
NONE => Float::None,
_ => unreachable!(),
}
},
Clear => {
const LEFT: u32 = structs::StyleClear::Left as u32;
const RIGHT: u32 = structs::StyleClear::Right as u32;
const NONE: u32 = structs::StyleClear::None as u32;
const BOTH: u32 = structs::StyleClear::Both as u32;
match value {
LEFT => Clear::Left,
RIGHT => Clear::Right,
NONE => Clear::None,
BOTH => Clear::Both,
_ => unreachable!(),
}
},
Display => get_from_computed::<Display>(value),
Float => get_from_computed::<Float>(value),
Clear => get_from_computed::<Clear>(value),
VerticalAlign => longhands::vertical_align::SpecifiedValue::from_gecko_keyword(value),
TextAlign => longhands::text_align::SpecifiedValue::from_gecko_keyword(value),
TextEmphasisPosition => longhands::text_emphasis_position::SpecifiedValue::from_gecko_keyword(value),
@ -4409,10 +4396,10 @@ pub extern "C" fn Servo_DeclarationBlock_SetKeywordValue(
MozMathVariant => longhands::_moz_math_variant::SpecifiedValue::from_gecko_keyword(value),
WhiteSpace => longhands::white_space::SpecifiedValue::from_gecko_keyword(value),
CaptionSide => longhands::caption_side::SpecifiedValue::from_gecko_keyword(value),
BorderTopStyle => BorderStyle::from_gecko_keyword(value),
BorderRightStyle => BorderStyle::from_gecko_keyword(value),
BorderBottomStyle => BorderStyle::from_gecko_keyword(value),
BorderLeftStyle => BorderStyle::from_gecko_keyword(value),
BorderTopStyle => get_from_computed::<BorderStyle>(value),
BorderRightStyle => get_from_computed::<BorderStyle>(value),
BorderBottomStyle => get_from_computed::<BorderStyle>(value),
BorderLeftStyle => get_from_computed::<BorderStyle>(value),
};
write_locked_arc(declarations, |decls: &mut PropertyDeclarationBlock| {
decls.push(prop, Importance::Normal);