681771d210
Previously, we determined the positions of glyphs for each text run at the time of painting, which constituted a significant portion of the painting process according to profiles. However, since we already go through each glyph to figure out the width of each fragment during layout, we can simultaneously gather data about the position of each glyph in the layout phase and utilize this information in the painting phase. I had to update expectations for a couple of reference tests. These updates are due to the fact that we now measure glyph positions during layout using a 1x font, and then linearly scale each glyph's position to device pixels during painting. This approach should be acceptable, considering we measure a fragment's width and height with an unscaled font during layout.
88 lines
3.6 KiB
C++
88 lines
3.6 KiB
C++
/*
|
|
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <AK/CharacterTypes.h>
|
|
#include <AK/TypeCasts.h>
|
|
#include <AK/Utf8View.h>
|
|
#include <LibWeb/Layout/Box.h>
|
|
#include <LibWeb/Layout/BreakNode.h>
|
|
#include <LibWeb/Layout/LineBox.h>
|
|
#include <LibWeb/Layout/Node.h>
|
|
#include <LibWeb/Layout/TextNode.h>
|
|
|
|
namespace Web::Layout {
|
|
|
|
void LineBox::add_fragment(Node const& layout_node, int start, int length, CSSPixels leading_size, CSSPixels trailing_size, CSSPixels leading_margin, CSSPixels trailing_margin, CSSPixels content_width, CSSPixels content_height, CSSPixels border_box_top, CSSPixels border_box_bottom, Span<Gfx::DrawGlyphOrEmoji const> glyph_run)
|
|
{
|
|
bool text_align_is_justify = layout_node.computed_values().text_align() == CSS::TextAlign::Justify;
|
|
if (!text_align_is_justify && !m_fragments.is_empty() && &m_fragments.last().layout_node() == &layout_node) {
|
|
auto const fragment_width = m_fragments.last().width();
|
|
// The fragment we're adding is from the last Layout::Node on the line.
|
|
// Expand the last fragment instead of adding a new one with the same Layout::Node.
|
|
m_fragments.last().m_length = (start - m_fragments.last().m_start) + length;
|
|
m_fragments.last().set_width(m_fragments.last().width() + content_width);
|
|
for (auto glyph : glyph_run) {
|
|
glyph.visit([&](auto& glyph) { glyph.position.translate_by(fragment_width.to_float(), 0); });
|
|
m_fragments.last().m_glyph_run.append(glyph);
|
|
}
|
|
} else {
|
|
Vector<Gfx::DrawGlyphOrEmoji> glyph_run_copy { glyph_run };
|
|
CSSPixels x_offset = leading_margin + leading_size + m_width;
|
|
CSSPixels y_offset = 0;
|
|
m_fragments.append(LineBoxFragment { layout_node, start, length, CSSPixelPoint(x_offset, y_offset), CSSPixelSize(content_width, content_height), border_box_top, border_box_bottom, move(glyph_run_copy) });
|
|
}
|
|
m_width += leading_margin + leading_size + content_width + trailing_size + trailing_margin;
|
|
m_height = max(m_height, content_height + border_box_top + border_box_bottom);
|
|
}
|
|
|
|
void LineBox::trim_trailing_whitespace()
|
|
{
|
|
auto should_trim = [](LineBoxFragment* fragment) {
|
|
auto ws = fragment->layout_node().computed_values().white_space();
|
|
return ws == CSS::WhiteSpace::Normal || ws == CSS::WhiteSpace::Nowrap || ws == CSS::WhiteSpace::PreLine;
|
|
};
|
|
|
|
LineBoxFragment* last_fragment = nullptr;
|
|
for (;;) {
|
|
if (m_fragments.is_empty())
|
|
return;
|
|
// last_fragment cannot be null from here on down, as m_fragments is not empty.
|
|
last_fragment = &m_fragments.last();
|
|
if (!should_trim(last_fragment))
|
|
return;
|
|
if (last_fragment->is_justifiable_whitespace()) {
|
|
m_width -= last_fragment->width();
|
|
m_fragments.remove(m_fragments.size() - 1);
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
auto last_text = last_fragment->text();
|
|
if (last_text.is_null())
|
|
return;
|
|
|
|
while (last_fragment->length()) {
|
|
auto last_character = last_text[last_fragment->length() - 1];
|
|
if (!is_ascii_space(last_character))
|
|
break;
|
|
|
|
int last_character_width = last_fragment->layout_node().font().glyph_width(last_character);
|
|
last_fragment->m_length -= 1;
|
|
last_fragment->set_width(last_fragment->width() - last_character_width);
|
|
m_width -= last_character_width;
|
|
}
|
|
}
|
|
|
|
bool LineBox::is_empty_or_ends_in_whitespace() const
|
|
{
|
|
if (m_fragments.is_empty())
|
|
return true;
|
|
|
|
return m_fragments.last().ends_in_whitespace();
|
|
}
|
|
|
|
}
|