Changeset 249289 in webkit

Timestamp:

Aug 29, 2019, 1:07:36 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Use the "complicated-cases" category for computing the TFC root's height
​https://bugs.webkit.org/show_bug.cgi?id=201230
<rdar://problem/54806131>

Reviewed by Antti Koivisto.

This might change in the future but for now let's use the "complicated cases" when we need to compute the TFC's height and vertical margin.
This is very BFC specific since (block)TFC is always parented in a BFC.

• layout/blockformatting/BlockFormattingContextGeometry.cpp:

(WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/blockformatting/BlockFormattingContextGeometry.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-29  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Use the "complicated-cases" category for computing the TFC root's height
+        https://bugs.webkit.org/show_bug.cgi?id=201230
+        <rdar://problem/54806131>
+
+        Reviewed by Antti Koivisto.
+
+        This might change in the future but for now let's use the "complicated cases" when we need to compute the TFC's height and vertical margin.
+        This is very BFC specific since (block)TFC is always parented in a BFC.
+
+        * layout/blockformatting/BlockFormattingContextGeometry.cpp:
+        (WebCore::Layout::BlockFormattingContext::Geometry::inFlowHeightAndMargin):
+
 2019-08-29  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -258 +258 @@
 
     HeightAndMargin heightAndMargin;
-    // TODO: Figure out the case for the document element. Let's just complicated-case it for now.
-    if (layoutBox.isOverflowVisible() && !layoutBox.isDocumentBox())
+    // FIXME: Let's special case the table height computation for now -> figure out whether tables fall into the "inFlowNonReplacedHeightAndMargin" category.
+    if (layoutBox.establishesTableFormattingContext()) {
+        auto usedHorizontalValues = UsedHorizontalValues { layoutState.displayBoxForLayoutBox(*layoutBox.containingBlock()).contentBoxWidth() };
+        heightAndMargin = complicatedCases(layoutState, layoutBox, usedValues, usedHorizontalValues);
+    } else if (layoutBox.isOverflowVisible() && !layoutBox.isDocumentBox()) {
+        // TODO: Figure out the case for the document element. Let's just complicated-case it for now.
         heightAndMargin = inFlowNonReplacedHeightAndMargin(layoutState, layoutBox, usedValues);
-    else {
+    } else {
         // 10.6.6 Complicated cases
         // Block-level, non-replaced elements in normal flow when 'overflow' does not compute to 'visible' (except if the 'overflow' property's value has been propagated to the viewport).