Changeset 247927 in webkit

Timestamp:

Jul 29, 2019 4:04:43 PM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Introduce Box::establishesTableFormattingContext
​https://bugs.webkit.org/show_bug.cgi?id=200060

Reviewed by Antti Koivisto.

​https://www.w3.org/TR/CSS22/tables.html

The table generates a principal block container box called the table wrapper box that contains the table box itself and any caption boxes.
The table box is a block-level box that contains the table's internal table boxes.
The table wrapper box is block-level for 'display: table', and inline-level; for 'display: inline-table'. The table wrapper box establishes a block
formatting context, and the table box establishes a table formatting context."

• layout/layouttree/LayoutBox.cpp:

(WebCore::Layout::Box::establishesFormattingContext const):
(WebCore::Layout::Box::establishesTableFormattingContext const):
(WebCore::Layout::Box::isBlockLevelBox const):
(WebCore::Layout::Box::isInlineLevelBox const):
(WebCore::Layout::Box::isBlockContainerBox const):

• layout/layouttree/LayoutBox.h:

(WebCore::Layout::Box::isTableWrapperBox const):
(WebCore::Layout::Box::isTableBox const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/layouttree/LayoutBox.cpp (modified) (4 diffs)
• layout/layouttree/LayoutBox.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-29  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Introduce Box::establishesTableFormattingContext
+        https://bugs.webkit.org/show_bug.cgi?id=200060
+
+        Reviewed by Antti Koivisto.
+
+        https://www.w3.org/TR/CSS22/tables.html
+
+        The table generates a principal block container box called the table wrapper box that contains the table box itself and any caption boxes.
+        The table box is a block-level box that contains the table's internal table boxes.
+        The table wrapper box is block-level for 'display: table', and inline-level; for 'display: inline-table'. The table wrapper box establishes a block
+        formatting context, and the table box establishes a table formatting context."
+
+        * layout/layouttree/LayoutBox.cpp:
+        (WebCore::Layout::Box::establishesFormattingContext const):
+        (WebCore::Layout::Box::establishesTableFormattingContext const):
+        (WebCore::Layout::Box::isBlockLevelBox const):
+        (WebCore::Layout::Box::isInlineLevelBox const):
+        (WebCore::Layout::Box::isBlockContainerBox const):
+        * layout/layouttree/LayoutBox.h:
+        (WebCore::Layout::Box::isTableWrapperBox const):
+        (WebCore::Layout::Box::isTableBox const):
+
 2019-07-29  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -58 +58 @@
 bool Box::establishesFormattingContext() const
 {
-    return establishesBlockFormattingContext() || establishesInlineFormattingContext();
+    return establishesBlockFormattingContext() || establishesInlineFormattingContext() || establishesTableFormattingContext();
 }
 
@@ -81 +81 @@
 
     return false;
+}
+
+bool Box::establishesTableFormattingContext() const
+{
+    return isTableBox();
 }
 
@@ -222 +227 @@
     // Block level elements generate block level boxes.
     auto display = m_style.display();
-    return display == DisplayType::Block || display == DisplayType::ListItem || display == DisplayType::Table;
+    return display == DisplayType::Block || display == DisplayType::ListItem || (display == DisplayType::Table && !isTableWrapperBox());
 }
 
@@ -229 +234 @@
     // Inline level elements generate inline level boxes.
     auto display = m_style.display();
-    return display == DisplayType::Inline || display == DisplayType::InlineBlock || display == DisplayType::InlineTable;
+    return display == DisplayType::Inline || isInlineBlockBox() || display == DisplayType::InlineTable;
 }
 
 bool Box::isBlockContainerBox() const
 {
-    // Inline level elements generate inline level boxes.
     auto display = m_style.display();
-    return display == DisplayType::Block || display == DisplayType::ListItem || display == DisplayType::InlineBlock || display == DisplayType::TableCell || display == DisplayType::TableCaption; // TODO && !replaced element
+    return display == DisplayType::Block || display == DisplayType::ListItem || isInlineBlockBox() || isTableWrapperBox() || isTableCell() || display == DisplayType::TableCaption; // TODO && !replaced element
 }
 

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

@@ -46 +46 @@
         Document,
         Body,
+        TableWrapperBox, // The table generates a principal block container box called the table wrapper box that contains the table box and any caption boxes. 
+        TableBox, // The table box is a block-level box that contains the table's internal table boxes.
         TableCell,
         TableColumn,
@@ -77 +79 @@
     bool establishesFormattingContext() const;
     bool establishesBlockFormattingContext() const;
+    bool establishesTableFormattingContext() const;
     bool establishesBlockFormattingContextOnly() const;
     virtual bool establishesInlineFormattingContext() const { return false; }
@@ -114 +117 @@
     bool isDocumentBox() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::Document; }
     bool isBodyBox() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::Body; }
+    bool isTableWrapperBox() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::TableWrapperBox; }
+    bool isTableBox() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::TableBox; }
     bool isTableCell() const { return m_elementAttributes && m_elementAttributes.value().elementType == ElementType::TableCell; }
     bool isReplaced() const { return isImage() || isIFrame(); }