Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-30 09:38:19 +01:00
Code Issues Projects Releases Packages Wiki Activity

Obey white-space when intrinsically sizing an IFC (#31660)

Browse source 
The old logic was assuming that all whitespace was a break opportunity,
and that no newlines would be preserved.

Note that text shaping considers the advance of a newline to be the same
as a space. This was problematic because if we have a segment with a
preserved space and newline, only the advance of the space should
contrinute to the size of the block container. Therefore, I'm changing
the breaker logic in other to have newline characters in their own
segment.

Then glyph_run_is_whitespace_ending_with_preserved_newline can just be
renamed to glyph_run_is_preserved_newline.

This patch is still not perfect because it doesn't check allow_wrap(),
so `nowrap` is treated like `normal`, and `pre-wrap` like `pre`.
This commit is contained in:
Oriol Brufau 2024-03-15 13:45:23 +01:00 • committed by GitHub
parent 74b5f798cd
commit 99c14c83ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
24 changed files with 71 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

42
components/layout_2020/flow/inline.rs
View file

@ -2248,8 +2248,8 @@ struct ContentSizesComputation<'a> {
current_line: ContentSizes,
/// Size for whitepsace pending to be added to this line.
pending_whitespace: Au,
/// Whether or not this IFC has seen any non-whitespace content.
had_non_whitespace_content_yet: bool,
/// Whether or not this IFC has seen any content, excluding collapsed whitespace.
had_content_yet: bool,
/// Stack of ending padding, margin, and border to add to the length
/// when an inline box finishes.
ending_inline_pbm_stack: Vec<Length>,
@ -2304,31 +2304,35 @@ impl<'a> ContentSizesComputation<'a> {
for run in segment.runs.iter() {
let advance = run.glyph_store.total_advance();
if !run.glyph_store.is_whitespace() {
self.had_non_whitespace_content_yet = true;
self.current_line.min_content += advance;
self.current_line.max_content += self.pending_whitespace + advance;
self.pending_whitespace = Au::zero();
} else {
if run.glyph_store.is_whitespace() {
// If this run is a forced line break, we *must* break the line
// and start measuring from the inline origin once more.
if text_run.glyph_run_is_whitespace_ending_with_preserved_newline(run) {
self.had_non_whitespace_content_yet = true;
if text_run.glyph_run_is_preserved_newline(run) {
self.had_content_yet = true;
self.forced_line_break();
self.current_line = ContentSizes::zero();
continue;
}
// Discard any leading whitespace in the IFC. This will always be trimmed.
if !self.had_non_whitespace_content_yet {
let white_space =
text_run.parent_style.get_inherited_text().white_space;
// TODO: need to handle white_space.allow_wrap() too.
if !white_space.preserve_spaces() {
// Discard any leading whitespace in the IFC. This will always be trimmed.
if self.had_content_yet {
// Wait to take into account other whitespace until we see more content.
// Whitespace at the end of the IFC will always be trimmed.
self.line_break_opportunity();
self.pending_whitespace += advance;
}
continue;
}
// Wait to take into account other whitespace until we see more content.
// Whitespace at the end of the IFC will always be trimmed.
self.line_break_opportunity();
self.pending_whitespace += advance;
}
self.had_content_yet = true;
self.current_line.min_content += advance;
self.current_line.max_content += self.pending_whitespace + advance;
self.pending_whitespace = Au::zero();
}
}
},
@ -2341,7 +2345,7 @@ impl<'a> ContentSizesComputation<'a> {
self.current_line.min_content += self.pending_whitespace + outer.min_content;
self.current_line.max_content += self.pending_whitespace + outer.max_content;
self.pending_whitespace = Au::zero();
self.had_non_whitespace_content_yet = true;
self.had_content_yet = true;
},
_ => {},
});
@ -2380,7 +2384,7 @@ impl<'a> ContentSizesComputation<'a> {
paragraph: ContentSizes::zero(),
current_line: ContentSizes::zero(),
pending_whitespace: Au::zero(),
had_non_whitespace_content_yet: false,
had_content_yet: false,
ending_inline_pbm_stack: Vec::new(),
}
.traverse(inline_formatting_context)