Changeset 249172 in webkit

Timestamp:

Aug 27, 2019, 2:24:40 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Align table formatting context code with the existing layout logic.
​https://bugs.webkit.org/show_bug.cgi?id=201168
<rdar://problem/54732633>

Reviewed by Antti Koivisto.

Let's make the TFC go through the exisint shrink-to-fit computation. Tables behave slightly different from
other shrink-to-fit boxes as they are streched to their minimum width(MIN) even when 'width' is non-auto and computed to less than MIN.

• layout/FormattingContextGeometry.cpp:

(WebCore::Layout::contentHeightForFormattingContextRoot):

• layout/blockformatting/BlockFormattingContext.h:
• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::inFlowWidthAndMargin):

• layout/tableformatting/TableFormattingContext.cpp:

(WebCore::Layout::TableFormattingContext::layout const):
(WebCore::Layout::TableFormattingContext::computedIntrinsicWidthConstraints const):
(WebCore::Layout::TableFormattingContext::computedTableWidth const):
(WebCore::Layout::TableFormattingContext::computeTableWidth const): Deleted.
(WebCore::Layout::TableFormattingContext::computeTableHeight const): Deleted.
(WebCore::Layout::TableFormattingContext::distributeAvailableHeight const): Deleted.

• layout/tableformatting/TableFormattingContext.h:
• layout/tableformatting/TableGrid.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContextGeometry.cpp (modified) (3 diffs)
• layout/blockformatting/BlockFormattingContext.h (modified) (1 diff)
• layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (1 diff)
• layout/tableformatting/TableFormattingContext.cpp (modified) (6 diffs)
• layout/tableformatting/TableFormattingContext.h (modified) (1 diff)
• layout/tableformatting/TableGrid.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-27  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Align table formatting context code with the existing layout logic.
+        https://bugs.webkit.org/show_bug.cgi?id=201168
+        <rdar://problem/54732633>
+
+        Reviewed by Antti Koivisto.
+
+        Let's make the TFC go through the exisint shrink-to-fit computation. Tables behave slightly different from
+        other shrink-to-fit boxes as they are streched to their minimum width(MIN) even when 'width' is non-auto and computed to less than MIN. 
+
+        * layout/FormattingContextGeometry.cpp:
+        (WebCore::Layout::contentHeightForFormattingContextRoot):
+        * layout/blockformatting/BlockFormattingContext.h:
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowWidthAndMargin):
+        * layout/tableformatting/TableFormattingContext.cpp:
+        (WebCore::Layout::TableFormattingContext::layout const):
+        (WebCore::Layout::TableFormattingContext::computedIntrinsicWidthConstraints const):
+        (WebCore::Layout::TableFormattingContext::computedTableWidth const):
+        (WebCore::Layout::TableFormattingContext::computeTableWidth const): Deleted.
+        (WebCore::Layout::TableFormattingContext::computeTableHeight const): Deleted.
+        (WebCore::Layout::TableFormattingContext::distributeAvailableHeight const): Deleted.
+        * layout/tableformatting/TableFormattingContext.h:
+        * layout/tableformatting/TableGrid.h:
+
 2019-08-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

@@ -32 +32 @@
 #include "FormattingState.h"
 #include "InlineFormattingState.h"
+#include "TableFormattingState.h"
+#include "TableGrid.h"
 
 namespace WebCore {
@@ -102 +104 @@
     // into account, e.g., floats inside absolutely positioned descendants or other floats are not.
     if (!is<Container>(layoutBox) || !downcast<Container>(layoutBox).hasInFlowOrFloatingChild())
-        return 0;
+        return { };
 
     auto& displayBox = layoutState.displayBoxForLayoutBox(layoutBox);
@@ -122 +124 @@
             bottom = lastDisplayBox.rectWithMargin().bottom();
         }
-    }
+    } else if (formattingRootContainer.establishesTableFormattingContext()) {
+        auto& rowList = downcast<TableFormattingState>(layoutState.establishedFormattingState(formattingRootContainer)).tableGrid().rows();
+        ASSERT(!rowList.isEmpty());
+        top += rowList.first().offset;
+        auto& lastRow = rowList.last();
+        bottom += lastRow.offset + lastRow.height;
+    } else
+        ASSERT_NOT_REACHED();
 
     auto* formattingContextRoot = &layoutBox;

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContext.h

@@ -77 +77 @@
     public:
         static HeightAndMargin inFlowHeightAndMargin(const LayoutState&, const Box&, UsedVerticalValues);
-        static WidthAndMargin inFlowWidthAndMargin(const LayoutState&, const Box&, UsedHorizontalValues);
+        static WidthAndMargin inFlowWidthAndMargin(LayoutState&, const Box&, UsedHorizontalValues);
 
         static Point staticPosition(const LayoutState&, const Box&);

trunk/Source/WebCore/layout/blockformatting/BlockFormattingContextGeometry.cpp

@@ -277 +277 @@
 }
 
-WidthAndMargin BlockFormattingContext::Geometry::inFlowWidthAndMargin(const LayoutState& layoutState, const Box& layoutBox, UsedHorizontalValues usedValues)
+WidthAndMargin BlockFormattingContext::Geometry::inFlowWidthAndMargin(LayoutState& layoutState, const Box& layoutBox, UsedHorizontalValues usedValues)
 {
     ASSERT(layoutBox.isInFlow());
 
-    if (!layoutBox.replaced())
+    if (!layoutBox.replaced()) {
+        if (layoutBox.establishesTableFormattingContext()) {
+            // This is a special table "fit-content size" behavior handling. Not in the spec though.
+            // Table returns its final width as min/max. Use this final width value to computed horizontal margins etc.
+            usedValues.width = Geometry::shrinkToFitWidth(layoutState, layoutBox, usedValues);
+        }
         return inFlowNonReplacedWidthAndMargin(layoutState, layoutBox, usedValues);
+    }
     return inFlowReplacedWidthAndMargin(layoutState, layoutBox, usedValues);
 }

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

@@ -38 +38 @@
 WTF_MAKE_ISO_ALLOCATED_IMPL(TableFormattingContext);
 
+// https://www.w3.org/TR/css-tables-3/#table-layout-algorithm
 TableFormattingContext::TableFormattingContext(const Box& formattingContextRoot, TableFormattingState& formattingState)
     : FormattingContext(formattingContextRoot, formattingState)
@@ -45 +46 @@
 void TableFormattingContext::layout() const
 {
-    // https://www.w3.org/TR/css-tables-3/#table-layout-algorithm
-    // To layout a table, user agents must apply the following actions:
+    ASSERT(!formattingState().tableGrid().cells().isEmpty());
+}
+
+FormattingContext::IntrinsicWidthConstraints TableFormattingContext::computedIntrinsicWidthConstraints() const
+{
+    // Tables have a slighty different concept of shrink to fit. It's really only different with non-auto "width" values, where
+    // a generic shrink-to fit block level box like a float box would be just sized to the computed value of "width", tables
+    // can actually be streched way over.
 
     // 1. Ensure each cell slot is occupied by at least one cell.
@@ -53 +60 @@
     computePreferredWidthForColumns();
     // 3. Compute the width of the table.
-    computeTableWidth();
-    // 4. Compute the height of the table.
-    computeTableHeight();
-    // 5. Distribute the height of the table among rows.
-    distributeAvailableHeight();
-}
-
-FormattingContext::IntrinsicWidthConstraints TableFormattingContext::computedIntrinsicWidthConstraints() const
-{
-    return { };
+    auto width = computedTableWidth();
+    // This is the actual computed table width that we want to present as min/max width.
+    return { width, width };
 }
 
@@ -121 +121 @@
 }
 
-void TableFormattingContext::computeTableWidth() const
+LayoutUnit TableFormattingContext::computedTableWidth() const
 {
     // Column and caption widths influence the final table width as follows:
@@ -165 +165 @@
     }
 
-    auto& tableDisplayBox = layoutState().displayBoxForLayoutBox(tableWrapperBox);
-    tableDisplayBox.setContentBoxWidth(usedWidth);
+    return usedWidth;
 }
 
@@ -180 +179 @@
 }
 
-void TableFormattingContext::computeTableHeight() const
-{
-}
-
-void TableFormattingContext::distributeAvailableHeight() const
-{
-}
-
 }
 }

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

@@ -45 +45 @@
 private:
     IntrinsicWidthConstraints computedIntrinsicWidthConstraints() const override;
+    LayoutUnit computedTableWidth() const;
 
     void ensureTableGrid() const;
     void computePreferredWidthForColumns() const;
-    void computeTableWidth() const;
     void distributeAvailableWidth(LayoutUnit extraHorizontalSpace) const;
-    void computeTableHeight() const;
-    void distributeAvailableHeight() const;
 
     TableFormattingState& formattingState() const { return downcast<TableFormattingState>(FormattingContext::formattingState()); }

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

@@ -102 +102 @@
 
     struct Row {
+        LayoutUnit offset;
         LayoutUnit height;
     };