Changeset 254388 in webkit

Timestamp:

Jan 10, 2020 6:49:47 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC] TableFormattingContext::layoutTableCellBox should take HorizontalConstraints
​https://bugs.webkit.org/show_bug.cgi?id=206075
<rdar://problem/58483791>

Reviewed by Antti Koivisto.

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::layoutInFlowContent):
(WebCore::Layout::TableFormattingContext::layoutTableCellBox):

• layout/tableformatting/TableFormattingContext.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/tableformatting/TableFormattingContext.cpp (modified) (3 diffs)
• layout/tableformatting/TableFormattingContext.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-10  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] TableFormattingContext::layoutTableCellBox should take HorizontalConstraints
+        https://bugs.webkit.org/show_bug.cgi?id=206075
+        <rdar://problem/58483791>
+
+        Reviewed by Antti Koivisto.
+
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::layoutInFlowContent):
+        (WebCore::Layout::TableFormattingContext::layoutTableCellBox):
+        * layout/tableformatting/TableFormattingContext.h:
+
 2020-01-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.cpp

@@ -59 +59 @@
 }
 
-void TableFormattingContext::layoutInFlowContent(InvalidationState& invalidationState, const HorizontalConstraints&, const VerticalConstraints&)
+void TableFormattingContext::layoutInFlowContent(InvalidationState& invalidationState, const HorizontalConstraints& horizontalConstraints, const VerticalConstraints&)
 {
     auto& grid = formattingState().tableGrid();
@@ -80 +80 @@
     for (auto& cell : cellList) {
         auto& cellLayoutBox = cell->tableCellBox;
-        layoutTableCellBox(cellLayoutBox, columnList.at(cell->position.x()), invalidationState);
+        layoutTableCellBox(cellLayoutBox, columnList.at(cell->position.x()), invalidationState, horizontalConstraints);
         // FIXME: Add support for column and row spanning and this requires a 2 pass layout.
         auto& row = grid.rows().at(cell->position.y());
@@ -98 +98 @@
 }
 
-void TableFormattingContext::layoutTableCellBox(const Box& cellLayoutBox, const TableGrid::Column& column, InvalidationState& invalidationState)
-{
-    auto horizontalConstraints = Geometry::horizontalConstraintsForInFlow(geometryForBox(*cellLayoutBox.containingBlock()));
+void TableFormattingContext::layoutTableCellBox(const Box& cellLayoutBox, const TableGrid::Column& column, InvalidationState& invalidationState, const HorizontalConstraints& horizontalConstraints)
+{
     computeBorderAndPadding(cellLayoutBox, horizontalConstraints);
     // Margins do not apply to internal table elements.

trunk/Source/WebCore/layout/tableformatting/TableFormattingContext.h

@@ -60 +60 @@
 
     IntrinsicWidthConstraints computedIntrinsicWidthConstraints() override;
-    void layoutTableCellBox(const Box& cellLayoutBox, const TableGrid::Column&, InvalidationState&);
+    void layoutTableCellBox(const Box& cellLayoutBox, const TableGrid::Column&, InvalidationState&, const HorizontalConstraints&);
     void positionTableCells();
     void setComputedGeometryForRows();