eliott/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird synced 2026-04-27 18:17:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Validate grid-template-areas rectangles at parse time

Browse Source 
Move grid area rectangle computation and validation from layout to the
CSS parser. Named grid areas that don't form filled-in rectangles now
correctly invalidate the declaration per spec.
This commit is contained in:
Aliaksandr Kalenik
2026-02-21 12:36:20 +01:00
committed by Alexander Kalenik
parent 0206150b70
commit 795222fab3
Notes: github-actions[bot] 2026-02-21 20:47:29 +00:00 
Author: https://github.com/kalenikaliaksandr
Commit: https://github.com/LadybirdBrowser/ladybird/commit/795222fab30
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/8058
11 changed files with 136 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Libraries/LibWeb/CSS/StyleValues/GridTemplateAreaStyleValue.cpp
View File

@@ -12,26 +12,35 @@
namespace Web::CSS {
ValueComparingNonnullRefPtr<GridTemplateAreaStyleValue const> GridTemplateAreaStyleValue::create(Vector<Vector<String>> grid_template_area)
ValueComparingNonnullRefPtr<GridTemplateAreaStyleValue const> GridTemplateAreaStyleValue::create(HashMap<String, GridArea> grid_areas, size_t row_count, size_t column_count)
{
return adopt_ref(*new (nothrow) GridTemplateAreaStyleValue(grid_template_area));
return adopt_ref(*new (nothrow) GridTemplateAreaStyleValue(move(grid_areas), row_count, column_count));
}
String GridTemplateAreaStyleValue::cell_name_at(size_t row, size_t column) const
{
for (auto const& [name, area] : m_grid_areas) {
if (row >= area.row_start && row < area.row_end && column >= area.column_start && column < area.column_end)
return name;
}
return "."_string;
}
void GridTemplateAreaStyleValue::serialize(StringBuilder& builder, SerializationMode) const
{
if (m_grid_template_area.is_empty()) {
if (m_row_count == 0) {
builder.append("none"sv);
return;
}
for (size_t y = 0; y < m_grid_template_area.size(); ++y) {
for (size_t y = 0; y < m_row_count; ++y) {
if (y != 0)
builder.append(' ');
StringBuilder row_builder;
for (size_t x = 0; x < m_grid_template_area[y].size(); ++x) {
for (size_t x = 0; x < m_column_count; ++x) {
if (x != 0)
row_builder.append(' ');
row_builder.appendff("{}", m_grid_template_area[y][x]);
row_builder.append(cell_name_at(y, x));
}
serialize_a_string(builder, row_builder.string_view());
}