Changeset 248594 in webkit

Timestamp:

Aug 13, 2019 8:11:53 AM (5 years ago)

Author:

Alan Bujtas

Message:

[LFC][TFC] Add rowSpan and colSpan to Box
​https://bugs.webkit.org/show_bug.cgi?id=200654
<rdar://problem/54239281>

Reviewed by Antti Koivisto.

colSpan and rowSpan are not part of the RenderStyle. We eventually need to find a more appropriate place for the "random DOM things".

• layout/layouttree/LayoutBox.cpp:

(WebCore::Layout::Box::setRowSpan):
(WebCore::Layout::Box::setColumnSpan):
(WebCore::Layout::Box::rowSpan const):
(WebCore::Layout::Box::columnSpan const):

• layout/layouttree/LayoutBox.h:
• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::TreeBuilder::createLayoutBox):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-13  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC][TFC] Add rowSpan and colSpan to Box
+        https://bugs.webkit.org/show_bug.cgi?id=200654
+        <rdar://problem/54239281>
+
+        Reviewed by Antti Koivisto.
+
+        colSpan and rowSpan are not part of the RenderStyle. We eventually need to find a more appropriate place for the "random DOM things".
+
+        * layout/layouttree/LayoutBox.cpp:
+        (WebCore::Layout::Box::setRowSpan):
+        (WebCore::Layout::Box::setColumnSpan):
+        (WebCore::Layout::Box::rowSpan const):
+        (WebCore::Layout::Box::columnSpan const):
+        * layout/layouttree/LayoutBox.h:
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::TreeBuilder::createLayoutBox):
+
 2019-08-13  Youenn Fablet  <youenn@apple.com>
 

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

@@ -409 +409 @@
 }
 
+void Box::setRowSpan(unsigned rowSpan)
+{
+    ensureRareData().rowSpan = rowSpan;
+}
+
+void Box::setColumnSpan(unsigned columnSpan)
+{
+    ensureRareData().columnSpan = columnSpan;
+}
+
+unsigned Box::rowSpan() const
+{
+    if (!hasRareData())
+        return 1;
+    return rareData().rowSpan;
+}
+
+unsigned Box::columnSpan() const
+{
+    if (!hasRareData())
+        return 1;
+    return rareData().columnSpan;
+}
+
 Box::RareDataMap& Box::rareDataMap()
 {

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

@@ -147 +147 @@
     String textContent() const;
 
+    // FIXME: Find a better place for random DOM things.
+    void setRowSpan(unsigned);
+    void setColumnSpan(unsigned);
+    unsigned rowSpan() const;
+    unsigned columnSpan() const;
+
     void setParent(Container& parent) { m_parent = &parent; }
     void setNextSibling(Box& nextSibling) { m_nextSibling = &nextSibling; }
@@ -164 +170 @@
         String textContent;
         std::unique_ptr<Replaced> replaced;
+        unsigned rowSpan { 1 };
+        unsigned columnSpan { 1 };
     };
 

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

@@ -31 +31 @@
 #include "DisplayBox.h"
 #include "DisplayRun.h"
+#include "HTMLTableCellElement.h"
 #include "InlineFormattingState.h"
 #include "LayoutBox.h"
@@ -47 +48 @@
 #include "RenderTable.h"
 #include "RenderTableCaption.h"
+#include "RenderTableCell.h"
 #include "RenderView.h"
 #include <wtf/text/TextStream.h>
@@ -179 +181 @@
         }
     }
+
+    if (is<RenderTableCell>(renderer)) {
+        auto& cellElement = downcast<HTMLTableCellElement>(*renderer.element());
+        auto rowSpan = cellElement.rowSpan();
+        if (rowSpan > 1)
+            childLayoutBox->setRowSpan(rowSpan);
+
+        auto columnSpan = cellElement.colSpan();
+        if (columnSpan > 1)
+            childLayoutBox->setColumnSpan(columnSpan);
+    }
+
     return childLayoutBox;
 }