We use cookies to ensure you get the best experience on our website
首页 发现 帮助
注册 登录
0ct0pu5
/
ladybird
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

LibWeb: Add partial implementation of border conflict resolution

Fix handling of border style specified per column as well.
Andi Gallo 2 年之前
父节点
6c2712764d
当前提交
8090adf268
共有 9 个文件被更改，包括 282 次插入 和 16 次删除
合并视图 显示文件统计
  1. 70 0
      Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-col.txt
  2. 42 0
      Tests/LibWeb/Layout/input/table/border-conflict-resolution-with-col.html
  3. 1 0
      Userland/Libraries/LibWeb/HTML/AttributeNames.h
  4. 3 0
      Userland/Libraries/LibWeb/Layout/LayoutState.cpp
  5. 5 0
      Userland/Libraries/LibWeb/Layout/LayoutState.h
  6. 136 15
      Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
  7. 20 0
      Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
  8. 1 1
      Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
  9. 4 0
      Userland/Libraries/LibWeb/Painting/PaintableBox.h

+ 70 - 0
Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-col.txt
查看文件 

@@ -0,0 +1,70 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (0,0) content-size 800x181.875 [BFC] children: not-inline
 
+    BlockContainer <(anonymous)> at (0,0) content-size 800x0 children: inline
 
+      TextNode <#text>
 
+    BlockContainer <body> at (8,8) content-size 784x165.875 children: not-inline
 
+      BlockContainer <(anonymous)> at (8,8) content-size 784x0 children: inline
 
+        TextNode <#text>
 
+      TableWrapper <(anonymous)> at (8,8) content-size 64.265625x165.875 [BFC] children: not-inline
 
+        Box <table> at (8,8) content-size 64.265625x165.875 table-box [TFC] children: not-inline
 
+          BlockContainer <(anonymous)> (not painted) children: inline
 
+            TextNode <#text>
 
+          BlockContainer <colgroup> (not painted) table-column-group children: not-inline
 
+            BlockContainer <col> (not painted) children: not-inline
 
+          BlockContainer <(anonymous)> (not painted) children: inline
 
+            TextNode <#text>
 
+          Box <tbody> at (8,8) content-size 64.265625x165.875 table-row-group children: not-inline
 
+            BlockContainer <(anonymous)> (not painted) children: inline
 
+              TextNode <#text>
 
+            Box <tr> at (8,8) content-size 64.265625x43.46875 table-row children: not-inline
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (33,23) content-size 14.265625x17.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: [33,23 14.265625x17.46875]
 
+                    "A"
 
+                TextNode <#text>
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+            BlockContainer <(anonymous)> (not painted) children: inline
 
+              TextNode <#text>
 
+            Box <tr> at (8,51.46875) content-size 64.265625x39.46875 table-row children: not-inline
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (33,62.46875) content-size 14.265625x17.46875 table-cell [BFC] children: inline
 
+                line 0 width: 9.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
+                  frag 0 from TextNode start: 0, length: 1, rect: [33,62.46875 9.34375x17.46875]
 
+                    "B"
 
+                TextNode <#text>
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+            BlockContainer <(anonymous)> (not painted) children: inline
 
+              TextNode <#text>
 
+            Box <tr> at (8,90.9375) content-size 64.265625x39.46875 table-row children: not-inline
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (33,101.9375) content-size 14.265625x17.46875 table-cell [BFC] children: inline
 
+                line 0 width: 10.3125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
 
+                  frag 0 from TextNode start: 0, length: 1, rect: [33,101.9375 10.3125x17.46875]
 
+                    "C"
 
+                TextNode <#text>
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+            BlockContainer <(anonymous)> (not painted) children: inline
 
+              TextNode <#text>
 
+            Box <tr> at (8,130.40625) content-size 64.265625x43.46875 table-row children: not-inline
 
+              BlockContainer <(anonymous)> (not painted) children: inline
 
+                TextNode <#text>
 
+              BlockContainer <td> at (33,141.40625) content-size 14.265625x17.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: 0, length: 1, rect: [33,141.40625 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>
 
+      BlockContainer <(anonymous)> at (8,173.875) content-size 784x0 children: inline
 
+        TextNode <#text>

+ 42 - 0
Tests/LibWeb/Layout/input/table/border-conflict-resolution-with-col.html
查看文件 

@@ -0,0 +1,42 @@
 
+<!DOCTYPE html>
 
+<html lang="en">
 
+
 
+<head>
 
+  <title>Table with border conflict resolution with col</title>
 
+  <style>
 
+    table {
 
+      border-collapse: collapse;
 
+    }
 
+
 
+    td {
 
+      border: 1px solid black;
 
+      padding: 10px 20px;
 
+    }
 
+  </style>
 
+</head>
 
+
 
+<body>
 
+  <table>
 
+    <colgroup>
 
+      <col style="border: 5px solid black">
 
+    </colgroup>
 
+    <tbody>
 
+      <tr>
 
+        <td>A</td>
 
+      </tr>
 
+      <tr>
 
+        <td>B</td>
 
+      </tr>
 
+      <tr>
 
+        <td>C</td>
 
+      </tr>
 
+      <tr>
 
+        <td>D</td>
 
+      </tr>
 
+    </tbody>
 
+  </table>
 
+
 
+
 
+</body>
 
+
 
+</html>

+ 1 - 0
Userland/Libraries/LibWeb/HTML/AttributeNames.h
查看文件 

@@ -211,6 +211,7 @@ namespace AttributeNames {
 
     __ENUMERATE_HTML_ATTRIBUTE(shape)                      \
 
     __ENUMERATE_HTML_ATTRIBUTE(shape)                      \
 
     __ENUMERATE_HTML_ATTRIBUTE(size)                       \
 
     __ENUMERATE_HTML_ATTRIBUTE(size)                       \
 
     __ENUMERATE_HTML_ATTRIBUTE(sizes)                      \
 
     __ENUMERATE_HTML_ATTRIBUTE(sizes)                      \
 
+    __ENUMERATE_HTML_ATTRIBUTE(span)                       \
 
     __ENUMERATE_HTML_ATTRIBUTE(src)                        \
 
     __ENUMERATE_HTML_ATTRIBUTE(src)                        \
 
     __ENUMERATE_HTML_ATTRIBUTE(srcdoc)                     \
 
     __ENUMERATE_HTML_ATTRIBUTE(srcdoc)                     \
 
     __ENUMERATE_HTML_ATTRIBUTE(srclang)                    \
 
     __ENUMERATE_HTML_ATTRIBUTE(srclang)                    \

+ 3 - 0
Userland/Libraries/LibWeb/Layout/LayoutState.cpp
查看文件 

@@ -122,6 +122,9 @@ void LayoutState::commit()
 
             paintable_box.set_offset(used_values.offset);
 
             paintable_box.set_offset(used_values.offset);
 
             paintable_box.set_content_size(used_values.content_width(), used_values.content_height());
 
             paintable_box.set_content_size(used_values.content_width(), used_values.content_height());
 
             paintable_box.set_containing_line_box_fragment(used_values.containing_line_box_fragment);
 
             paintable_box.set_containing_line_box_fragment(used_values.containing_line_box_fragment);
 
+            if (used_values.override_borders_data().has_value()) {
 
+                paintable_box.set_override_borders_data(used_values.override_borders_data().value());
 
+            }
 
 
 
             if (is<Layout::BlockContainer>(box)) {
 
             if (is<Layout::BlockContainer>(box)) {
 
                 for (auto& line_box : used_values.line_boxes) {
 
                 for (auto& line_box : used_values.line_boxes) {

+ 5 - 0
Userland/Libraries/LibWeb/Layout/LayoutState.h
查看文件 

@@ -117,6 +117,9 @@ struct LayoutState {
 
         void add_floating_descendant(Box const& box) { m_floating_descendants.set(&box); }
 
         void add_floating_descendant(Box const& box) { m_floating_descendants.set(&box); }
 
         auto const& floating_descendants() const { return m_floating_descendants; }
 
         auto const& floating_descendants() const { return m_floating_descendants; }
 
 
 
+        void set_override_borders_data(Painting::BordersData const& override_borders_data) { m_override_borders_data = override_borders_data; };
 
+        auto const& override_borders_data() const { return m_override_borders_data; }
 
+
 
     private:
 
     private:
 
         AvailableSize available_width_inside() const;
 
         AvailableSize available_width_inside() const;
 
         AvailableSize available_height_inside() const;
 
         AvailableSize available_height_inside() const;
 
@@ -130,6 +133,8 @@ struct LayoutState {
 
         bool m_has_definite_height { false };
 
         bool m_has_definite_height { false };
 
 
 
         HashTable<JS::GCPtr<Box const>> m_floating_descendants;
 
         HashTable<JS::GCPtr<Box const>> m_floating_descendants;
 
+
 
+        Optional<Painting::BordersData> m_override_borders_data;
 
     };
 
     };
 
 
 
     void commit();
 
     void commit();

+ 136 - 15
Userland/Libraries/LibWeb/Layout/TableFormattingContext.cpp
查看文件 

@@ -7,6 +7,7 @@
 
 #include <LibWeb/DOM/Node.h>
 
 #include <LibWeb/DOM/Node.h>
 
 #include <LibWeb/HTML/BrowsingContext.h>
 
 #include <LibWeb/HTML/BrowsingContext.h>
 
 #include <LibWeb/HTML/HTMLTableCellElement.h>
 
 #include <LibWeb/HTML/HTMLTableCellElement.h>
 
+#include <LibWeb/HTML/HTMLTableColElement.h>
 
 #include <LibWeb/Layout/BlockFormattingContext.h>
 
 #include <LibWeb/Layout/BlockFormattingContext.h>
 
 #include <LibWeb/Layout/Box.h>
 
 #include <LibWeb/Layout/Box.h>
 
 #include <LibWeb/Layout/InlineFormattingContext.h>
 
 #include <LibWeb/Layout/InlineFormattingContext.h>
 
@@ -161,11 +162,10 @@ void TableFormattingContext::compute_table_measures()
 
         CSSPixels padding_left = computed_values.padding().left().to_px(cell.box, width_of_containing_block);
 
         CSSPixels padding_left = computed_values.padding().left().to_px(cell.box, width_of_containing_block);
 
         CSSPixels padding_right = computed_values.padding().right().to_px(cell.box, width_of_containing_block);
 
         CSSPixels padding_right = computed_values.padding().right().to_px(cell.box, width_of_containing_block);
 
 
 
-        auto is_left_most_cell = cell.column_index == 0;
 
-        auto is_right_most_cell = cell.column_index == m_columns.size() - 1;
 
-        auto should_hide_borders = cell.box->computed_values().border_collapse() == CSS::BorderCollapse::Collapse;
 
-        CSSPixels border_left = should_hide_borders && !is_left_most_cell ? 0 : computed_values.border_left().width;
 
-        CSSPixels border_right = should_hide_borders && !is_right_most_cell ? 0 : computed_values.border_right().width;
 
+        auto const& cell_state = m_state.get(cell.box);
 
+        auto is_collapse = cell.box->computed_values().border_collapse() == CSS::BorderCollapse::Collapse;
 
+        CSSPixels border_left = is_collapse ? cell_state.border_left : computed_values.border_left().width;
 
+        CSSPixels border_right = is_collapse ? cell_state.border_right : computed_values.border_right().width;
 
 
 
         CSSPixels width = computed_values.width().to_px(cell.box, width_of_containing_block);
 
         CSSPixels width = computed_values.width().to_px(cell.box, width_of_containing_block);
 
         auto cell_intrinsic_offsets = padding_left + padding_right + border_left + border_right;
 
         auto cell_intrinsic_offsets = padding_left + padding_right + border_left + border_right;
 
@@ -499,16 +499,12 @@ void TableFormattingContext::compute_table_height(LayoutMode layout_mode)
 
         cell_state.padding_left = cell.box->computed_values().padding().left().to_px(cell.box, width_of_containing_block);
 
         cell_state.padding_left = cell.box->computed_values().padding().left().to_px(cell.box, width_of_containing_block);
 
         cell_state.padding_right = cell.box->computed_values().padding().right().to_px(cell.box, width_of_containing_block);
 
         cell_state.padding_right = cell.box->computed_values().padding().right().to_px(cell.box, width_of_containing_block);
 
 
 
-        auto is_top_most_cell = cell.row_index == 0;
 
-        auto is_left_most_cell = cell.column_index == 0;
 
-        auto is_right_most_cell = cell.column_index == m_columns.size() - 1;
 
-        auto is_bottom_most_cell = cell.row_index == m_rows.size() - 1;
 
-        auto should_hide_borders = cell.box->computed_values().border_collapse() == CSS::BorderCollapse::Collapse;
 
-
 
-        cell_state.border_top = (should_hide_borders && is_top_most_cell) ? 0 : cell.box->computed_values().border_top().width;
 
-        cell_state.border_bottom = (should_hide_borders && is_bottom_most_cell) ? 0 : cell.box->computed_values().border_bottom().width;
 
-        cell_state.border_left = (should_hide_borders && is_left_most_cell) ? 0 : cell.box->computed_values().border_left().width;
 
-        cell_state.border_right = (should_hide_borders && is_right_most_cell) ? 0 : cell.box->computed_values().border_right().width;
 
+        if (cell.box->computed_values().border_collapse() == CSS::BorderCollapse::Separate) {
 
+            cell_state.border_top = cell.box->computed_values().border_top().width;
 
+            cell_state.border_bottom = cell.box->computed_values().border_bottom().width;
 
+            cell_state.border_left = cell.box->computed_values().border_left().width;
 
+            cell_state.border_right = cell.box->computed_values().border_right().width;
 
+        }
 
 
 
         auto cell_computed_height = cell.box->computed_values().height();
 
         auto cell_computed_height = cell.box->computed_values().height();
 
         if (cell_computed_height.is_length()) {
 
         if (cell_computed_height.is_length()) {
 
@@ -744,6 +740,84 @@ void TableFormattingContext::position_cell_boxes()
 
     }
 
     }
 
 }
 
 }
 
 
 
+static const CSS::BorderData& winning_border_style(const CSS::BorderData& a, const CSS::BorderData& b)
 
+{
 
+    // Implements steps 1, 2 and 3 of border conflict resolution algorithm.
 
+    static HashMap<CSS::LineStyle, unsigned> const line_style_score = {
 
+        { CSS::LineStyle::Inset, 0 },
 
+        { CSS::LineStyle::Groove, 1 },
 
+        { CSS::LineStyle::Outset, 2 },
 
+        { CSS::LineStyle::Ridge, 3 },
 
+        { CSS::LineStyle::Dotted, 4 },
 
+        { CSS::LineStyle::Dashed, 5 },
 
+        { CSS::LineStyle::Solid, 6 },
 
+        { CSS::LineStyle::Double, 7 },
 
+    };
 
+    if (a.line_style == CSS::LineStyle::Hidden) {
 
+        return a;
 
+    }
 
+    if (b.line_style == CSS::LineStyle::Hidden) {
 
+        return b;
 
+    }
 
+    if (a.line_style == CSS::LineStyle::None) {
 
+        return b;
 
+    }
 
+    if (b.line_style == CSS::LineStyle::None) {
 
+        return a;
 
+    }
 
+    if (a.width > b.width) {
 
+        return a;
 
+    } else if (a.width < b.width) {
 
+        return b;
 
+    }
 
+    if (*line_style_score.get(a.line_style) > *line_style_score.get(b.line_style)) {
 
+        return a;
 
+    } else if (*line_style_score.get(a.line_style) < *line_style_score.get(b.line_style)) {
 
+        return b;
 
+    }
 
+    return a;
 
+}
 
+
 
+void TableFormattingContext::border_conflict_resolution()
 
+{
 
+    // Partially implements border conflict resolution, as described in
 
+    // https://www.w3.org/TR/CSS22/tables.html#border-conflict-resolution
 
+    BorderConflictFinder finder(this);
 
+    for (auto& cell : m_cells) {
 
+        if (cell.box->computed_values().border_collapse() == CSS::BorderCollapse::Separate) {
 
+            continue;
 
+        }
 
+        // Execute steps 1, 2 and 3 of the algorithm for each edge.
 
+        Painting::BordersData override_borders_data;
 
+        auto const& cell_style = cell.box->computed_values();
 
+        auto& cell_state = m_state.get_mutable(cell.box);
 
+        for (auto const conflicting_element : finder.conflicting_elements(cell, ConflictingEdge::Left)) {
 
+            auto const& other_style = conflicting_element->computed_values();
 
+            override_borders_data.left = winning_border_style(cell_style.border_left(), other_style.border_left());
 
+            cell_state.border_left = override_borders_data.left.width;
 
+        }
 
+        for (auto const conflicting_element : finder.conflicting_elements(cell, ConflictingEdge::Right)) {
 
+            auto const& other_style = conflicting_element->computed_values();
 
+            override_borders_data.right = winning_border_style(cell_style.border_right(), other_style.border_right());
 
+            cell_state.border_right = override_borders_data.right.width;
 
+        }
 
+        for (auto const conflicting_element : finder.conflicting_elements(cell, ConflictingEdge::Top)) {
 
+            auto const& other_style = conflicting_element->computed_values();
 
+            override_borders_data.top = winning_border_style(cell_style.border_top(), other_style.border_top());
 
+            cell_state.border_top = override_borders_data.top.width;
 
+        }
 
+        for (auto const conflicting_element : finder.conflicting_elements(cell, ConflictingEdge::Bottom)) {
 
+            auto const& other_style = conflicting_element->computed_values();
 
+            override_borders_data.bottom = winning_border_style(cell_style.border_bottom(), other_style.border_bottom());
 
+            cell_state.border_bottom = override_borders_data.bottom.width;
 
+        }
 
+        // FIXME: 4. If border styles differ only in color, then a style set on a cell wins over one on a row, which wins over a
 
+        //           row group, column, column group and, lastly, table. When two elements of the same type conflict, then the one
 
+        //           further to the left (if the table's 'direction' is 'ltr'; right, if it is 'rtl') and further to the top wins.
 
+        cell_state.set_override_borders_data(override_borders_data);
 
+    }
 
+}
 
+
 
 CSSPixels TableFormattingContext::compute_row_content_height(Cell const& cell) const
 
 CSSPixels TableFormattingContext::compute_row_content_height(Cell const& cell) const
 
 {
 
 {
 
     auto& row_state = m_state.get(m_rows[cell.row_index].box);
 
     auto& row_state = m_state.get(m_rows[cell.row_index].box);
 
@@ -771,6 +845,51 @@ CSSPixels TableFormattingContext::compute_row_content_height(Cell const& cell) c
 
     return span_height;
 
     return span_height;
 
 }
 
 }
 
 
 
+TableFormattingContext::BorderConflictFinder::BorderConflictFinder(TableFormattingContext const* context)
 
+    : m_context(context)
 
+{
 
+    collect_conflicting_col_elements();
 
+}
 
+
 
+void TableFormattingContext::BorderConflictFinder::collect_conflicting_col_elements()
 
+{
 
+    m_col_elements_by_index.resize(m_context->m_columns.size());
 
+    for (auto* child = m_context->table_box().first_child(); child; child = child->next_sibling()) {
 
+        if (!child->display().is_table_column_group()) {
 
+            continue;
 
+        }
 
+        size_t column_index = 0;
 
+        for (auto* child_of_column_group = child->first_child(); child_of_column_group; child_of_column_group = child_of_column_group->next_sibling()) {
 
+            VERIFY(child_of_column_group->display().is_table_column());
 
+            auto const& col_node = static_cast<HTML::HTMLTableColElement const&>(*child_of_column_group->dom_node());
 
+            unsigned span = col_node.attribute(HTML::AttributeNames::span).to_uint().value_or(1);
 
+            for (size_t i = column_index; i < column_index + span; ++i) {
 
+                m_col_elements_by_index[i] = child_of_column_group;
 
+            }
 
+            column_index += span;
 
+        }
 
+    }
 
+}
 
+
 
+Vector<Node const*> TableFormattingContext::BorderConflictFinder::conflicting_elements(Cell const& cell, TableFormattingContext::ConflictingEdge edge) const
 
+{
 
+    // FIXME: Conflicting elements can be cells, rows, row groups, columns, column groups, and the table itself,
 
+    //        but we only consider 'col' elements in a 'colgroup', the table and the cell itself for now.
 
+    Vector<Node const*> result = { cell.box };
 
+    auto is_top = cell.row_index == 0;
 
+    auto is_left = cell.column_index == 0;
 
+    auto is_right = cell.column_index == m_context->m_columns.size() - 1;
 
+    auto is_bottom = cell.row_index == m_context->m_rows.size() - 1;
 
+    auto conflicts_top_or_bottom = (is_top && edge == ConflictingEdge::Top) || (is_bottom && edge == ConflictingEdge::Bottom);
 
+    if (conflicts_top_or_bottom || (is_left && edge == ConflictingEdge::Left) || (is_right && edge == ConflictingEdge::Right)) {
 
+        result.append(&m_context->table_box());
 
+    }
 
+    if (m_col_elements_by_index[cell.column_index] && (conflicts_top_or_bottom || edge == ConflictingEdge::Left || edge == ConflictingEdge::Right)) {
 
+        result.append(m_col_elements_by_index[cell.column_index]);
 
+    }
 
+    return result;
 
+}
 
+
 
 void TableFormattingContext::run(Box const& box, LayoutMode layout_mode, AvailableSpace const& available_space)
 
 void TableFormattingContext::run(Box const& box, LayoutMode layout_mode, AvailableSpace const& available_space)
 
 {
 
 {
 
     m_available_space = available_space;
 
     m_available_space = available_space;
 
@@ -782,6 +901,8 @@ void TableFormattingContext::run(Box const& box, LayoutMode layout_mode, Availab
 
     // Determine the number of rows/columns the table requires.
 
     // Determine the number of rows/columns the table requires.
 
     calculate_row_column_grid(box);
 
     calculate_row_column_grid(box);
 
 
 
+    border_conflict_resolution();
 
+
 
     // Compute the minimum width of each column.
 
     // Compute the minimum width of each column.
 
     compute_table_measures();
 
     compute_table_measures();

+ 20 - 0
Userland/Libraries/LibWeb/Layout/TableFormattingContext.h
查看文件 

@@ -39,6 +39,7 @@ private:
 
     void distribute_height_to_rows();
 
     void distribute_height_to_rows();
 
     void position_row_boxes(CSSPixels&);
 
     void position_row_boxes(CSSPixels&);
 
     void position_cell_boxes();
 
     void position_cell_boxes();
 
+    void border_conflict_resolution();
 
 
 
     CSSPixels m_table_height { 0 };
 
     CSSPixels m_table_height { 0 };
 
     CSSPixels m_automatic_content_height { 0 };
 
     CSSPixels m_automatic_content_height { 0 };
 
@@ -81,6 +82,25 @@ private:
 
 
 
     CSSPixels compute_row_content_height(Cell const& cell) const;
 
     CSSPixels compute_row_content_height(Cell const& cell) const;
 
 
 
+    enum class ConflictingEdge {
 
+        Top,
 
+        Right,
 
+        Bottom,
 
+        Left,
 
+    };
 
+
 
+    class BorderConflictFinder {
 
+    public:
 
+        BorderConflictFinder(TableFormattingContext const* context);
 
+        Vector<Node const*> conflicting_elements(Cell const&, ConflictingEdge) const;
 
+
 
+    private:
 
+        void collect_conflicting_col_elements();
 
+
 
+        Vector<Node const*> m_col_elements_by_index;
 
+        TableFormattingContext const* m_context;
 
+    };
 
+
 
     Vector<Cell> m_cells;
 
     Vector<Cell> m_cells;
 
     Vector<Column> m_columns;
 
     Vector<Column> m_columns;
 
     Vector<Row> m_rows;
 
     Vector<Row> m_rows;

+ 1 - 1
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
查看文件 

@@ -222,7 +222,7 @@ void PaintableBox::paint(PaintContext& context, PaintPhase phase) const
 
 
 
 void PaintableBox::paint_border(PaintContext& context) const
 
 void PaintableBox::paint_border(PaintContext& context) const
 
 {
 
 {
 
-    auto borders_data = BordersData {
 
+    auto borders_data = m_override_borders_data.has_value() ? m_override_borders_data.value() : BordersData {
 
         .top = box_model().border.top == 0 ? CSS::BorderData() : computed_values().border_top(),
 
         .top = box_model().border.top == 0 ? CSS::BorderData() : computed_values().border_top(),
 
         .right = box_model().border.right == 0 ? CSS::BorderData() : computed_values().border_right(),
 
         .right = box_model().border.right == 0 ? CSS::BorderData() : computed_values().border_right(),
 
         .bottom = box_model().border.bottom == 0 ? CSS::BorderData() : computed_values().border_bottom(),
 
         .bottom = box_model().border.bottom == 0 ? CSS::BorderData() : computed_values().border_bottom(),

+ 4 - 0
Userland/Libraries/LibWeb/Painting/PaintableBox.h
查看文件 

@@ -123,6 +123,8 @@ public:
 
 
 
     bool is_out_of_view(PaintContext&) const;
 
     bool is_out_of_view(PaintContext&) const;
 
 
 
+    void set_override_borders_data(BordersData const& override_borders_data) { m_override_borders_data = override_borders_data; };
 
+
 
 protected:
 
 protected:
 
     explicit PaintableBox(Layout::Box const&);
 
     explicit PaintableBox(Layout::Box const&);
 
 
 
@@ -161,6 +163,8 @@ private:
 
 
 
     mutable bool m_clipping_overflow { false };
 
     mutable bool m_clipping_overflow { false };
 
     Optional<BorderRadiusCornerClipper> mutable m_overflow_corner_radius_clipper;
 
     Optional<BorderRadiusCornerClipper> mutable m_overflow_corner_radius_clipper;
 
+
 
+    Optional<BordersData> m_override_borders_data;
 
 };
 
 };
 
 
 
 class PaintableWithLines final : public PaintableBox {
 
 class PaintableWithLines final : public PaintableBox {

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5