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

Make word-spacing animatable.

Browse source
This commit is contained in:
Hiroyuki Ikezoe 2017-04-07 10:59:42 +09:00
parent c120b0b701
commit f1642eb7a6
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2902,6 +2902,19 @@ fn static_assert() {
} }
} }
pub fn clone_word_spacing(&self) -> longhands::word_spacing::computed_value::T {
use properties::longhands::word_spacing::computed_value::T;
use values::computed::LengthOrPercentage;
debug_assert!(
matches!(self.gecko.mWordSpacing.as_value(),
CoordDataValue::Normal |
CoordDataValue::Coord(_) |
CoordDataValue::Percent(_) |
CoordDataValue::Calc(_)),
"Unexpected computed value for word-spacing");
T(LengthOrPercentage::from_gecko_style_coord(&self.gecko.mWordSpacing))
}
<%call expr="impl_coord_copy('word_spacing', 'mWordSpacing')"></%call> <%call expr="impl_coord_copy('word_spacing', 'mWordSpacing')"></%call>
fn clear_text_emphasis_style_if_string(&mut self) { fn clear_text_emphasis_style_if_string(&mut self) {

5
components/style/properties/longhand/inherited_text.mako.rs
View file

@ -491,7 +491,7 @@ ${helpers.single_keyword("text-align-last",
} }
</%helpers:longhand> </%helpers:longhand>
<%helpers:longhand name="word-spacing" animation_type="none" <%helpers:longhand name="word-spacing" animation_type="normal"
spec="https://drafts.csswg.org/css-text/#propdef-word-spacing"> spec="https://drafts.csswg.org/css-text/#propdef-word-spacing">
use std::fmt; use std::fmt;
use style_traits::ToCss; use style_traits::ToCss;
@ -523,10 +523,13 @@ ${helpers.single_keyword("text-align-last",
} }
pub mod computed_value { pub mod computed_value {
use properties::animated_properties::Interpolate;
use values::computed::LengthOrPercentage; use values::computed::LengthOrPercentage;
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
pub struct T(pub Option<LengthOrPercentage>); pub struct T(pub Option<LengthOrPercentage>);
${helpers.impl_interpolate_for_option_tuple('LengthOrPercentage::zero()')}
} }
impl ToCss for computed_value::T { impl ToCss for computed_value::T {