Title: [229018] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 229018
- Author
- [email protected]
- Date
- 2018-02-26 05:57:25 -0800 (Mon, 26 Feb 2018)
Log Message
Merge r228889 - [RenderTreeBuilder] Move RenderView::willBeRemoved() mutation logic to RenderTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=183009
Reviewed by Antti Koivisto.
No change in functionality.
* dom/Document.cpp:
(WebCore::Document::destroyRenderTree):
* rendering/RenderView.cpp:
(WebCore::RenderView::~RenderView):
(WebCore::RenderView::willBeDestroyed): Deleted.
* rendering/RenderView.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229017 => 229018)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 13:57:17 UTC (rev 229017)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 13:57:25 UTC (rev 229018)
@@ -1,3 +1,19 @@
+2018-02-21 Zalan Bujtas <[email protected]>
+
+ [RenderTreeBuilder] Move RenderView::willBeRemoved() mutation logic to RenderTreeBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=183009
+
+ Reviewed by Antti Koivisto.
+
+ No change in functionality.
+
+ * dom/Document.cpp:
+ (WebCore::Document::destroyRenderTree):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::~RenderView):
+ (WebCore::RenderView::willBeDestroyed): Deleted.
+ * rendering/RenderView.h:
+
2018-02-21 Michael Catanzaro <[email protected]>
[GTK] USE_UPOWER causes crashes inside a chroot or on systems with broken dbus/upower
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/dom/Document.cpp (229017 => 229018)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/dom/Document.cpp 2018-02-26 13:57:17 UTC (rev 229017)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/dom/Document.cpp 2018-02-26 13:57:25 UTC (rev 229018)
@@ -2317,6 +2317,9 @@
// FIXME: RenderObject::view() uses m_renderView and we can't null it before destruction is completed
{
RenderTreeBuilder builder(*m_renderView);
+ // FIXME: This is a workaround for leftover content (see webkit.org/b/182547).
+ while (m_renderView->firstChild())
+ builder.removeAndDestroy(*m_renderView->firstChild());
m_renderView->destroy();
}
m_renderView.release();
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderView.cpp (229017 => 229018)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderView.cpp 2018-02-26 13:57:17 UTC (rev 229017)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderView.cpp 2018-02-26 13:57:25 UTC (rev 229018)
@@ -103,7 +103,10 @@
setPositionState(AbsolutePosition); // to 0,0 :)
}
-RenderView::~RenderView() = default;
+RenderView::~RenderView()
+{
+ ASSERT_WITH_MESSAGE(m_rendererCount == 1, "All other renderers in this render tree should have been destroyed");
+}
void RenderView::scheduleLazyRepaint(RenderBox& renderer)
{
@@ -611,16 +614,6 @@
return frameView().isScrollable(defineScrollable);
}
-void RenderView::willBeDestroyed(RenderTreeBuilder& builder)
-{
- RenderBlockFlow::willBeDestroyed(builder);
- // FIXME: This is a workaround for leftover content (see webkit.org/b/182547).
- while (firstChild())
- builder.removeAndDestroy(*firstChild());
-
- ASSERT_WITH_MESSAGE(m_rendererCount == 1, "All other renderers in this render tree should have been destroyed");
-}
-
void RenderView::absoluteRects(Vector<IntRect>& rects, const LayoutPoint& accumulatedOffset) const
{
rects.append(snappedIntRect(accumulatedOffset, layer()->size()));
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderView.h (229017 => 229018)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderView.h 2018-02-26 13:57:17 UTC (rev 229017)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderView.h 2018-02-26 13:57:25 UTC (rev 229018)
@@ -214,8 +214,6 @@
bool isScrollableOrRubberbandableBox() const override;
- void willBeDestroyed(RenderTreeBuilder&) override;
-
private:
FrameView& m_frameView;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
