Changeset 249288 in webkit

Timestamp:

Aug 29, 2019, 1:03:37 PM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] The table wrapper box is a block level box
​https://bugs.webkit.org/show_bug.cgi?id=201229
<rdar://problem/54805515>

Reviewed by Antti Koivisto.

This is the anonymous box that we inject as the parent of the table caption/actual table box.

• layout/FormattingContextGeometry.cpp:

(WebCore::Layout::FormattingContext::Geometry::complicatedCases):

• layout/blockformatting/BlockFormattingContext.cpp:

(WebCore::Layout::BlockFormattingContext::computeEstimatedVerticalPositionForAncestors const):

• layout/layouttree/LayoutBox.cpp:

(WebCore::Layout::Box::establishesBlockFormattingContext const):
(WebCore::Layout::Box::isFloatAvoider const):
(WebCore::Layout::Box::isBlockLevelBox const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/FormattingContextGeometry.cpp (modified) (1 diff)
• layout/blockformatting/BlockFormattingContext.cpp (modified) (1 diff)
• layout/layouttree/LayoutBox.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-29  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] The table wrapper box is a block level box
+        https://bugs.webkit.org/show_bug.cgi?id=201229
+        <rdar://problem/54805515>
+
+        Reviewed by Antti Koivisto.
+
+        This is the anonymous box that we inject as the parent of the table caption/actual table box.
+
+        * layout/FormattingContextGeometry.cpp:
+        (WebCore::Layout::FormattingContext::Geometry::complicatedCases):
+        * layout/blockformatting/BlockFormattingContext.cpp:
+        (WebCore::Layout::BlockFormattingContext::computeEstimatedVerticalPositionForAncestors const):
+        * layout/layouttree/LayoutBox.cpp:
+        (WebCore::Layout::Box::establishesBlockFormattingContext const):
+        (WebCore::Layout::Box::isFloatAvoider const):
+        (WebCore::Layout::Box::isBlockLevelBox const):
+
 2019-08-29  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/layout/FormattingContextGeometry.cpp

@@ -728 +728 @@
     ASSERT(!layoutBox.replaced());
     // TODO: Use complicated-case for document renderer for now (see BlockFormattingContext::Geometry::inFlowHeightAndMargin).
-    ASSERT((layoutBox.isBlockLevelBox() && layoutBox.isInFlow() && !layoutBox.isOverflowVisible()) || layoutBox.isInlineBlockBox() || layoutBox.isFloatingPositioned() || layoutBox.isDocumentBox());
+    ASSERT((layoutBox.isBlockLevelBox() && layoutBox.isInFlow() && !layoutBox.isOverflowVisible()) || layoutBox.isInlineBlockBox() || layoutBox.isFloatingPositioned() || layoutBox.isDocumentBox() || layoutBox.isTableBox());
 
     // 10.6.6 Complicated cases

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

@@ -253 +253 @@
 {
     // We only need to estimate margin top for float related layout (formatting context roots avoid floats).
-    ASSERT(layoutBox.isFloatingPositioned() || layoutBox.hasFloatClear() || layoutBox.establishesBlockFormattingContext() || layoutBox.establishesInlineFormattingContext());
+    ASSERT(layoutBox.isFloatAvoider() || layoutBox.establishesInlineFormattingContext());
 
     // In order to figure out whether a box should avoid a float, we need to know the final positions of both (ignore relative positioning for now).

trunk/Source/WebCore/layout/layouttree/LayoutBox.cpp

@@ -92 +92 @@
         return true;
 
+    if (isTableWrapperBox())
+        return true;
+
     return false;
 }
@@ -177 +180 @@
 bool Box::isFloatAvoider() const
 {
-    return establishesBlockFormattingContext() || isFloatingPositioned();
+    return establishesBlockFormattingContext() || establishesTableFormattingContext() || isFloatingPositioned() || hasFloatClear();
 }
 
@@ -277 +280 @@
     // Block level elements generate block level boxes.
     auto display = m_style.display();
-    return display == DisplayType::Block || display == DisplayType::ListItem || (display == DisplayType::Table && !isTableWrapperBox());
+    return display == DisplayType::Block || display == DisplayType::ListItem || display == DisplayType::Table;
 }