Move CSS text-overflow property from InheritedText to Text

servo · Apr 5, 2016 · 347cf05 · 347cf05
1 parent b568b72
commit 347cf05
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs
@@ -185,7 +185,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute
         get_inheritedtext.letter_spacing, get_inheritedtext.text_rendering,
         get_inheritedtext.text_transform, get_inheritedtext.word_spacing,
         get_inheritedtext.overflow_wrap, get_inheritedtext.text_justify,
-        get_inheritedtext.white_space, get_inheritedtext.word_break, get_inheritedtext.text_overflow,
+        get_inheritedtext.white_space, get_inheritedtext.word_break, get_text.text_overflow,
         get_font.font_family, get_font.font_style, get_font.font_variant, get_font.font_weight,
         get_font.font_size, get_font.font_stretch,
         get_inheritedbox.direction, get_inheritedbox.writing_mode,

diff --git a/components/layout/inline.rs b/components/layout/inline.rs
@@ -671,7 +671,7 @@ impl LineBreaker {
         let mut need_ellipsis = false;
         let available_inline_size = self.pending_line.green_zone.inline -
             self.pending_line.bounds.size.inline - indentation;
-        match (fragment.style().get_inheritedtext().text_overflow,
+        match (fragment.style().get_text().text_overflow,
                fragment.style().get_box().overflow_x) {
             (text_overflow::T::clip, _) | (_, overflow_x::T::visible) => {}
             (text_overflow::T::ellipsis, _) => {

diff --git a/components/style/properties.mako.rs b/components/style/properties.mako.rs
@@ -2162,8 +2162,6 @@ pub mod longhands {
     // TODO(pcwalton): Support `word-break: keep-all` once we have better CJK support.
     ${single_keyword("word-break", "normal break-all")}
 
-    ${single_keyword("text-overflow", "clip ellipsis")}
-
     // TODO(pcwalton): Support `text-justify: distribute`.
     ${single_keyword("text-justify", "auto none inter-word")}
 
@@ -2172,6 +2170,8 @@ pub mod longhands {
                                            Method("has_overline", "bool"),
                                            Method("has_line_through", "bool")])}
 
+    ${single_keyword("text-overflow", "clip ellipsis")}
+
     ${single_keyword("unicode-bidi", "normal embed isolate bidi-override isolate-override plaintext")}
 
     <%self:longhand name="text-decoration" custom_cascade="True">