Title: [229005] releases/WebKitGTK/webkit-2.20/Source/WebCore
- Revision
- 229005
- Author
- [email protected]
- Date
- 2018-02-26 05:14:00 -0800 (Mon, 26 Feb 2018)
Log Message
Merge r228858 - [RenderTreeBuilder] Move RenderListItem::willBeRemoved() mutation logic to RenderTreeBuilder
https://bugs.webkit.org/show_bug.cgi?id=182943
<rdar://problem/37689029>
Reviewed by Antti Koivisto.
We don't need to destroy the marker in RenderListItem::willBeRemoved(), because it gets deleted
in RenderTreeBuilder::removeAndDestroy() together with RenderListItem (as long as the marker is
the RenderListItem's descendent).
Covered by existing tests.
* rendering/RenderListItem.cpp:
(WebCore::RenderListItem::~RenderListItem):
(WebCore::RenderListItem::willBeDestroyed): Deleted.
* rendering/RenderListItem.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog (229004 => 229005)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 13:07:41 UTC (rev 229004)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog 2018-02-26 13:14:00 UTC (rev 229005)
@@ -1,3 +1,22 @@
+2018-02-20 Zalan Bujtas <[email protected]>
+
+ [RenderTreeBuilder] Move RenderListItem::willBeRemoved() mutation logic to RenderTreeBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=182943
+ <rdar://problem/37689029>
+
+ Reviewed by Antti Koivisto.
+
+ We don't need to destroy the marker in RenderListItem::willBeRemoved(), because it gets deleted
+ in RenderTreeBuilder::removeAndDestroy() together with RenderListItem (as long as the marker is
+ the RenderListItem's descendent).
+
+ Covered by existing tests.
+
+ * rendering/RenderListItem.cpp:
+ (WebCore::RenderListItem::~RenderListItem):
+ (WebCore::RenderListItem::willBeDestroyed): Deleted.
+ * rendering/RenderListItem.h:
+
2018-02-20 Chris Dumez <[email protected]>
Crash under JSC::JSCell::toNumber(JSC::ExecState*)
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListItem.cpp (229004 => 229005)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListItem.cpp 2018-02-26 13:07:41 UTC (rev 229004)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListItem.cpp 2018-02-26 13:14:00 UTC (rev 229005)
@@ -53,15 +53,9 @@
RenderListItem::~RenderListItem()
{
// Do not add any code here. Add it to willBeDestroyed() instead.
+ ASSERT(!m_marker);
}
-void RenderListItem::willBeDestroyed(RenderTreeBuilder& builder)
-{
- if (m_marker)
- builder.removeAndDestroy(*m_marker);
- RenderBlockFlow::willBeDestroyed(builder);
-}
-
RenderStyle RenderListItem::computeMarkerStyle() const
{
// The marker always inherits from the list item, regardless of where it might end
Modified: releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListItem.h (229004 => 229005)
--- releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListItem.h 2018-02-26 13:07:41 UTC (rev 229004)
+++ releases/WebKitGTK/webkit-2.20/Source/WebCore/rendering/RenderListItem.h 2018-02-26 13:14:00 UTC (rev 229005)
@@ -62,7 +62,6 @@
bool isInReversedOrderedList() const;
private:
- void willBeDestroyed(RenderTreeBuilder&) final;
const char* renderName() const final { return "RenderListItem"; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
