Changeset 271134 in webkit

Timestamp:

Jan 4, 2021, 10:13:28 AM (5 years ago)

Author:

Simon Fraser

Message:

[LFC Display] Give display boxes a parent pointer
​https://bugs.webkit.org/show_bug.cgi?id=220210

Reviewed by Zalan Bujtas.

Future code will need to be able to do ancestor tree walks ("find enclosing"),
so give Display::Box a pointer to its parent ContainerBox.

• display/DisplayTreeBuilder.cpp:

(WebCore::Display::TreeBuilder::insert const):

• display/css/DisplayBox.h:

(WebCore::Display::Box::parent const):
(WebCore::Display::Box::setParent):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• display/DisplayTreeBuilder.cpp (modified) (1 diff)
• display/css/DisplayBox.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-12-31  Simon Fraser  <simon.fraser@apple.com>
+
+        [LFC Display] Give display boxes a parent pointer
+        https://bugs.webkit.org/show_bug.cgi?id=220210
+
+        Reviewed by Zalan Bujtas.
+
+        Future code will need to be able to do ancestor tree walks ("find enclosing"),
+        so give Display::Box a pointer to its parent ContainerBox.
+
+        * display/DisplayTreeBuilder.cpp:
+        (WebCore::Display::TreeBuilder::insert const):
+        * display/css/DisplayBox.h:
+        (WebCore::Display::Box::parent const):
+        (WebCore::Display::Box::setParent):
+
 2020-12-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/display/DisplayTreeBuilder.cpp

@@ -265 +265 @@
 void TreeBuilder::insert(std::unique_ptr<Box>&& box, InsertionPosition& insertionPosition) const
 {
+    box->setParent(&insertionPosition.container);
     if (insertionPosition.currentChild) {
         auto boxPtr = box.get();

trunk/Source/WebCore/display/css/DisplayBox.h

@@ -36 +36 @@
 namespace Display {
 
+class ContainerBox;
 class Tree;
 
@@ -70 +71 @@
     bool participatesInZOrderSorting() const;
 
+    ContainerBox* parent() const { return m_parent; }
+    void setParent(ContainerBox* parent) { m_parent = parent; }
+
     const Box* nextSibling() const { return m_nextSibling.get(); }
     void setNextSibling(std::unique_ptr<Box>&&);
@@ -81 +85 @@
     AbsoluteFloatRect m_absoluteBoxRect;
     Style m_style;
+    ContainerBox* m_parent { nullptr };
     std::unique_ptr<Box> m_nextSibling;
     OptionSet<TypeFlags> m_typeFlags;