Changeset 228429 in webkit

Timestamp:

Feb 13, 2018 12:36:41 PM (6 years ago)

Author:

Alan Bujtas

Message:

[RenderTreeBuilder] Move RenderSVG*::takeChild() to RenderTreeBuilder
​https://bugs.webkit.org/show_bug.cgi?id=182736
<rdar://problem/37503107>

Reviewed by Antti Koivisto.

No change in functionality.

• rendering/svg/RenderSVGContainer.cpp:

(WebCore::RenderSVGContainer::takeChild): Deleted.

• rendering/svg/RenderSVGContainer.h:
• rendering/svg/RenderSVGInline.cpp:

(WebCore::RenderSVGInline::takeChild): Deleted.

• rendering/svg/RenderSVGInline.h:
• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::takeChild): Deleted.

• rendering/svg/RenderSVGRoot.h:
• rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::takeChild): Deleted.

• rendering/svg/RenderSVGText.h:
• rendering/updating/RenderTreeBuilder.cpp:

(WebCore::RenderTreeBuilder::takeChild):

• rendering/updating/RenderTreeBuilderSVG.cpp:

(WebCore::RenderTreeBuilder::SVG::takeChild):

• rendering/updating/RenderTreeBuilderSVG.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/svg/RenderSVGContainer.cpp (modified) (1 diff)
• rendering/svg/RenderSVGContainer.h (modified) (1 diff)
• rendering/svg/RenderSVGInline.cpp (modified) (1 diff)
• rendering/svg/RenderSVGInline.h (modified) (1 diff)
• rendering/svg/RenderSVGRoot.cpp (modified) (1 diff)
• rendering/svg/RenderSVGRoot.h (modified) (1 diff)
• rendering/svg/RenderSVGText.cpp (modified) (1 diff)
• rendering/svg/RenderSVGText.h (modified) (1 diff)
• rendering/updating/RenderTreeBuilder.cpp (modified) (2 diffs)
• rendering/updating/RenderTreeBuilderSVG.cpp (modified) (1 diff)
• rendering/updating/RenderTreeBuilderSVG.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-13  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] Move RenderSVG*::takeChild() to RenderTreeBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=182736
+        <rdar://problem/37503107>
+
+        Reviewed by Antti Koivisto.
+
+        No change in functionality.
+
+        * rendering/svg/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::takeChild): Deleted.
+        * rendering/svg/RenderSVGContainer.h:
+        * rendering/svg/RenderSVGInline.cpp:
+        (WebCore::RenderSVGInline::takeChild): Deleted.
+        * rendering/svg/RenderSVGInline.h:
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::takeChild): Deleted.
+        * rendering/svg/RenderSVGRoot.h:
+        * rendering/svg/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::takeChild): Deleted.
+        * rendering/svg/RenderSVGText.h:
+        * rendering/updating/RenderTreeBuilder.cpp:
+        (WebCore::RenderTreeBuilder::takeChild):
+        * rendering/updating/RenderTreeBuilderSVG.cpp:
+        (WebCore::RenderTreeBuilder::SVG::takeChild):
+        * rendering/updating/RenderTreeBuilderSVG.h:
+
 2018-02-13  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/rendering/svg/RenderSVGContainer.cpp

@@ -94 +94 @@
 {
     builder.insertChildToSVGContainer(*this, WTFMove(newChild), beforeChild);
-}
-
-RenderPtr<RenderObject> RenderSVGContainer::takeChild(RenderTreeBuilder& builder, RenderObject& child)
-{
-    SVGResourcesCache::clientWillBeRemovedFromTree(child);
-    return RenderSVGModelObject::takeChild(builder, child);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGContainer.h

@@ -50 +50 @@
 
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = 0) final;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) final;
     void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final;
 

trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp

@@ -129 +129 @@
 }
 
-RenderPtr<RenderObject> RenderSVGInline::takeChild(RenderTreeBuilder& builder, RenderObject& child)
-{
-    SVGResourcesCache::clientWillBeRemovedFromTree(child);
-
-    auto* textAncestor = RenderSVGText::locateRenderSVGTextAncestor(*this);
-    if (!textAncestor)
-        return RenderInline::takeChild(builder, child);
-
-    Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
-    textAncestor->subtreeChildWillBeRemoved(&child, affectedAttributes);
-    auto takenChild = RenderInline::takeChild(builder, child);
-    textAncestor->subtreeChildWasRemoved(affectedAttributes);
-    return takenChild;
 }
-
-}

trunk/Source/WebCore/rendering/svg/RenderSVGInline.h

@@ -63 +63 @@
 
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr) final;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) final;
 };
 

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -309 +309 @@
 }
 
-RenderPtr<RenderObject> RenderSVGRoot::takeChild(RenderTreeBuilder& builder, RenderObject& child)
-{
-    SVGResourcesCache::clientWillBeRemovedFromTree(child);
-    return RenderReplaced::takeChild(builder, child);
-}
-
 // RenderBox methods will expect coordinates w/o any transforms in coordinates
 // relative to our borderBox origin.  This method gives us exactly that.

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

@@ -84 +84 @@
     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = 0) override;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) override;
 
     const AffineTransform& localToParentTransform() const override;

trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp

@@ -526 +526 @@
 }
 
-RenderPtr<RenderObject> RenderSVGText::takeChild(RenderTreeBuilder& builder, RenderObject& child)
-{
-    SVGResourcesCache::clientWillBeRemovedFromTree(child);
-
-    Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
-    subtreeChildWillBeRemoved(&child, affectedAttributes);
-    auto takenChild = RenderSVGBlock::takeChild(builder, child);
-    subtreeChildWasRemoved(affectedAttributes);
-    return takenChild;
-}
-
 // Fix for <rdar://problem/8048875>. We should not render :first-line CSS Style
 // in a SVG text element context.

trunk/Source/WebCore/rendering/svg/RenderSVGText.h

@@ -85 +85 @@
     const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
     void addChild(RenderTreeBuilder&, RenderPtr<RenderObject> child, RenderObject* beforeChild = nullptr) override;
-    RenderPtr<RenderObject> takeChild(RenderTreeBuilder&, RenderObject&) override;
     void willBeDestroyed(RenderTreeBuilder&) override;
 

trunk/Source/WebCore/rendering/updating/RenderTreeBuilder.cpp

@@ -34 +34 @@
 #include "RenderRubyBase.h"
 #include "RenderRubyRun.h"
+#include "RenderSVGContainer.h"
+#include "RenderSVGInline.h"
+#include "RenderSVGRoot.h"
 #include "RenderTable.h"
 #include "RenderTableRow.h"
@@ -210 +213 @@
         return takeChildFromRenderGrid(downcast<RenderGrid>(parent), child);
 
+    if (is<RenderSVGText>(parent))
+        return svgBuilder().takeChild(downcast<RenderSVGText>(parent), child);
+
+    if (is<RenderSVGInline>(parent))
+        return svgBuilder().takeChild(downcast<RenderSVGInline>(parent), child);
+
+    if (is<RenderSVGContainer>(parent))
+        return svgBuilder().takeChild(downcast<RenderSVGContainer>(parent), child);
+
+    if (is<RenderSVGRoot>(parent))
+        return svgBuilder().takeChild(downcast<RenderSVGRoot>(parent), child);
+
     return parent.takeChild(*this, child);
 }

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.cpp

@@ -73 +73 @@
 }
 
+RenderPtr<RenderObject> RenderTreeBuilder::SVG::takeChild(RenderSVGText& parent, RenderObject& child)
+{
+    SVGResourcesCache::clientWillBeRemovedFromTree(child);
+
+    Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
+    parent.subtreeChildWillBeRemoved(&child, affectedAttributes);
+    auto takenChild = parent.RenderBlockFlow::takeChild(m_builder, child);
+    parent.subtreeChildWasRemoved(affectedAttributes);
+    return takenChild;
 }
+
+RenderPtr<RenderObject> RenderTreeBuilder::SVG::takeChild(RenderSVGInline& parent, RenderObject& child)
+{
+    SVGResourcesCache::clientWillBeRemovedFromTree(child);
+
+    auto* textAncestor = RenderSVGText::locateRenderSVGTextAncestor(parent);
+    if (!textAncestor)
+        return parent.RenderElement::takeChild(m_builder, child);
+
+    Vector<SVGTextLayoutAttributes*, 2> affectedAttributes;
+    textAncestor->subtreeChildWillBeRemoved(&child, affectedAttributes);
+    auto takenChild = parent.RenderElement::takeChild(m_builder, child);
+    textAncestor->subtreeChildWasRemoved(affectedAttributes);
+    return takenChild;
+}
+
+RenderPtr<RenderObject> RenderTreeBuilder::SVG::takeChild(RenderSVGContainer& parent, RenderObject& child)
+{
+    SVGResourcesCache::clientWillBeRemovedFromTree(child);
+    return parent.RenderElement::takeChild(m_builder, child);
+}
+
+RenderPtr<RenderObject> RenderTreeBuilder::SVG::takeChild(RenderSVGRoot& parent, RenderObject& child)
+{
+    SVGResourcesCache::clientWillBeRemovedFromTree(child);
+    return parent.RenderElement::takeChild(m_builder, child);
+}
+
+}

trunk/Source/WebCore/rendering/updating/RenderTreeBuilderSVG.h

@@ -44 +44 @@
     void insertChild(RenderSVGText& parent, RenderPtr<RenderObject> child, RenderObject* beforeChild);
 
+    RenderPtr<RenderObject> takeChild(RenderSVGText& parent, RenderObject& child);
+    RenderPtr<RenderObject> takeChild(RenderSVGInline& parent, RenderObject& child);
+    RenderPtr<RenderObject> takeChild(RenderSVGContainer& parent, RenderObject& child);
+    RenderPtr<RenderObject> takeChild(RenderSVGRoot& parent, RenderObject& child);
+
 private:
     RenderTreeBuilder& m_builder;