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

Move CSS line-height property from InheritedBox to InheritedText

Browse source
This commit is contained in:
Mauricio Collares 2016-04-05 00:00:32 -03:00
parent bbc5c51be8
commit d8222dd63d
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/incremental.rs
View file

@ -202,7 +202,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute
get_padding.padding_top, get_padding.padding_right,
get_padding.padding_bottom, get_padding.padding_left,
get_box.width, get_box.height,
get_inheritedbox.line_height,
get_inheritedtext.line_height,
get_inheritedtext.text_align, get_inheritedtext.text_indent,
get_table.table_layout,
get_inheritedtable.border_collapse,

2
components/layout/text.rs
View file

@ -417,7 +417,7 @@ pub fn font_metrics_for_style(font_context: &mut FontContext, font_style: Arc<Fo
/// Returns the line block-size needed by the given computed style and font size.
pub fn line_height_from_style(style: &ServoComputedValues, metrics: &FontMetrics) -> Au {
let font_size = style.get_font().font_size;
match style.get_inheritedbox().line_height {
match style.get_inheritedtext().line_height {
line_height::T::Normal => metrics.line_gap,
line_height::T::Number(l) => font_size.scale_by(l),
line_height::T::Length(l) => l

4
components/style/animation.rs
View file

@ -160,7 +160,7 @@ impl PropertyAnimation {
[FontWeight; get_font; font_weight],
[Height; get_box; height],
[Left; get_position; left],
[LineHeight; get_inheritedbox; line_height],
[LineHeight; get_inheritedtext; line_height],
[MarginBottom; get_margin; margin_bottom],
[MarginLeft; get_margin; margin_left],
[MarginRight; get_margin; margin_right],
@ -258,7 +258,7 @@ impl PropertyAnimation {
[FontWeight; mutate_font; font_weight],
[Height; mutate_box; height],
[Left; mutate_position; left],
[LineHeight; mutate_inheritedbox; line_height],
[LineHeight; mutate_inheritedtext; line_height],
[MarginBottom; mutate_margin; margin_bottom],
[MarginLeft; mutate_margin; margin_left],
[MarginRight; mutate_margin; margin_right],

8
components/style/properties.mako.rs
View file

@ -674,7 +674,9 @@ pub mod longhands {
"computed::LengthOrPercentageOrNone::None",
"parse_non_negative")}
${switch_to_style_struct("InheritedBox")}
${new_style_struct("InheritedText", is_inherited=True, gecko_name="nsStyleText",
additional_methods=[Method("clone__servo_text_decorations_in_effect",
"longhands::_servo_text_decorations_in_effect::computed_value::T")])}
<%self:longhand name="line-height">
use cssparser::ToCss;
@ -1977,9 +1979,7 @@ pub mod longhands {
// CSS 2.1, Section 16 - Text
${new_style_struct("InheritedText", is_inherited=True, gecko_name="nsStyleText",
additional_methods=[Method("clone__servo_text_decorations_in_effect",
"longhands::_servo_text_decorations_in_effect::computed_value::T")])}
${switch_to_style_struct("InheritedText")}
<%self:longhand name="text-align">
pub use self::computed_value::T as SpecifiedValue;