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

Use generics for initial-letter

Browse source 
The former version used ComputedValueAsSpecified, which means we were storing
specified numbers and integers in the computed value.
This commit is contained in:
Anthony Ramine 2017-06-07 01:31:02 +02:00
parent f388c0ab1e
commit 7d09ce0495
7 changed files with 83 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3898,18 +3898,18 @@ fn static_assert() {
}
pub fn set_initial_letter(&mut self, v: longhands::initial_letter::computed_value::T) {
use properties::longhands::initial_letter::computed_value::T;
use values::generics::text::InitialLetter;
match v {
T::Normal => {
InitialLetter::Normal => {
self.gecko.mInitialLetterSize = 0.;
self.gecko.mInitialLetterSink = 0;
},
T::Specified(size, sink) => {
self.gecko.mInitialLetterSize = size.get();
InitialLetter::Specified(size, sink) => {
self.gecko.mInitialLetterSize = size;
if let Some(sink) = sink {
self.gecko.mInitialLetterSink = sink.value();
self.gecko.mInitialLetterSink = sink;
} else {
self.gecko.mInitialLetterSink = size.get().floor() as i32;
self.gecko.mInitialLetterSink = size.floor() as i32;
}
}
}

77
components/style/properties/longhand/text.mako.rs
View file

@ -287,72 +287,11 @@ ${helpers.predefined_type(
ignored_when_colors_disabled=True,
spec="https://drafts.csswg.org/css-text-decor/#propdef-text-decoration-color")}
<%helpers:longhand name="initial-letter"
animation_value_type="none"
products="gecko"
spec="https://drafts.csswg.org/css-inline/#sizing-drop-initials">
use std::fmt;
use style_traits::ToCss;
use values::computed::ComputedValueAsSpecified;
use values::specified::{Number, Integer};
impl ComputedValueAsSpecified for SpecifiedValue {}
no_viewport_percentage!(SpecifiedValue);
#[derive(PartialEq, Clone, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub enum SpecifiedValue {
Normal,
Specified(Number, Option<Integer>)
}
pub mod computed_value {
pub use super::SpecifiedValue as T;
}
impl ToCss for SpecifiedValue {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
match *self {
SpecifiedValue::Normal => try!(dest.write_str("normal")),
SpecifiedValue::Specified(size, sink) => {
try!(size.to_css(dest));
if let Some(sink) = sink {
try!(dest.write_str(" "));
try!(sink.to_css(dest));
}
}
};
Ok(())
}
}
#[inline]
pub fn get_initial_value() -> computed_value::T {
computed_value::T::Normal
}
#[inline]
pub fn get_initial_specified_value() -> SpecifiedValue {
SpecifiedValue::Normal
}
/// normal | <number> <integer>?
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
if input.try(|input| input.expect_ident_matching("normal")).is_ok() {
return Ok(SpecifiedValue::Normal);
}
let size = try!(Number::parse_at_least_one(context, input));
match input.try(|input| Integer::parse(context, input)) {
Ok(number) => {
if number.value() < 1 {
return Err(());
}
Ok(SpecifiedValue::Specified(size, Some(number)))
}
Err(()) => Ok(SpecifiedValue::Specified(size, None)),
}
}
</%helpers:longhand>
${helpers.predefined_type(
"initial-letter",
"InitialLetter",
"computed::InitialLetter::normal()",
initial_specified_value="specified::InitialLetter::normal()",
animation_value_type="none",
products="gecko",
spec="https://drafts.csswg.org/css-inline/#sizing-drop-initials")}