Changeset 278303 in webkit

Timestamp:

Jun 1, 2021, 6:43:06 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC][Quirks] heightValueOfNearestContainingBlockWithFixedHeight should not need to cross formatting context boundary
​https://bugs.webkit.org/show_bug.cgi?id=226470

Reviewed by Antti Koivisto.

Now that the incoming vertical constraint is applied properly for the cell layout, we don't need to cross
the formatting context boundary in heightValueOfNearestContainingBlockWithFixedHeight to check if the table
box has fixed height value.

• layout/formattingContexts/table/TableFormattingQuirks.cpp:

(WebCore::Layout::TableFormattingQuirks::heightValueOfNearestContainingBlockWithFixedHeight const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/formattingContexts/table/TableFormattingQuirks.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-01  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC][Quirks] heightValueOfNearestContainingBlockWithFixedHeight should not need to cross formatting context boundary
+        https://bugs.webkit.org/show_bug.cgi?id=226470
+
+        Reviewed by Antti Koivisto.
+
+        Now that the incoming vertical constraint is applied properly for the cell layout, we don't need to cross
+        the formatting context boundary in heightValueOfNearestContainingBlockWithFixedHeight to check if the table
+        box has fixed height value.
+
+        * layout/formattingContexts/table/TableFormattingQuirks.cpp:
+        (WebCore::Layout::TableFormattingQuirks::heightValueOfNearestContainingBlockWithFixedHeight const):
+
 2021-05-27  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/layout/formattingContexts/table/TableFormattingQuirks.cpp

@@ -63 +63 @@
     // context. If we can't resolve it within the table subtree, we default it to 0.
     // e.g <div style="height: 100px"><table><tr><td style="height: 100%"></td></tr></table></div> is resolved to 0px.
-    auto& tableBox = formattingContext().root();
-    auto fixedLogicalHeight = [&](const auto& ancestorBox) -> std::optional<LayoutUnit> {
-        auto height = ancestorBox.style().logicalHeight();
-        if (!height.isFixed())
-            return { };
-        if (&ancestorBox != &tableBox)
+    for (auto& ancestor : containingBlockChainWithinFormattingContext(layoutBox)) {
+        auto height = ancestor.style().logicalHeight();
+        if (height.isFixed())
             return LayoutUnit { height.value() };
-        auto& grid = formattingContext().formattingState().tableGrid();
-        auto verticalSpacing = grid.verticalSpacing();
-        return LayoutUnit { height.value() - ((grid.rows().size() + 1) * verticalSpacing) };
-    };
-
-    for (auto& ancestor : containingBlockChain(layoutBox, tableBox.containingBlock())) {
-        if (auto fixedHeight = fixedLogicalHeight(ancestor))
-            return *fixedHeight;
     }
     return { };