Move CSS line-height property from InheritedBox to InheritedText

servo · Apr 5, 2016 · d8222dd · d8222dd
1 parent bbc5c51
commit d8222dd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs
@@ -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,

diff --git a/components/layout/text.rs b/components/layout/text.rs
@@ -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

diff --git a/components/style/animation.rs b/components/style/animation.rs
@@ -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],

diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs
@@ -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;