Skip to content

Commit

Permalink
implemented string-valued text-overflow
Browse files Browse the repository at this point in the history
  • Loading branch information
@nikhilshagri
nikhilshagri committed Nov 9, 2016
1 parent c4bd202 commit 4b27376
Show file tree
Hide file tree
Showing 7 changed files with 91 additions and 40 deletions.
7 changes: 5 additions & 2 deletions components/layout/fragment.rs
View file
Expand Up @@ -1029,12 +1029,15 @@ impl Fragment {
}

/// Transforms this fragment into an ellipsis fragment, preserving all the other data.
pub fn transform_into_ellipsis(&self, layout_context: &LayoutContext) -> Fragment {
pub fn transform_into_ellipsis(&self,
layout_context: &LayoutContext,
text_overflow_string: String)
-> Fragment {
let mut unscanned_ellipsis_fragments = LinkedList::new();
unscanned_ellipsis_fragments.push_back(self.transform(
self.border_box.size,
SpecificFragmentInfo::UnscannedText(
box UnscannedTextFragmentInfo::new("…".to_owned(), None))));
box UnscannedTextFragmentInfo::new(text_overflow_string, None))));
let ellipsis_fragments = TextRunScanner::new().scan_for_runs(&mut layout_context.font_context(),
unscanned_ellipsis_fragments);
debug_assert!(ellipsis_fragments.len() == 1);
Expand Down
37 changes: 24 additions & 13 deletions components/layout/inline.rs
View file
Expand Up @@ -31,10 +31,10 @@ use std::collections::VecDeque;
use std::sync::Arc;
use style::arc_ptr_eq;
use style::computed_values::{display, overflow_x, position, text_align, text_justify};
use style::computed_values::{text_overflow, vertical_align, white_space};
use style::computed_values::{vertical_align, white_space};
use style::context::{SharedStyleContext, StyleContext};
use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
use style::properties::ServoComputedValues;
use style::properties::{longhands, ServoComputedValues};
use style::servo::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPOSITION, RESOLVE_GENERATED_CONTENT};
use text;
use unicode_bidi;
Expand Down Expand Up @@ -684,21 +684,30 @@ impl LineBreaker {
}

// Determine if an ellipsis will be necessary to account for `text-overflow`.
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_text().text_overflow,
fragment.style().get_box().overflow_x) {
(text_overflow::T::clip, _) | (_, overflow_x::T::visible) => {}
(text_overflow::T::ellipsis, _) => {
need_ellipsis = fragment.margin_box_inline_size() > available_inline_size;

let ellipsis = match (&fragment.style().get_text().text_overflow.first,
fragment.style().get_box().overflow_x) {
(&longhands::text_overflow::Side::Clip, _) | (_, overflow_x::T::visible) => None,
(&longhands::text_overflow::Side::Ellipsis, _) => {
if fragment.margin_box_inline_size() > available_inline_size {
Some("…".to_string())
} else {
None
}
},
(&longhands::text_overflow::Side::String(ref string), _) => {
if fragment.margin_box_inline_size() > available_inline_size {
Some(string.to_string())
} else {
None
}
}
}
};

if !need_ellipsis {
self.push_fragment_to_line_ignoring_text_overflow(fragment, layout_context);
} else {
let ellipsis = fragment.transform_into_ellipsis(layout_context);
if let Some(string) = ellipsis {
let ellipsis = fragment.transform_into_ellipsis(layout_context, string);
if let Some(truncation_info) =
fragment.truncate_to_inline_size(available_inline_size -
ellipsis.margin_box_inline_size()) {
Expand All @@ -707,6 +716,8 @@ impl LineBreaker {
self.push_fragment_to_line_ignoring_text_overflow(fragment, layout_context);
}
self.push_fragment_to_line_ignoring_text_overflow(ellipsis, layout_context);
} else {
self.push_fragment_to_line_ignoring_text_overflow(fragment, layout_context);
}

if line_flush_mode == LineFlushMode::Flush {
Expand Down
4 changes: 0 additions & 4 deletions components/style/properties/longhand/text.mako.rs
View file
Expand Up @@ -12,9 +12,6 @@
Method("has_overline", "bool"),
Method("has_line_through", "bool")]) %>

% if product == "servo":
${helpers.single_keyword("text-overflow", "clip ellipsis", animatable=False)}
% else:
<%helpers:longhand name="text-overflow" animatable="False">
use std::fmt;
use style_traits::ToCss;
Expand Down Expand Up @@ -93,7 +90,6 @@
}
}
</%helpers:longhand>
% endif

${helpers.single_keyword("unicode-bidi",
"normal embed isolate bidi-override isolate-override plaintext",
Expand Down
56 changes: 40 additions & 16 deletions tests/wpt/mozilla/meta/MANIFEST.json
View file
Expand Up @@ -5496,28 +5496,40 @@
"url": "/_mozilla/css/text_node_opacity.html"
}
],
"css/text_overflow_a.html": [
"css/text_overflow_basic_a.html": [
{
"path": "css/text_overflow_a.html",
"path": "css/text_overflow_basic_a.html",
"references": [
[
"/_mozilla/css/text_overflow_basic_ref.html",
"=="
]
],
"url": "/_mozilla/css/text_overflow_basic_a.html"
}
],
"css/text_overflow_ellipsis.html": [
{
"path": "css/text_overflow_ellipsis.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_a.html"
"url": "/_mozilla/css/text_overflow_ellipsis.html"
}
],
"css/text_overflow_basic_a.html": [
"css/text_overflow_string.html": [
{
"path": "css/text_overflow_basic_a.html",
"path": "css/text_overflow_string.html",
"references": [
[
"/_mozilla/css/text_overflow_basic_ref.html",
"=="
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_basic_a.html"
"url": "/_mozilla/css/text_overflow_string.html"
}
],
"css/text_shadow_blur_a.html": [
Expand Down Expand Up @@ -20364,28 +20376,40 @@
"url": "/_mozilla/css/text_node_opacity.html"
}
],
"css/text_overflow_a.html": [
"css/text_overflow_basic_a.html": [
{
"path": "css/text_overflow_a.html",
"path": "css/text_overflow_basic_a.html",
"references": [
[
"/_mozilla/css/text_overflow_basic_ref.html",
"=="
]
],
"url": "/_mozilla/css/text_overflow_basic_a.html"
}
],
"css/text_overflow_ellipsis.html": [
{
"path": "css/text_overflow_ellipsis.html",
"references": [
[
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_a.html"
"url": "/_mozilla/css/text_overflow_ellipsis.html"
}
],
"css/text_overflow_basic_a.html": [
"css/text_overflow_string.html": [
{
"path": "css/text_overflow_basic_a.html",
"path": "css/text_overflow_string.html",
"references": [
[
"/_mozilla/css/text_overflow_basic_ref.html",
"=="
"/_mozilla/css/text_overflow_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_overflow_basic_a.html"
"url": "/_mozilla/css/text_overflow_string.html"
}
],
"css/text_shadow_blur_a.html": [
Expand Down
5 changes: 2 additions & 3 deletions ...pt/mozilla/tests/css/text_overflow_a.html → ...lla/tests/css/text_overflow_ellipsis.html
View file
Expand Up @@ -8,14 +8,13 @@
background: gold;
text-overflow: ellipsis;
}
#hideme {
p.hidden {
overflow: hidden;
}
</style>
</head>
<body>
<p id=hideme>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
<p>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
<p class="hidden">mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
</body>
</html>

2 changes: 0 additions & 2 deletions tests/wpt/mozilla/tests/css/text_overflow_ref.html
View file
Expand Up @@ -13,5 +13,3 @@
<p>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
</body>
</html>


20 changes: 20 additions & 0 deletions tests/wpt/mozilla/tests/css/text_overflow_string.html
View file
@@ -0,0 +1,20 @@
<!DOCTYPE html>
<html>
<head>
<link rel=mismatch href=text_overflow_ref.html>
<style>
p {
width: 128px;
background: gold;
text-overflow: "[..]";
}
p.hidden {
overflow: hidden;
}
</style>
</head>
<body>
<p>mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
<p class="hidden">mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>
</body>
</html>

0 comments on commit 4b27376

Please sign in to comment.