Title: [175948] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 175948
- Author
- [email protected]
- Date
- 2014-11-11 09:39:08 -0800 (Tue, 11 Nov 2014)
Log Message
Merge r175580 - RenderBox shouldn't need a pre-destructor hook.
<https://webkit.org/b/138367>
Reviewed by Antti Koivisto.
Move teardown logic from willBeDestroyed() to the regular ~RenderBox()
destructor since none of it depends on being in-tree or having a fully
constructed vtable.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::~RenderBox):
(WebCore::RenderBox::willBeDestroyed): Deleted.
* rendering/RenderBox.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175947 => 175948)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:35:29 UTC (rev 175947)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:39:08 UTC (rev 175948)
@@ -1,5 +1,21 @@
2014-11-04 Andreas Kling <[email protected]>
+ RenderBox shouldn't need a pre-destructor hook.
+ <https://webkit.org/b/138367>
+
+ Reviewed by Antti Koivisto.
+
+ Move teardown logic from willBeDestroyed() to the regular ~RenderBox()
+ destructor since none of it depends on being in-tree or having a fully
+ constructed vtable.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::~RenderBox):
+ (WebCore::RenderBox::willBeDestroyed): Deleted.
+ * rendering/RenderBox.h:
+
+2014-11-04 Andreas Kling <[email protected]>
+
RenderQuote shouldn't need a pre-destructor hook.
<https://webkit.org/b/138352>
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.cpp (175947 => 175948)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.cpp 2014-11-11 17:35:29 UTC (rev 175947)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.cpp 2014-11-11 17:39:08 UTC (rev 175948)
@@ -129,6 +129,20 @@
RenderBox::~RenderBox()
{
+ if (frame().eventHandler().autoscrollRenderer() == this)
+ frame().eventHandler().stopAutoscrollTimer(true);
+
+ clearOverrideSize();
+#if ENABLE(CSS_GRID_LAYOUT)
+ clearContainingBlockOverrideSize();
+#endif
+
+ RenderBlock::removePercentHeightDescendantIfNeeded(*this);
+
+#if ENABLE(CSS_SHAPES)
+ ShapeOutsideInfo::removeInfo(*this);
+#endif
+
view().unscheduleLazyRepaint(*this);
if (hasControlStatesForRenderer(this))
removeControlStatesForRenderer(this);
@@ -234,25 +248,6 @@
return LayoutRect(0, logicalLeft, width(), logicalWidth);
}
-void RenderBox::willBeDestroyed()
-{
- if (frame().eventHandler().autoscrollRenderer() == this)
- frame().eventHandler().stopAutoscrollTimer(true);
-
- clearOverrideSize();
-#if ENABLE(CSS_GRID_LAYOUT)
- clearContainingBlockOverrideSize();
-#endif
-
- RenderBlock::removePercentHeightDescendantIfNeeded(*this);
-
-#if ENABLE(CSS_SHAPES)
- ShapeOutsideInfo::removeInfo(*this);
-#endif
-
- RenderBoxModelObject::willBeDestroyed();
-}
-
RenderBlockFlow* RenderBox::outermostBlockContainingFloatingObject()
{
ASSERT(isFloating());
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.h (175947 => 175948)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.h 2014-11-11 17:35:29 UTC (rev 175947)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderBox.h 2014-11-11 17:39:08 UTC (rev 175948)
@@ -615,8 +615,6 @@
RenderBox(Element&, PassRef<RenderStyle>, unsigned baseTypeFlags);
RenderBox(Document&, PassRef<RenderStyle>, unsigned baseTypeFlags);
- virtual void willBeDestroyed() override;
-
virtual void styleWillChange(StyleDifference, const RenderStyle& newStyle) override;
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
virtual void updateFromStyle() override;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
