Changeset 252888 in webkit

Timestamp:

Nov 26, 2019 8:44:16 AM (4 years ago)

Author:

Antti Koivisto

Message:

[LFC] Don't leak Boxes
​https://bugs.webkit.org/show_bug.cgi?id=204616

Reviewed by Zalan Bujtas.

Store Boxes to LayoutTreeContent instead of leaking them.

This is probably not the final memory management model.

• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::TreeBuilder::buildTableStructure):
(WebCore::Layout::TreeBuilder::buildSubTree):

• layout/layouttree/LayoutTreeBuilder.h:

(WebCore::Layout::LayoutTreeContent::addBox):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-26  Antti Koivisto  <antti@apple.com>
+
+        [LFC] Don't leak Boxes
+        https://bugs.webkit.org/show_bug.cgi?id=204616
+
+        Reviewed by Zalan Bujtas.
+
+        Store Boxes to LayoutTreeContent instead of leaking them.
+        
+        This is probably not the final memory management model.
+
+        * layout/layouttree/LayoutTreeBuilder.cpp:
+        (WebCore::Layout::TreeBuilder::buildTableStructure):
+        (WebCore::Layout::TreeBuilder::buildSubTree):
+        * layout/layouttree/LayoutTreeBuilder.h:
+        (WebCore::Layout::LayoutTreeContent::addBox):
+
 2019-11-26  Manuel Rego Casasnovas  <rego@igalia.com>
 

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

@@ -67 +67 @@
 {
 }
+
+LayoutTreeContent::~LayoutTreeContent() = default;
 
 static void appendChild(Container& parent, Box& newChild)
@@ -264 +266 @@
         auto& captionContainer = downcast<Container>(*captionBox);
         buildSubTree(downcast<RenderElement>(captionRenderer), captionContainer);
-        // Temporary
-        captionBox.release();
+        m_layoutTreeContent.addBox(WTFMove(captionBox));
         tableChild = tableChild->nextSibling();
     }
@@ -277 +278 @@
         auto& sectionContainer = downcast<Container>(*sectionBox);
         buildSubTree(downcast<RenderElement>(*sectionRenderer), sectionContainer);
-        sectionBox.release();
+        m_layoutTreeContent.addBox(WTFMove(sectionBox));
         sectionRenderer = sectionRenderer->nextSibling();
     }
-    // Temporary
-    tableBox.release();
+    m_layoutTreeContent.addBox(WTFMove(tableBox));
 }
 
@@ -293 +293 @@
         else if (is<Container>(*childLayoutBox))
             buildSubTree(downcast<RenderElement>(childRenderer), downcast<Container>(*childLayoutBox));
-        // Temporary
-        childLayoutBox.release();
+
+        m_layoutTreeContent.addBox(WTFMove(childLayoutBox));
     }
 }

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

@@ -28 +28 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#include "LayoutBox.h"
 #include <wtf/IsoMalloc.h>
 #include <wtf/WeakPtr.h>
@@ -48 +49 @@
 public:
     LayoutTreeContent(const RenderBox&, std::unique_ptr<Container>);
+    ~LayoutTreeContent();
 
     const Container& rootLayoutBox() const { return *m_rootLayoutBox; }
     Container& rootLayoutBox() { return *m_rootLayoutBox; }
     const RenderBox& rootRenderer() const { return m_rootRenderer; }
+
+    void addBox(std::unique_ptr<Box> box) { m_boxes.add(WTFMove(box)); }
 
     using RenderObjectToLayoutBoxMap = HashMap<const RenderObject*, Box*>;
@@ -60 +64 @@
     const RenderBox& m_rootRenderer;
     std::unique_ptr<Container> m_rootLayoutBox;
+    HashSet<std::unique_ptr<Box>> m_boxes;
     RenderObjectToLayoutBoxMap m_renderObjectToLayoutBox;
 };