beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-26 01:20:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Improve the line breaking algorithm

Browse source 
Check the width of the next token after white space to decide line
breaks. The next width can also be the total width of multiple tokens.
This better follows the CSS Text specification and matches behavior of
other browsers.

Fixes #20388.
This commit is contained in:
Andi Gallo 2023-08-19 03:36:53 +00:00 committed by Andreas Kling
parent 33b133d3f4
commit 3d7e788981
Notes: sideshowbarker 2024-07-17 03:03:37 +09:00 
Author: https://github.com/axgallo
Commit: https://github.com/SerenityOS/serenity/commit/3d7e788981
Pull-request: https://github.com/SerenityOS/serenity/pull/20657
Issue: https://github.com/SerenityOS/serenity/issues/20388
Reviewed-by: https://github.com/awesomekling
9 changed files with 227 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Tests/LibWeb/Layout/expected/nowrap-and-no-line-break-opportunity.txt Normal file
View file

@ -0,0 +1,30 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x19.46875 children: not-inline
BlockContainer <div.fixed_width> at (9,9) content-size 50x17.46875 children: inline
line 0 width: 79.40625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [9,9 33.921875x17.46875]
"ABC"
frag 1 from TextNode start: 0, length: 1, rect: [43,9 11.5625x17.46875]
"X"
frag 2 from TextNode start: 0, length: 3, rect: [54,9 33.921875x17.46875]
"ABC"
TextNode <#text>
InlineNode <span.nowrap>
TextNode <#text>
InlineNode <span>
TextNode <#text>
InlineNode <span.nowrap>
TextNode <#text>
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x19.46875]
PaintableWithLines (BlockContainer<DIV>.fixed_width) [8,8 52x19.46875] overflow: [9,9 78.921875x17.46875]
InlinePaintable (InlineNode<SPAN>.nowrap)
TextPaintable (TextNode<#text>)
InlinePaintable (InlineNode<SPAN>)
TextPaintable (TextNode<#text>)
InlinePaintable (InlineNode<SPAN>.nowrap)
TextPaintable (TextNode<#text>)

28
Tests/LibWeb/Layout/expected/space-is-soft-line-break-opportunity.txt Normal file
View file

@ -0,0 +1,28 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x37.40625 children: not-inline
BlockContainer <div.fixed_width> at (9,9) content-size 50x35.40625 children: inline
line 0 width: 33.921875, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [9,9 33.921875x17.46875]
"ABC"
line 1 width: 33.921875, height: 17.9375, bottom: 35.40625, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [9,26 33.921875x17.46875]
"ABC"
TextNode <#text>
InlineNode <span.nowrap>
TextNode <#text>
InlineNode <span>
TextNode <#text>
InlineNode <span.nowrap>
TextNode <#text>
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x37.40625]
PaintableWithLines (BlockContainer<DIV>.fixed_width) [8,8 52x37.40625]
InlinePaintable (InlineNode<SPAN>.nowrap)
TextPaintable (TextNode<#text>)
InlinePaintable (InlineNode<SPAN>)
InlinePaintable (InlineNode<SPAN>.nowrap)
TextPaintable (TextNode<#text>)

58
Tests/LibWeb/Layout/expected/table/line-breaking-in-cells.txt Normal file
View file

@ -0,0 +1,58 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x39.40625 children: not-inline
TableWrapper <(anonymous)> at (8,8) content-size 61x39.40625 [BFC] children: not-inline
Box <table> at (8,8) content-size 61x39.40625 table-box [TFC] children: not-inline
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
Box <tbody> at (8,8) content-size 61x39.40625 table-row-group children: not-inline
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
Box <tr> at (8,8) content-size 61x39.40625 table-row children: not-inline
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
BlockContainer <td> at (10,18.96875) content-size 14.296875x17.46875 table-cell [BFC] children: inline
line 0 width: 14.265625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [10,18.96875 14.265625x17.46875]
"A"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
BlockContainer <td> at (28.296875,10) content-size 20.40625x35.40625 table-cell [BFC] children: inline
line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 1, length: 1, rect: [28.296875,10 9.34375x17.46875]
"B"
line 1 width: 10.3125, height: 17.9375, bottom: 35.40625, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [28.296875,27 10.3125x17.46875]
"C"
TextNode <#text>
BreakNode <br>
TextNode <#text>
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
BlockContainer <td> at (52.703125,18.96875) content-size 14.296875x17.46875 table-cell [BFC] children: inline
line 0 width: 11.140625, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 1, length: 1, rect: [52.703125,18.96875 11.140625x17.46875]
"D"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
BlockContainer <(anonymous)> (not painted) children: inline
TextNode <#text>
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x39.40625]
PaintableWithLines (TableWrapper(anonymous)) [8,8 61x39.40625]
PaintableBox (Box<TABLE>) [8,8 61x39.40625]
PaintableBox (Box<TBODY>) [8,8 61x39.40625]
PaintableBox (Box<TR>) [8,8 61x39.40625]
PaintableWithLines (BlockContainer<TD>) [8,8 18.296875x39.40625]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<TD>) [26.296875,8 24.40625x39.40625]
TextPaintable (TextNode<#text>)
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<TD>) [50.703125,8 18.296875x39.40625]
TextPaintable (TextNode<#text>)

13
Tests/LibWeb/Layout/input/nowrap-and-no-line-break-opportunity.html Normal file
View file

@ -0,0 +1,13 @@
<style>
.fixed_width {
max-width: 50px;
border: 1px solid black;
}
.nowrap {
white-space: nowrap;
}
</style>
<div class="fixed_width">
<span class="nowrap">ABC</span><span>X</span><span class="nowrap">ABC</span>
</div>

13
Tests/LibWeb/Layout/input/space-is-soft-line-break-opportunity.html Normal file
View file

@ -0,0 +1,13 @@
<style>
.fixed_width {
max-width: 50px;
border: 1px solid black;
}
.nowrap {
white-space: nowrap;
}
</style>
<div class="fixed_width">
<span class="nowrap">ABC</span><span> </span><span class="nowrap">ABC</span>
</div>

25
Tests/LibWeb/Layout/input/table/line-breaking-in-cells.html Normal file
View file

@ -0,0 +1,25 @@
<style>
table {
border-collapse: collapse
}
td {
border: 1px solid black;
}
</style>
<table>
<tbody>
<tr>
<td style="width: 30%;">A
</td>
<td style="width: 40%;">
B
<br>C
</td>
<td style="width: 30%;">
D
</td>
</tr>
</tbody>
</table>

33
Userland/Libraries/LibWeb/Layout/InlineFormattingContext.cpp
View file

@ -250,8 +250,14 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
auto& item = item_opt.value();
// Ignore collapsible whitespace chunks at the start of line, and if the last fragment already ends in whitespace.
if (item.is_collapsible_whitespace && (line_boxes.is_empty() || line_boxes.last().is_empty_or_ends_in_whitespace()))
if (item.is_collapsible_whitespace && (line_boxes.is_empty() || line_boxes.last().is_empty_or_ends_in_whitespace())) {
if (item.node->computed_values().white_space() != CSS::WhiteSpace::Nowrap) {
auto next_width = iterator.next_non_whitespace_sequence_width();
if (next_width > 0)
line_builder.break_if_needed(next_width);
}
continue;
}
switch (item.type) {
case InlineLevelIterator::Item::Type::ForcedBreak: {
@ -287,17 +293,24 @@ void InlineFormattingContext::generate_line_boxes(LayoutMode layout_mode)
case InlineLevelIterator::Item::Type::Text: {
auto& text_node = verify_cast<Layout::TextNode>(*item.node);
if (text_node.computed_values().white_space() != CSS::WhiteSpace::Nowrap && line_builder.break_if_needed(item.border_box_width())) {
if (text_node.computed_values().white_space() != CSS::WhiteSpace::Nowrap) {
bool is_whitespace = false;
CSSPixels next_width = 0;
// If we're in a whitespace-collapsing context, we can simply check the flag.
if (item.is_collapsible_whitespace) {
is_whitespace = true;
next_width = iterator.next_non_whitespace_sequence_width();
} else {
// In whitespace-preserving contexts (white-space: pre*), we have to check manually.
auto view = text_node.text_for_rendering().substring_view(item.offset_in_node, item.length_in_node);
is_whitespace = view.is_whitespace();
if (is_whitespace)
next_width = iterator.next_non_whitespace_sequence_width();
}
// If whitespace caused us to break, we swallow the whitespace instead of
// putting it on the next line.
// If we're in a whitespace-collapsing context, we can simply check the flag.
if (item.is_collapsible_whitespace)
break;
// In whitespace-preserving contexts (white-space: pre*), we have to check manually.
auto view = text_node.text_for_rendering().substring_view(item.offset_in_node, item.length_in_node);
if (view.is_whitespace())
if (is_whitespace && next_width > 0 && line_builder.break_if_needed(item.border_box_width() + next_width))
break;
}
line_builder.append_text_chunk(

37
Userland/Libraries/LibWeb/Layout/InlineLevelIterator.cpp
View file

@ -125,6 +125,37 @@ void InlineLevelIterator::skip_to_next()
}
Optional<InlineLevelIterator::Item> InlineLevelIterator::next()
{
if (m_lookahead_items.is_empty())
return next_without_lookahead();
return m_lookahead_items.dequeue();
}
CSSPixels InlineLevelIterator::next_non_whitespace_sequence_width()
{
CSSPixels next_width = 0;
for (;;) {
auto next_item_opt = next_without_lookahead();
if (!next_item_opt.has_value())
break;
m_lookahead_items.enqueue(next_item_opt.release_value());
auto& next_item = m_lookahead_items.tail();
if (next_item.node->computed_values().white_space() != CSS::WhiteSpace::Nowrap) {
if (next_item.type != InlineLevelIterator::Item::Type::Text)
break;
if (next_item.is_collapsible_whitespace)
break;
auto& next_text_node = verify_cast<Layout::TextNode>(*(next_item.node));
auto next_view = next_text_node.text_for_rendering().substring_view(next_item.offset_in_node, next_item.length_in_node);
if (next_view.is_whitespace())
break;
}
next_width += next_item.border_box_width();
}
return next_width;
}
Optional<InlineLevelIterator::Item> InlineLevelIterator::next_without_lookahead()
{
if (!m_current_node)
return {};
@ -139,7 +170,7 @@ Optional<InlineLevelIterator::Item> InlineLevelIterator::next()
if (!chunk_opt.has_value()) {
m_text_node_context = {};
skip_to_next();
return next();
return next_without_lookahead();
}
m_text_node_context->next_chunk = m_text_node_context->chunk_iterator.next();
@ -200,12 +231,12 @@ Optional<InlineLevelIterator::Item> InlineLevelIterator::next()
if (is<Layout::ListItemMarkerBox>(*m_current_node)) {
skip_to_next();
return next();
return next_without_lookahead();
}
if (!is<Layout::Box>(*m_current_node)) {
skip_to_next();
return next();
return next_without_lookahead();
}
if (is<Layout::ReplacedBox>(*m_current_node)) {

3
Userland/Libraries/LibWeb/Layout/InlineLevelIterator.h
View file

@ -52,8 +52,10 @@ public:
InlineLevelIterator(Layout::InlineFormattingContext&, LayoutState&, Layout::BlockContainer const&, LayoutMode);
Optional<Item> next();
CSSPixels next_non_whitespace_sequence_width();
private:
Optional<Item> next_without_lookahead();
void skip_to_next();
void compute_next();
@ -96,6 +98,7 @@ private:
Optional<ExtraBoxMetrics> m_extra_trailing_metrics;
Vector<JS::NonnullGCPtr<NodeWithStyleAndBoxModelMetrics const>> m_box_model_node_stack;
Queue<InlineLevelIterator::Item> m_lookahead_items;
};
}