Changeset 249085 in webkit

Timestamp:

Aug 24, 2019, 6:34:50 AM (7 years ago)

Author:

Alan Bujtas

Message:

[LFC] Box::isAnonymous() can not rely on the lack of ElementType.
​https://bugs.webkit.org/show_bug.cgi?id=201106
<rdar://problem/54660287>

Reviewed by Antti Koivisto.

Add bool m_isAnonymous member to mark anonymous layout boxes. Anonymous boxes are not rare enough to include this variable in RareData.

• layout/layouttree/LayoutBox.h:

(WebCore::Layout::Box::setIsAnonymous):

• 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) (3 diffs)
• layout/layouttree/LayoutTreeBuilder.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-08-24  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Box::isAnonymous() can not rely on the lack of ElementType.
+        https://bugs.webkit.org/show_bug.cgi?id=201106
+        <rdar://problem/54660287>
+
+        Reviewed by Antti Koivisto.
+
+        Add bool m_isAnonymous member to mark anonymous layout boxes. Anonymous boxes are not rare enough to include this variable in RareData.
+
+        * layout/layouttree/LayoutBox.h:
+        (WebCore::Layout::Box::setIsAnonymous):
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::TreeBuilder::createLayoutBox):
+
 2019-08-24  Antti Koivisto  <antti@apple.com>
 

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

@@ -44 +44 @@
     , m_baseTypeFlags(baseTypeFlags)
     , m_hasRareData(false)
+    , m_isAnonymous(false)
 {
     if (isReplaced())

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. 
+        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.
         TableColumn,
@@ -160 +160 @@
     void setPreviousSibling(Box& previousSibling) { m_previousSibling = &previousSibling; }
 
+    void setIsAnonymous() { m_isAnonymous = true; }
+
 protected:
     Box(Optional<ElementAttributes>, RenderStyle&&, BaseTypeFlags);
@@ -196 +198 @@
     unsigned m_baseTypeFlags : 6;
     bool m_hasRareData : 1;
+    bool m_isAnonymous : 1;
 };
 

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

@@ -132 +132 @@
         else
             childLayoutBox = makeUnique<Box>(downcast<RenderText>(childRenderer).originalText(), RenderStyle::createAnonymousStyleWithDisplay(parentRenderer.style(), DisplayType::Inline));
+        childLayoutBox->setIsAnonymous();
         return childLayoutBox;
     }
@@ -143 +144 @@
         // Construct the principal table wrapper box (and not the table box itself).
         childLayoutBox = makeUnique<Container>(Box::ElementAttributes { Box::ElementType::TableWrapperBox }, RenderStyle::clone(renderer.style()));
+        childLayoutBox->setIsAnonymous();
     } else if (is<RenderReplaced>(renderer)) {
         if (displayType == DisplayType::Block)
@@ -190 +192 @@
             childLayoutBox->setColumnSpan(columnSpan);
     }
+
+    if (childRenderer.isAnonymous())
+        childLayoutBox->setIsAnonymous();
 
     return childLayoutBox;