[RenderTreeBuilder] ::willBeRemoved() does not need RenderTreeBuilder anymore.
authorzalan@apple.com <zalan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Feb 2018 00:20:40 +0000 (00:20 +0000)
committerzalan@apple.com <zalan@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 22 Feb 2018 00:20:40 +0000 (00:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=183019
<rdar://problem/37761421>

Reviewed by Antti Koivisto.

All the willBeDestroyed() mutations have been moved over to RenderTreeBuilder.

No change in functionality.

* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::willBeDestroyed):
* rendering/RenderBlock.h:
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willBeDestroyed):
* rendering/RenderBlockFlow.h:
* rendering/RenderBox.cpp:
(WebCore::RenderBox::willBeDestroyed):
* rendering/RenderBox.h:
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::willBeDestroyed):
* rendering/RenderBoxModelObject.h:
* rendering/RenderCounter.cpp:
(WebCore::RenderCounter::willBeDestroyed):
* rendering/RenderCounter.h:
* rendering/RenderElement.cpp:
(WebCore::RenderElement::willBeDestroyed):
* rendering/RenderElement.h:
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::willBeDestroyed):
* rendering/RenderEmbeddedObject.h:
* rendering/RenderFragmentedFlow.cpp:
(WebCore::RenderFragmentedFlow::willBeDestroyed):
* rendering/RenderFragmentedFlow.h:
* rendering/RenderImage.cpp:
(WebCore::RenderImage::willBeDestroyed):
* rendering/RenderImage.h:
* rendering/RenderInline.cpp:
(WebCore::RenderInline::willBeDestroyed):
* rendering/RenderInline.h:
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::willBeDestroyed):
* rendering/RenderLayerModelObject.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::willBeDestroyed):
* rendering/RenderListBox.h:
* rendering/RenderListMarker.cpp:
(WebCore::RenderListMarker::willBeDestroyed):
* rendering/RenderListMarker.h:
* rendering/RenderMenuList.cpp:
(WebCore::RenderMenuList::willBeDestroyed):
* rendering/RenderMenuList.h:
* rendering/RenderObject.cpp:
(WebCore::RenderObject::willBeDestroyed):
(WebCore::RenderObject::destroy):
* rendering/RenderObject.h:
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::willBeDestroyed):
* rendering/RenderReplaced.h:
* rendering/RenderSearchField.cpp:
(WebCore::RenderSearchField::willBeDestroyed):
* rendering/RenderSearchField.h:
* rendering/RenderSnapshottedPlugIn.cpp:
(WebCore::RenderSnapshottedPlugIn::willBeDestroyed):
* rendering/RenderSnapshottedPlugIn.h:
* rendering/RenderText.cpp:
(WebCore::RenderText::willBeDestroyed):
* rendering/RenderText.h:
* rendering/RenderTextControlMultiLine.cpp:
(WebCore::RenderTextControlMultiLine::willBeDestroyed):
* rendering/RenderTextControlMultiLine.h:
* rendering/RenderVideo.cpp:
(WebCore::RenderVideo::willBeDestroyed):
* rendering/RenderVideo.h:
* rendering/RenderWidget.cpp:
(WebCore::RenderWidget::willBeDestroyed):
* rendering/RenderWidget.h:
* rendering/svg/RenderSVGBlock.cpp:
(WebCore::RenderSVGBlock::willBeDestroyed):
* rendering/svg/RenderSVGBlock.h:
* rendering/svg/RenderSVGImage.cpp:
(WebCore::RenderSVGImage::willBeDestroyed):
* rendering/svg/RenderSVGImage.h:
* rendering/svg/RenderSVGInline.cpp:
(WebCore::RenderSVGInline::willBeDestroyed):
* rendering/svg/RenderSVGInline.h:
* rendering/svg/RenderSVGModelObject.cpp:
(WebCore::RenderSVGModelObject::willBeDestroyed):
* rendering/svg/RenderSVGModelObject.h:
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::willBeDestroyed):
* rendering/svg/RenderSVGResourceContainer.h:
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::willBeDestroyed):
* rendering/svg/RenderSVGRoot.h:
* rendering/svg/RenderSVGText.cpp:
(WebCore::RenderSVGText::willBeDestroyed):
* rendering/svg/RenderSVGText.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@228908 268f45cc-cd09-0410-ab3c-d52691b4dbfc

59 files changed:
Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderBlock.cpp
Source/WebCore/rendering/RenderBlock.h
Source/WebCore/rendering/RenderBlockFlow.cpp
Source/WebCore/rendering/RenderBlockFlow.h
Source/WebCore/rendering/RenderBox.cpp
Source/WebCore/rendering/RenderBox.h
Source/WebCore/rendering/RenderBoxModelObject.cpp
Source/WebCore/rendering/RenderBoxModelObject.h
Source/WebCore/rendering/RenderCounter.cpp
Source/WebCore/rendering/RenderCounter.h
Source/WebCore/rendering/RenderElement.cpp
Source/WebCore/rendering/RenderElement.h
Source/WebCore/rendering/RenderEmbeddedObject.cpp
Source/WebCore/rendering/RenderEmbeddedObject.h
Source/WebCore/rendering/RenderFragmentedFlow.cpp
Source/WebCore/rendering/RenderFragmentedFlow.h
Source/WebCore/rendering/RenderImage.cpp
Source/WebCore/rendering/RenderImage.h
Source/WebCore/rendering/RenderInline.cpp
Source/WebCore/rendering/RenderInline.h
Source/WebCore/rendering/RenderLayerModelObject.cpp
Source/WebCore/rendering/RenderLayerModelObject.h
Source/WebCore/rendering/RenderListBox.cpp
Source/WebCore/rendering/RenderListBox.h
Source/WebCore/rendering/RenderListMarker.cpp
Source/WebCore/rendering/RenderListMarker.h
Source/WebCore/rendering/RenderMenuList.cpp
Source/WebCore/rendering/RenderMenuList.h
Source/WebCore/rendering/RenderObject.cpp
Source/WebCore/rendering/RenderObject.h
Source/WebCore/rendering/RenderReplaced.cpp
Source/WebCore/rendering/RenderReplaced.h
Source/WebCore/rendering/RenderSearchField.cpp
Source/WebCore/rendering/RenderSearchField.h
Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp
Source/WebCore/rendering/RenderSnapshottedPlugIn.h
Source/WebCore/rendering/RenderText.cpp
Source/WebCore/rendering/RenderText.h
Source/WebCore/rendering/RenderTextControlMultiLine.cpp
Source/WebCore/rendering/RenderTextControlMultiLine.h
Source/WebCore/rendering/RenderVideo.cpp
Source/WebCore/rendering/RenderVideo.h
Source/WebCore/rendering/RenderWidget.cpp
Source/WebCore/rendering/RenderWidget.h
Source/WebCore/rendering/svg/RenderSVGBlock.cpp
Source/WebCore/rendering/svg/RenderSVGBlock.h
Source/WebCore/rendering/svg/RenderSVGImage.cpp
Source/WebCore/rendering/svg/RenderSVGImage.h
Source/WebCore/rendering/svg/RenderSVGInline.cpp
Source/WebCore/rendering/svg/RenderSVGInline.h
Source/WebCore/rendering/svg/RenderSVGModelObject.cpp
Source/WebCore/rendering/svg/RenderSVGModelObject.h
Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
Source/WebCore/rendering/svg/RenderSVGResourceContainer.h
Source/WebCore/rendering/svg/RenderSVGRoot.cpp
Source/WebCore/rendering/svg/RenderSVGRoot.h
Source/WebCore/rendering/svg/RenderSVGText.cpp
Source/WebCore/rendering/svg/RenderSVGText.h

index b6f8fcf..11bc3a8 100644 (file)
@@ -1,3 +1,104 @@
+2018-02-21  Zalan Bujtas  <zalan@apple.com>
+
+        [RenderTreeBuilder] ::willBeRemoved() does not need RenderTreeBuilder anymore.
+        https://bugs.webkit.org/show_bug.cgi?id=183019
+        <rdar://problem/37761421>
+
+        Reviewed by Antti Koivisto.
+
+        All the willBeDestroyed() mutations have been moved over to RenderTreeBuilder. 
+
+        No change in functionality.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::willBeDestroyed):
+        * rendering/RenderBlock.h:
+        * rendering/RenderBlockFlow.cpp:
+        (WebCore::RenderBlockFlow::willBeDestroyed):
+        * rendering/RenderBlockFlow.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::willBeDestroyed):
+        * rendering/RenderBox.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::willBeDestroyed):
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderCounter.cpp:
+        (WebCore::RenderCounter::willBeDestroyed):
+        * rendering/RenderCounter.h:
+        * rendering/RenderElement.cpp:
+        (WebCore::RenderElement::willBeDestroyed):
+        * rendering/RenderElement.h:
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::willBeDestroyed):
+        * rendering/RenderEmbeddedObject.h:
+        * rendering/RenderFragmentedFlow.cpp:
+        (WebCore::RenderFragmentedFlow::willBeDestroyed):
+        * rendering/RenderFragmentedFlow.h:
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::willBeDestroyed):
+        * rendering/RenderImage.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::willBeDestroyed):
+        * rendering/RenderInline.h:
+        * rendering/RenderLayerModelObject.cpp:
+        (WebCore::RenderLayerModelObject::willBeDestroyed):
+        * rendering/RenderLayerModelObject.h:
+        * rendering/RenderListBox.cpp:
+        (WebCore::RenderListBox::willBeDestroyed):
+        * rendering/RenderListBox.h:
+        * rendering/RenderListMarker.cpp:
+        (WebCore::RenderListMarker::willBeDestroyed):
+        * rendering/RenderListMarker.h:
+        * rendering/RenderMenuList.cpp:
+        (WebCore::RenderMenuList::willBeDestroyed):
+        * rendering/RenderMenuList.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::willBeDestroyed):
+        (WebCore::RenderObject::destroy):
+        * rendering/RenderObject.h:
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::willBeDestroyed):
+        * rendering/RenderReplaced.h:
+        * rendering/RenderSearchField.cpp:
+        (WebCore::RenderSearchField::willBeDestroyed):
+        * rendering/RenderSearchField.h:
+        * rendering/RenderSnapshottedPlugIn.cpp:
+        (WebCore::RenderSnapshottedPlugIn::willBeDestroyed):
+        * rendering/RenderSnapshottedPlugIn.h:
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::willBeDestroyed):
+        * rendering/RenderText.h:
+        * rendering/RenderTextControlMultiLine.cpp:
+        (WebCore::RenderTextControlMultiLine::willBeDestroyed):
+        * rendering/RenderTextControlMultiLine.h:
+        * rendering/RenderVideo.cpp:
+        (WebCore::RenderVideo::willBeDestroyed):
+        * rendering/RenderVideo.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::willBeDestroyed):
+        * rendering/RenderWidget.h:
+        * rendering/svg/RenderSVGBlock.cpp:
+        (WebCore::RenderSVGBlock::willBeDestroyed):
+        * rendering/svg/RenderSVGBlock.h:
+        * rendering/svg/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::willBeDestroyed):
+        * rendering/svg/RenderSVGImage.h:
+        * rendering/svg/RenderSVGInline.cpp:
+        (WebCore::RenderSVGInline::willBeDestroyed):
+        * rendering/svg/RenderSVGInline.h:
+        * rendering/svg/RenderSVGModelObject.cpp:
+        (WebCore::RenderSVGModelObject::willBeDestroyed):
+        * rendering/svg/RenderSVGModelObject.h:
+        * rendering/svg/RenderSVGResourceContainer.cpp:
+        (WebCore::RenderSVGResourceContainer::willBeDestroyed):
+        * rendering/svg/RenderSVGResourceContainer.h:
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::willBeDestroyed):
+        * rendering/svg/RenderSVGRoot.h:
+        * rendering/svg/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::willBeDestroyed):
+        * rendering/svg/RenderSVGText.h:
+
 2018-02-21  Per Arne Vollan  <pvollan@apple.com>
 
         The WebContent process should not use NSScreen in the screenAvailableRect/screenRect implementations.
index 1b3b469..870c51a 100644 (file)
@@ -343,7 +343,7 @@ RenderBlock::~RenderBlock()
 }
 
 // Note that this is not called for RenderBlockFlows.
-void RenderBlock::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderBlock::willBeDestroyed()
 {
     if (!renderTreeBeingDestroyed()) {
         if (parent())
@@ -352,7 +352,7 @@ void RenderBlock::willBeDestroyed(RenderTreeBuilder& builder)
 
     blockWillBeDestroyed();
 
-    RenderBox::willBeDestroyed(builder);
+    RenderBox::willBeDestroyed();
 }
 
 void RenderBlock::blockWillBeDestroyed()
index d700575..53e1715 100644 (file)
@@ -319,7 +319,7 @@ public:
     
 protected:
     RenderFragmentedFlow* locateEnclosingFragmentedFlow() const override;
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void layout() override;
 
index c56b0f2..a7c04af 100644 (file)
@@ -127,7 +127,7 @@ RenderBlockFlow::~RenderBlockFlow()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderBlockFlow::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderBlockFlow::willBeDestroyed()
 {
     if (!renderTreeBeingDestroyed()) {
         if (firstRootBox()) {
@@ -154,7 +154,7 @@ void RenderBlockFlow::willBeDestroyed(RenderTreeBuilder& builder)
     blockWillBeDestroyed();
 
     // NOTE: This jumps down to RenderBox, bypassing RenderBlock since it would do duplicate work.
-    RenderBox::willBeDestroyed(builder);
+    RenderBox::willBeDestroyed();
 }
 
 RenderBlockFlow* RenderBlockFlow::previousSiblingWithOverhangingFloats(bool& parentHasFloats) const
index ec2984f..52dc7da 100644 (file)
@@ -59,7 +59,7 @@ public:
     void layoutBlock(bool relayoutChildren, LayoutUnit pageLogicalHeight = 0) override;
 
 protected:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     
     // This method is called at the start of layout to wipe away all of the floats in our floating objects list. It also
     // repopulates the list with any floats that intrude from previous siblings or parents. Floats that were added by
index c6d8dc1..a0e504d 100644 (file)
@@ -150,7 +150,7 @@ RenderBox::~RenderBox()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderBox::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderBox::willBeDestroyed()
 {
     if (frame().eventHandler().autoscrollRenderer() == this)
         frame().eventHandler().stopAutoscrollTimer(true);
@@ -170,7 +170,7 @@ void RenderBox::willBeDestroyed(RenderTreeBuilder& builder)
         view().unregisterBoxWithScrollSnapPositions(*this);
 #endif
 
-    RenderBoxModelObject::willBeDestroyed(builder);
+    RenderBoxModelObject::willBeDestroyed();
 }
 
 RenderFragmentContainer* RenderBox::clampToStartAndEndFragments(RenderFragmentContainer* fragment) const
index 17e694e..ad4491b 100644 (file)
@@ -631,7 +631,7 @@ protected:
     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
     void updateFromStyle() override;
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     bool createsNewFormattingContext() const;
 
index 2d555ef..03608a2 100644 (file)
@@ -224,7 +224,7 @@ RenderBoxModelObject::~RenderBoxModelObject()
     ASSERT(!continuation());
 }
 
-void RenderBoxModelObject::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderBoxModelObject::willBeDestroyed()
 {
     if (hasContinuationChainNode())
         removeFromContinuationChain();
@@ -235,7 +235,7 @@ void RenderBoxModelObject::willBeDestroyed(RenderTreeBuilder& builder)
     if (!renderTreeBeingDestroyed())
         view().imageQualityController().rendererWillBeDestroyed(*this);
 
-    RenderLayerModelObject::willBeDestroyed(builder);
+    RenderLayerModelObject::willBeDestroyed();
 }
 
 bool RenderBoxModelObject::hasVisibleBoxDecorationStyle() const
index 38c3cc0..d91c74e 100644 (file)
@@ -245,7 +245,7 @@ protected:
     RenderBoxModelObject(Element&, RenderStyle&&, BaseTypeFlags);
     RenderBoxModelObject(Document&, RenderStyle&&, BaseTypeFlags);
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
 
index 5651af4..3f14e69 100644 (file)
@@ -352,7 +352,7 @@ RenderCounter::~RenderCounter()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderCounter::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderCounter::willBeDestroyed()
 {
     view().removeRenderCounter();
 
@@ -361,7 +361,7 @@ void RenderCounter::willBeDestroyed(RenderTreeBuilder& builder)
         ASSERT(!m_counterNode);
     }
     
-    RenderText::willBeDestroyed(builder);
+    RenderText::willBeDestroyed();
 }
 
 const char* RenderCounter::renderName() const
index db4df7b..8a90202 100644 (file)
@@ -43,7 +43,7 @@ public:
     void updateCounter();
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     
     const char* renderName() const override;
     bool isCounter() const override;
index 7297f4a..ed14d71 100644 (file)
@@ -927,7 +927,7 @@ inline void RenderElement::clearSubtreeLayoutRootIfNeeded() const
     view().frameView().layoutContext().clearSubtreeLayoutRoot();
 }
 
-void RenderElement::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderElement::willBeDestroyed()
 {
     if (m_style.hasFixedBackgroundImage() && !settings().fixedBackgroundsPaintRelativeToDocument())
         view().frameView().removeSlowRepaintObject(*this);
@@ -937,7 +937,7 @@ void RenderElement::willBeDestroyed(RenderTreeBuilder& builder)
     if (hasCounterNodeMap())
         RenderCounter::destroyCounterNodes(*this);
 
-    RenderObject::willBeDestroyed(builder);
+    RenderObject::willBeDestroyed();
 
     clearSubtreeLayoutRootIfNeeded();
 
index 510a668..2f11947 100644 (file)
@@ -254,7 +254,7 @@ protected:
 
     void insertedIntoTree() override;
     void willBeRemovedFromTree() override;
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void setRenderInlineAlwaysCreatesLineBoxes(bool b) { m_renderInlineAlwaysCreatesLineBoxes = b; }
     bool renderInlineAlwaysCreatesLineBoxes() const { return m_renderInlineAlwaysCreatesLineBoxes; }
index 4437e06..cd1cb99 100644 (file)
@@ -113,10 +113,10 @@ RenderEmbeddedObject::~RenderEmbeddedObject()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderEmbeddedObject::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderEmbeddedObject::willBeDestroyed()
 {
     view().frameView().removeEmbeddedObjectToUpdate(*this);
-    RenderWidget::willBeDestroyed(builder);
+    RenderWidget::willBeDestroyed();
 }
 
 RenderPtr<RenderEmbeddedObject> RenderEmbeddedObject::createForApplet(HTMLAppletElement& applet, RenderStyle&& style)
index 33f1925..a521d4a 100644 (file)
@@ -70,7 +70,7 @@ protected:
 
 protected:
     void layout() override;
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
 private:
     const char* renderName() const override { return "RenderEmbeddedObject"; }
index 8209adf..f5a9b8d 100644 (file)
@@ -763,10 +763,10 @@ void RenderFragmentedFlow::deleteLines()
     RenderBlockFlow::deleteLines();
 }
 
-void RenderFragmentedFlow::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderFragmentedFlow::willBeDestroyed()
 {
     clearLinesToFragmentMap();
-    RenderBlockFlow::willBeDestroyed(builder);
+    RenderBlockFlow::willBeDestroyed();
 }
 
 void RenderFragmentedFlow::markFragmentsForOverflowLayoutIfNeeded()
index 9cf23bc..1eac978 100644 (file)
@@ -194,7 +194,7 @@ protected:
     virtual LayoutUnit initialLogicalWidth() const { return 0; };
     
     void clearLinesToFragmentMap();
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override;
 
index 9e73887..f34ed10 100644 (file)
@@ -149,10 +149,10 @@ RenderImage::~RenderImage()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderImage::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderImage::willBeDestroyed()
 {
     imageResource().shutdown();
-    RenderReplaced::willBeDestroyed(builder);
+    RenderReplaced::willBeDestroyed();
 }
 
 // If we'll be displaying either alt text or an image, add some padding.
index 06e8e1e..5654310 100644 (file)
@@ -77,7 +77,7 @@ public:
     bool hasNonBitmapImage() const;
 
 protected:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     bool needsPreferredWidthsRecalculation() const final;
     RenderBox* embeddedContentBox() const final;
index 254a8e8..9aea5c0 100644 (file)
@@ -70,7 +70,7 @@ RenderInline::RenderInline(Document& document, RenderStyle&& style)
     setChildrenInline(true);
 }
 
-void RenderInline::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderInline::willBeDestroyed()
 {
 #if !ASSERT_DISABLED
     // Make sure we do not retain "this" in the continuation outline table map of our containing blocks.
@@ -107,7 +107,7 @@ void RenderInline::willBeDestroyed(RenderTreeBuilder& builder)
 
     m_lineBoxes.deleteLineBoxes();
 
-    RenderBoxModelObject::willBeDestroyed(builder);
+    RenderBoxModelObject::willBeDestroyed();
 }
 
 void RenderInline::updateFromStyle()
index a332340..6e6bf87 100644 (file)
@@ -93,7 +93,7 @@ public:
     bool hitTestCulledInline(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset);
 
 protected:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
index 41ca69d..55b43a6 100644 (file)
@@ -65,7 +65,7 @@ RenderLayerModelObject::~RenderLayerModelObject()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderLayerModelObject::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderLayerModelObject::willBeDestroyed()
 {
     if (isPositioned()) {
         if (style().hasViewportConstrainedPosition())
@@ -77,7 +77,7 @@ void RenderLayerModelObject::willBeDestroyed(RenderTreeBuilder& builder)
         destroyLayer();
     }
 
-    RenderElement::willBeDestroyed(builder);
+    RenderElement::willBeDestroyed();
     
     clearRepaintLayoutRects();
 }
index 0d9a76e..e605a48 100644 (file)
@@ -73,7 +73,7 @@ protected:
     RenderLayerModelObject(Document&, RenderStyle&&, BaseTypeFlags);
 
     void createLayer();
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
 private:
     std::unique_ptr<RenderLayer> m_layer;
index aa917ef..4c4d9ab 100644 (file)
@@ -104,11 +104,11 @@ RenderListBox::~RenderListBox()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderListBox::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderListBox::willBeDestroyed()
 {
     setHasVerticalScrollbar(false);
     view().frameView().removeScrollableArea(this);
-    RenderBlockFlow::willBeDestroyed(builder);
+    RenderBlockFlow::willBeDestroyed();
 }
 
 HTMLSelectElement& RenderListBox::selectElement() const
index 88c4723..9d694df 100644 (file)
@@ -68,7 +68,7 @@ public:
     bool scrolledToRight() const override;
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void element() const = delete;
 
index 61c3c5a..dd18777 100644 (file)
@@ -1134,11 +1134,11 @@ RenderListMarker::~RenderListMarker()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderListMarker::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderListMarker::willBeDestroyed()
 {
     if (m_image)
         m_image->removeClient(this);
-    RenderBox::willBeDestroyed(builder);
+    RenderBox::willBeDestroyed();
 }
 
 void RenderListMarker::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
index 9278dc2..13f124f 100644 (file)
@@ -52,7 +52,7 @@ public:
 #endif
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void element() const = delete;
 
index a3c0a80..de57fa1 100644 (file)
@@ -88,7 +88,7 @@ RenderMenuList::~RenderMenuList()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderMenuList::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderMenuList::willBeDestroyed()
 {
 #if !PLATFORM(IOS)
     if (m_popup)
@@ -96,7 +96,7 @@ void RenderMenuList::willBeDestroyed(RenderTreeBuilder& builder)
     m_popup = nullptr;
 #endif
 
-    RenderFlexibleBox::willBeDestroyed(builder);
+    RenderFlexibleBox::willBeDestroyed();
 }
 
 void RenderMenuList::setInnerRenderer(RenderBlock& innerRenderer)
index ea1483f..62f6300 100644 (file)
@@ -65,7 +65,7 @@ public:
     void didInsertChild(RenderObject& child, RenderObject* beforeChild);
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void element() const = delete;
 
index f20da74..df60fd7 100644 (file)
@@ -1428,7 +1428,7 @@ bool RenderObject::isSelectionBorder() const
         || view().selection().end() == this;
 }
 
-void RenderObject::willBeDestroyed(RenderTreeBuilder&)
+void RenderObject::willBeDestroyed()
 {
     ASSERT(!m_parent);
     ASSERT(renderTreeBeingDestroyed() || !is<RenderElement>(*this) || !view().frameView().hasSlowRepaintObject(downcast<RenderElement>(*this)));
@@ -1479,7 +1479,7 @@ void RenderObject::destroy()
         downcast<RenderBoxModelObject>(*this).layer()->willBeDestroyed();
 #endif
 
-    willBeDestroyed(*RenderTreeBuilder::current());
+    willBeDestroyed();
 
     if (is<RenderWidget>(*this)) {
         downcast<RenderWidget>(*this).deref();
index 61f76a7..3c4f15a 100644 (file)
@@ -791,7 +791,7 @@ protected:
 
     void adjustRectForOutlineAndShadow(LayoutRect&) const;
 
-    virtual void willBeDestroyed(RenderTreeBuilder&);
+    virtual void willBeDestroyed();
 
     void setNeedsPositionedMovementLayoutBit(bool b) { m_bitfields.setNeedsPositionedMovementLayout(b); }
     void setNormalChildNeedsLayoutBit(bool b) { m_bitfields.setNormalChildNeedsLayout(b); }
index a7c8d91..caddd4e 100644 (file)
@@ -72,12 +72,12 @@ RenderReplaced::RenderReplaced(Document& document, RenderStyle&& style, const La
 
 RenderReplaced::~RenderReplaced() = default;
 
-void RenderReplaced::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderReplaced::willBeDestroyed()
 {
     if (!renderTreeBeingDestroyed() && parent())
         parent()->dirtyLinesFromChangedChild(*this);
 
-    RenderBox::willBeDestroyed(builder);
+    RenderBox::willBeDestroyed();
 }
 
 void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
index bf69bfc..ae5d954 100644 (file)
@@ -67,7 +67,7 @@ protected:
     bool shouldPaint(PaintInfo&, const LayoutPoint&);
     LayoutRect localSelectionRect(bool checkWhetherSelected = true) const; // This is in local coordinates, but it's a physical rect (so the top left corner is physical top left).
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
 private:
     LayoutUnit computeConstrainedLogicalWidth(ShouldComputePreferred) const;
index 5a8328e..88fd64a 100644 (file)
@@ -64,14 +64,14 @@ RenderSearchField::~RenderSearchField()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderSearchField::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSearchField::willBeDestroyed()
 {
     if (m_searchPopup) {
         m_searchPopup->popupMenu()->disconnectClient();
         m_searchPopup = nullptr;
     }
 
-    RenderTextControlSingleLine::willBeDestroyed(builder);
+    RenderTextControlSingleLine::willBeDestroyed();
 }
 
 inline HTMLElement* RenderSearchField::resultsButtonElement() const
index 233e6ed..3a841de 100644 (file)
@@ -48,7 +48,7 @@ public:
 private:
     bool isSearchField() const final { return true; }
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     LayoutUnit computeControlLogicalHeight(LayoutUnit lineHeight, LayoutUnit nonContentHeight) const override;
     void updateFromElement() override;
     EVisibility visibilityForCancelButton() const;
index e447221..ee62330 100644 (file)
@@ -63,12 +63,12 @@ RenderSnapshottedPlugIn::~RenderSnapshottedPlugIn()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderSnapshottedPlugIn::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSnapshottedPlugIn::willBeDestroyed()
 {
     ASSERT(m_snapshotResource);
     m_snapshotResource->shutdown();
 
-    RenderEmbeddedObject::willBeDestroyed(builder);
+    RenderEmbeddedObject::willBeDestroyed();
 }
 
 HTMLPlugInImageElement& RenderSnapshottedPlugIn::plugInImageElement() const
index 5b1be89..a45a31a 100644 (file)
@@ -43,7 +43,7 @@ public:
     void handleEvent(Event&);
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     void frameOwnerElement() const = delete;
     const char* renderName() const final { return "RenderSnapshottedPlugIn"; }
     CursorDirective getCursor(const LayoutPoint&, Cursor&) const final;
index 51c2fbe..6ae047c 100644 (file)
@@ -287,7 +287,7 @@ void RenderText::removeAndDestroyTextBoxes()
     m_lineBoxes.deleteAll();
 }
 
-void RenderText::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderText::willBeDestroyed()
 {
     secureTextTimers().remove(this);
 
@@ -298,7 +298,7 @@ void RenderText::willBeDestroyed(RenderTreeBuilder& builder)
 
     setInlineWrapperForDisplayContents(nullptr);
 
-    RenderObject::willBeDestroyed(builder);
+    RenderObject::willBeDestroyed();
 }
 
 void RenderText::deleteLineBoxesBeforeSimpleLineLayout()
index c246318..f46290f 100644 (file)
@@ -183,7 +183,7 @@ public:
 
 protected:
     virtual void computePreferredLogicalWidths(float leadWidth);
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     virtual void setRenderedText(const String&);
     virtual UChar previousCharacter() const;
index 7e025ea..526385c 100644 (file)
@@ -45,12 +45,12 @@ RenderTextControlMultiLine::~RenderTextControlMultiLine()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderTextControlMultiLine::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderTextControlMultiLine::willBeDestroyed()
 {
     if (textAreaElement().isConnected())
         textAreaElement().rendererWillBeDestroyed();
 
-    RenderTextControl::willBeDestroyed(builder);
+    RenderTextControl::willBeDestroyed();
 }
 
 HTMLTextAreaElement& RenderTextControlMultiLine::textAreaElement() const
index 19608ef..721af9f 100644 (file)
@@ -35,7 +35,7 @@ public:
     HTMLTextAreaElement& textAreaElement() const;
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     void element() const = delete;
 
     bool isTextArea() const override { return true; }
index 6410652..0289205 100644 (file)
@@ -62,12 +62,12 @@ RenderVideo::~RenderVideo()
     // Do not add any code here. Add it to willBeDestroyed() instead.
 }
 
-void RenderVideo::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderVideo::willBeDestroyed()
 {
     if (auto player = videoElement().player())
         player->setVisible(false);
 
-    RenderMedia::willBeDestroyed(builder);
+    RenderMedia::willBeDestroyed();
 }
 
 void RenderVideo::visibleInViewportStateChanged()
index d234f4b..8e25c68 100644 (file)
@@ -54,7 +54,7 @@ public:
     void updateFromElement() final;
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     void mediaElement() const = delete;
 
     void intrinsicSizeChanged() final;
index 4f72d14..a2ecd08 100644 (file)
@@ -88,7 +88,7 @@ RenderWidget::RenderWidget(HTMLFrameOwnerElement& element, RenderStyle&& style)
     setInline(false);
 }
 
-void RenderWidget::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderWidget::willBeDestroyed()
 {
 #if PLATFORM(IOS)
     if (hasLayer())
@@ -102,7 +102,7 @@ void RenderWidget::willBeDestroyed(RenderTreeBuilder& builder)
 
     setWidget(nullptr);
 
-    RenderReplaced::willBeDestroyed(builder);
+    RenderReplaced::willBeDestroyed();
 }
 
 RenderWidget::~RenderWidget()
index 78aed3f..8ae3d2c 100644 (file)
@@ -77,7 +77,7 @@ public:
 protected:
     RenderWidget(HTMLFrameOwnerElement&, RenderStyle&&);
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
     void layout() override;
     void paint(PaintInfo&, const LayoutPoint&) override;
index 335556d..b011675 100644 (file)
@@ -71,10 +71,10 @@ void RenderSVGBlock::absoluteRects(Vector<IntRect>&, const LayoutPoint&) const
     ASSERT_NOT_REACHED();
 }
 
-void RenderSVGBlock::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGBlock::willBeDestroyed()
 {
     SVGResourcesCache::clientDestroyed(*this);
-    RenderBlockFlow::willBeDestroyed(builder);
+    RenderBlockFlow::willBeDestroyed();
 }
 
 void RenderSVGBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
index d4e6b12..fedba66 100644 (file)
@@ -35,7 +35,7 @@ public:
 
 protected:
     RenderSVGBlock(SVGGraphicsElement&, RenderStyle&&);
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
 private:
     void element() const = delete;
index 2d39eb4..94eefe8 100644 (file)
@@ -57,10 +57,10 @@ RenderSVGImage::RenderSVGImage(SVGImageElement& element, RenderStyle&& style)
 
 RenderSVGImage::~RenderSVGImage() = default;
 
-void RenderSVGImage::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGImage::willBeDestroyed()
 {
     imageResource().shutdown();
-    RenderSVGModelObject::willBeDestroyed(builder);
+    RenderSVGModelObject::willBeDestroyed();
 }
 
 SVGImageElement& RenderSVGImage::imageElement() const
index bc4ed71..a227c16 100644 (file)
@@ -52,7 +52,7 @@ public:
     void paintForeground(PaintInfo&);
 
 private:
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void element() const = delete;
 
index a62f4d7..2f74607 100644 (file)
@@ -101,10 +101,10 @@ void RenderSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) co
         quads.append(localToAbsoluteQuad(FloatRect(textBoundingBox.x() + box->x(), textBoundingBox.y() + box->y(), box->logicalWidth(), box->logicalHeight()), UseTransforms, wasFixed));
 }
 
-void RenderSVGInline::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGInline::willBeDestroyed()
 {
     SVGResourcesCache::clientDestroyed(*this);
-    RenderInline::willBeDestroyed(builder);
+    RenderInline::willBeDestroyed();
 }
 
 void RenderSVGInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
index 4e80945..549bac4 100644 (file)
@@ -58,7 +58,7 @@ private:
 
     std::unique_ptr<InlineFlowBox> createInlineFlowBox() final;
 
-    void willBeDestroyed(RenderTreeBuilder&) final;
+    void willBeDestroyed() final;
     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
 };
 
index 13e2c88..92ab653 100644 (file)
@@ -92,10 +92,10 @@ void RenderSVGModelObject::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixe
     quads.append(localToAbsoluteQuad(strokeBoundingBox(), UseTransforms, wasFixed));
 }
 
-void RenderSVGModelObject::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGModelObject::willBeDestroyed()
 {
     SVGResourcesCache::clientDestroyed(*this);
-    RenderElement::willBeDestroyed(builder);
+    RenderElement::willBeDestroyed();
 }
 
 void RenderSVGModelObject::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
index 899d969..8e3a0e1 100644 (file)
@@ -69,7 +69,7 @@ public:
 protected:
     RenderSVGModelObject(SVGElement&, RenderStyle&&);
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
 private:
     bool isRenderSVGModelObject() const final { return true; }
index 20749d7..014494b 100644 (file)
@@ -55,7 +55,7 @@ void RenderSVGResourceContainer::layout()
     RenderSVGHiddenContainer::layout();
 }
 
-void RenderSVGResourceContainer::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGResourceContainer::willBeDestroyed()
 {
     SVGResourcesCache::resourceDestroyed(*this);
 
@@ -64,7 +64,7 @@ void RenderSVGResourceContainer::willBeDestroyed(RenderTreeBuilder& builder)
         m_registered = false;
     }
 
-    RenderSVGHiddenContainer::willBeDestroyed(builder);
+    RenderSVGHiddenContainer::willBeDestroyed();
 }
 
 void RenderSVGResourceContainer::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
index bfe430d..f637b71 100644 (file)
@@ -67,7 +67,7 @@ private:
     void addClient(RenderElement&);
     void removeClient(RenderElement&);
 
-    void willBeDestroyed(RenderTreeBuilder&) final;
+    void willBeDestroyed() final;
     void registerResource();
 
     AtomicString m_id;
index 9bf34cc..72889df 100644 (file)
@@ -270,12 +270,12 @@ void RenderSVGRoot::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paint
     childPaintInfo.context().restore();
 }
 
-void RenderSVGRoot::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGRoot::willBeDestroyed()
 {
     RenderBlock::removePercentHeightDescendant(const_cast<RenderSVGRoot&>(*this));
 
     SVGResourcesCache::clientDestroyed(*this);
-    RenderReplaced::willBeDestroyed(builder);
+    RenderReplaced::willBeDestroyed();
 }
 
 void RenderSVGRoot::insertedIntoTree()
index 3969814..fd57cd0 100644 (file)
@@ -76,7 +76,7 @@ private:
     void layout() override;
     void paintReplaced(PaintInfo&, const LayoutPoint&) override;
 
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     void insertedIntoTree() override;
     void willBeRemovedFromTree() override;
index 48ed711..d7e64cb 100644 (file)
@@ -225,12 +225,12 @@ static inline void checkLayoutAttributesConsistency(RenderSVGText* text, Vector<
 #endif
 }
 
-void RenderSVGText::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGText::willBeDestroyed()
 {
     m_layoutAttributes.clear();
     m_layoutAttributesBuilder.clearTextPositioningElements();
 
-    RenderSVGBlock::willBeDestroyed(builder);
+    RenderSVGBlock::willBeDestroyed();
 }
 
 void RenderSVGText::subtreeChildWillBeRemoved(RenderObject* child, Vector<SVGTextLayoutAttributes*, 2>& affectedAttributes)
index dcbd38f..a5d1a78 100644 (file)
@@ -83,7 +83,7 @@ private:
 
     void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags, bool* wasFixed) const override;
     const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const override;
-    void willBeDestroyed(RenderTreeBuilder&) override;
+    void willBeDestroyed() override;
 
     const AffineTransform& localToParentTransform() const override { return m_localTransform; }
     AffineTransform localTransform() const override { return m_localTransform; }