Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 16:06:19 UTC (rev 229025)
@@ -1,5 +1,106 @@
2018-02-21 Zalan Bujtas <[email protected]>
+ [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 Zalan Bujtas <[email protected]>
+
[RenderTreeBuilder] Move RenderBoxModelObject::willBeRemoved() mutation logic to RenderTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=183014
<rdar://problem/37757428>
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlock.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlock.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlock.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -343,7 +343,7 @@
}
// Note that this is not called for RenderBlockFlows.
-void RenderBlock::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderBlock::willBeDestroyed()
{
if (!renderTreeBeingDestroyed()) {
if (parent())
@@ -352,7 +352,7 @@
blockWillBeDestroyed();
- RenderBox::willBeDestroyed(builder);
+ RenderBox::willBeDestroyed();
}
void RenderBlock::blockWillBeDestroyed()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlock.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlock.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlock.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -319,7 +319,7 @@
protected:
RenderFragmentedFlow* locateEnclosingFragmentedFlow() const override;
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void layout() override;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -127,7 +127,7 @@
// 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 @@
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
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBlockFlow.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -59,7 +59,7 @@
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
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBox.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBox.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBox.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -150,7 +150,7 @@
// 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 @@
view().unregisterBoxWithScrollSnapPositions(*this);
#endif
- RenderBoxModelObject::willBeDestroyed(builder);
+ RenderBoxModelObject::willBeDestroyed();
}
RenderFragmentContainer* RenderBox::clampToStartAndEndFragments(RenderFragmentContainer* fragment) const
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBox.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBox.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBox.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -631,7 +631,7 @@
void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
void updateFromStyle() override;
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
bool createsNewFormattingContext() const;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBoxModelObject.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBoxModelObject.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBoxModelObject.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -224,7 +224,7 @@
ASSERT(!continuation());
}
-void RenderBoxModelObject::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderBoxModelObject::willBeDestroyed()
{
if (hasContinuationChainNode())
removeFromContinuationChain();
@@ -235,7 +235,7 @@
if (!renderTreeBeingDestroyed())
view().imageQualityController().rendererWillBeDestroyed(*this);
- RenderLayerModelObject::willBeDestroyed(builder);
+ RenderLayerModelObject::willBeDestroyed();
}
bool RenderBoxModelObject::hasVisibleBoxDecorationStyle() const
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBoxModelObject.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBoxModelObject.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderBoxModelObject.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -245,7 +245,7 @@
RenderBoxModelObject(Element&, RenderStyle&&, BaseTypeFlags);
RenderBoxModelObject(Document&, RenderStyle&&, BaseTypeFlags);
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderCounter.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderCounter.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderCounter.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -352,7 +352,7 @@
// 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 @@
ASSERT(!m_counterNode);
}
- RenderText::willBeDestroyed(builder);
+ RenderText::willBeDestroyed();
}
const char* RenderCounter::renderName() const
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderCounter.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderCounter.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderCounter.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -43,7 +43,7 @@
void updateCounter();
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
const char* renderName() const override;
bool isCounter() const override;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -927,7 +927,7 @@
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 @@
if (hasCounterNodeMap())
RenderCounter::destroyCounterNodes(*this);
- RenderObject::willBeDestroyed(builder);
+ RenderObject::willBeDestroyed();
clearSubtreeLayoutRootIfNeeded();
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderElement.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -254,7 +254,7 @@
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; }
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderEmbeddedObject.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -113,10 +113,10 @@
// 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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderEmbeddedObject.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderEmbeddedObject.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderEmbeddedObject.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -66,7 +66,7 @@
protected:
void layout() override;
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
private:
const char* renderName() const override { return "RenderEmbeddedObject"; }
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -763,10 +763,10 @@
RenderBlockFlow::deleteLines();
}
-void RenderFragmentedFlow::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderFragmentedFlow::willBeDestroyed()
{
clearLinesToFragmentMap();
- RenderBlockFlow::willBeDestroyed(builder);
+ RenderBlockFlow::willBeDestroyed();
}
void RenderFragmentedFlow::markFragmentsForOverflowLayoutIfNeeded()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderFragmentedFlow.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -194,7 +194,7 @@
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;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderImage.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderImage.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderImage.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -149,10 +149,10 @@
// 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.
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderImage.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderImage.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderImage.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -77,7 +77,7 @@
bool hasNonBitmapImage() const;
protected:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
bool needsPreferredWidthsRecalculation() const final;
RenderBox* embeddedContentBox() const final;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderInline.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderInline.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderInline.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -70,7 +70,7 @@
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 @@
m_lineBoxes.deleteLineBoxes();
- RenderBoxModelObject::willBeDestroyed(builder);
+ RenderBoxModelObject::willBeDestroyed();
}
void RenderInline::updateFromStyle()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderInline.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderInline.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderInline.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -93,7 +93,7 @@
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;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderLayerModelObject.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderLayerModelObject.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderLayerModelObject.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -65,7 +65,7 @@
// 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 @@
destroyLayer();
}
- RenderElement::willBeDestroyed(builder);
+ RenderElement::willBeDestroyed();
clearRepaintLayoutRects();
}
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderLayerModelObject.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderLayerModelObject.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderLayerModelObject.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -73,7 +73,7 @@
RenderLayerModelObject(Document&, RenderStyle&&, BaseTypeFlags);
void createLayer();
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
private:
std::unique_ptr<RenderLayer> m_layer;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListBox.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListBox.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListBox.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -104,11 +104,11 @@
// 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
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListBox.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListBox.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListBox.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -68,7 +68,7 @@
bool scrolledToRight() const override;
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void element() const = delete;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListMarker.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListMarker.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListMarker.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -1134,11 +1134,11 @@
// 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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListMarker.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListMarker.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListMarker.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -52,7 +52,7 @@
#endif
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void element() const = delete;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMenuList.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMenuList.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMenuList.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -88,7 +88,7 @@
// 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 @@
m_popup = nullptr;
#endif
- RenderFlexibleBox::willBeDestroyed(builder);
+ RenderFlexibleBox::willBeDestroyed();
}
void RenderMenuList::setInnerRenderer(RenderBlock& innerRenderer)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMenuList.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMenuList.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderMenuList.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -65,7 +65,7 @@
void didInsertChild(RenderObject& child, RenderObject* beforeChild);
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void element() const = delete;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderObject.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderObject.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderObject.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -1428,7 +1428,7 @@
|| 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 @@
downcast<RenderBoxModelObject>(*this).layer()->willBeDestroyed();
#endif
- willBeDestroyed(*RenderTreeBuilder::current());
+ willBeDestroyed();
if (is<RenderWidget>(*this)) {
downcast<RenderWidget>(*this).deref();
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderObject.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderObject.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderObject.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -791,7 +791,7 @@
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); }
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderReplaced.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderReplaced.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderReplaced.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -72,12 +72,12 @@
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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderReplaced.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderReplaced.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderReplaced.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -67,7 +67,7 @@
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;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSearchField.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSearchField.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSearchField.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -64,7 +64,7 @@
// 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();
@@ -71,7 +71,7 @@
m_searchPopup = nullptr;
}
- RenderTextControlSingleLine::willBeDestroyed(builder);
+ RenderTextControlSingleLine::willBeDestroyed();
}
inline HTMLElement* RenderSearchField::resultsButtonElement() const
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSearchField.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSearchField.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSearchField.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -48,7 +48,7 @@
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;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSnapshottedPlugIn.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -63,12 +63,12 @@
// 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
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSnapshottedPlugIn.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSnapshottedPlugIn.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderSnapshottedPlugIn.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -43,7 +43,7 @@
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;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -287,7 +287,7 @@
m_lineBoxes.deleteAll();
}
-void RenderText::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderText::willBeDestroyed()
{
secureTextTimers().remove(this);
@@ -298,7 +298,7 @@
setInlineWrapperForDisplayContents(nullptr);
- RenderObject::willBeDestroyed(builder);
+ RenderObject::willBeDestroyed();
}
void RenderText::deleteLineBoxesBeforeSimpleLineLayout()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderText.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -183,7 +183,7 @@
protected:
virtual void computePreferredLogicalWidths(float leadWidth);
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
virtual void setRenderedText(const String&);
virtual UChar previousCharacter() const;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderTextControlMultiLine.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderTextControlMultiLine.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderTextControlMultiLine.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -45,12 +45,12 @@
// 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
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderTextControlMultiLine.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderTextControlMultiLine.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderTextControlMultiLine.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -35,7 +35,7 @@
HTMLTextAreaElement& textAreaElement() const;
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void element() const = delete;
bool isTextArea() const override { return true; }
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderVideo.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderVideo.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderVideo.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -62,12 +62,12 @@
// 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()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderVideo.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderVideo.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderVideo.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -54,7 +54,7 @@
void updateFromElement() final;
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void mediaElement() const = delete;
void intrinsicSizeChanged() final;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderWidget.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderWidget.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderWidget.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -88,7 +88,7 @@
setInline(false);
}
-void RenderWidget::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderWidget::willBeDestroyed()
{
#if PLATFORM(IOS)
if (hasLayer())
@@ -102,7 +102,7 @@
setWidget(nullptr);
- RenderReplaced::willBeDestroyed(builder);
+ RenderReplaced::willBeDestroyed();
}
RenderWidget::~RenderWidget()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderWidget.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderWidget.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderWidget.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -77,7 +77,7 @@
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;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGBlock.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGBlock.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGBlock.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -71,10 +71,10 @@
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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGBlock.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGBlock.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGBlock.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -35,7 +35,7 @@
protected:
RenderSVGBlock(SVGGraphicsElement&, RenderStyle&&);
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
private:
void element() const = delete;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGImage.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGImage.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -57,10 +57,10 @@
RenderSVGImage::~RenderSVGImage() = default;
-void RenderSVGImage::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGImage::willBeDestroyed()
{
imageResource().shutdown();
- RenderSVGModelObject::willBeDestroyed(builder);
+ RenderSVGModelObject::willBeDestroyed();
}
SVGImageElement& RenderSVGImage::imageElement() const
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGImage.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGImage.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGImage.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -52,7 +52,7 @@
void paintForeground(PaintInfo&);
private:
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void element() const = delete;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGInline.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -101,10 +101,10 @@
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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGInline.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGInline.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGInline.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -58,7 +58,7 @@
std::unique_ptr<InlineFlowBox> createInlineFlowBox() final;
- void willBeDestroyed(RenderTreeBuilder&) final;
+ void willBeDestroyed() final;
void styleDidChange(StyleDifference, const RenderStyle* oldStyle) final;
};
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -92,10 +92,10 @@
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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGModelObject.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -69,7 +69,7 @@
protected:
RenderSVGModelObject(SVGElement&, RenderStyle&&);
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
private:
bool isRenderSVGModelObject() const final { return true; }
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -55,7 +55,7 @@
RenderSVGHiddenContainer::layout();
}
-void RenderSVGResourceContainer::willBeDestroyed(RenderTreeBuilder& builder)
+void RenderSVGResourceContainer::willBeDestroyed()
{
SVGResourcesCache::resourceDestroyed(*this);
@@ -64,7 +64,7 @@
m_registered = false;
}
- RenderSVGHiddenContainer::willBeDestroyed(builder);
+ RenderSVGHiddenContainer::willBeDestroyed();
}
void RenderSVGResourceContainer::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -67,7 +67,7 @@
void addClient(RenderElement&);
void removeClient(RenderElement&);
- void willBeDestroyed(RenderTreeBuilder&) final;
+ void willBeDestroyed() final;
void registerResource();
AtomicString m_id;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -270,12 +270,12 @@
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()
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGRoot.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGRoot.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGRoot.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -76,7 +76,7 @@
void layout() override;
void paintReplaced(PaintInfo&, const LayoutPoint&) override;
- void willBeDestroyed(RenderTreeBuilder&) override;
+ void willBeDestroyed() override;
void insertedIntoTree() override;
void willBeRemovedFromTree() override;
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGText.cpp (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGText.cpp 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGText.cpp 2018-02-26 16:06:19 UTC (rev 229025)
@@ -225,12 +225,12 @@
#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)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGText.h (229024 => 229025)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGText.h 2018-02-26 16:05:58 UTC (rev 229024)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/svg/RenderSVGText.h 2018-02-26 16:06:19 UTC (rev 229025)
@@ -83,7 +83,7 @@
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; }
