Title: [175940] releases/WebKitGTK/webkit-2.6/Source/WebCore
- Revision
- 175940
- Author
- [email protected]
- Date
- 2014-11-11 09:21:41 -0800 (Tue, 11 Nov 2014)
Log Message
Merge r175475 - RenderLayerModelObject shouldn't need a pre-destructor hook.
<https://webkit.org/b/138314>
Reviewed by Antti Koivisto.
Move code from the willBeDestroyed() pre-destructor hook to the regular
~RenderLayerModelObject() destructor.
We just need to unregister the renderer from the FrameView's set of
viewport-constrained objects. That doesn't require being able to walk
the render tree or call virtuals, which is the main reason you'd use
willBeDestroyed().
* rendering/RenderLayerModelObject.cpp:
(WebCore::RenderLayerModelObject::~RenderLayerModelObject):
(WebCore::RenderLayerModelObject::willBeDestroyed): Deleted.
* rendering/RenderLayerModelObject.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (175939 => 175940)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:16:02 UTC (rev 175939)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-11-11 17:21:41 UTC (rev 175940)
@@ -1,3 +1,23 @@
+2014-11-03 Andreas Kling <[email protected]>
+
+ RenderLayerModelObject shouldn't need a pre-destructor hook.
+ <https://webkit.org/b/138314>
+
+ Reviewed by Antti Koivisto.
+
+ Move code from the willBeDestroyed() pre-destructor hook to the regular
+ ~RenderLayerModelObject() destructor.
+
+ We just need to unregister the renderer from the FrameView's set of
+ viewport-constrained objects. That doesn't require being able to walk
+ the render tree or call virtuals, which is the main reason you'd use
+ willBeDestroyed().
+
+ * rendering/RenderLayerModelObject.cpp:
+ (WebCore::RenderLayerModelObject::~RenderLayerModelObject):
+ (WebCore::RenderLayerModelObject::willBeDestroyed): Deleted.
+ * rendering/RenderLayerModelObject.h:
+
2014-11-02 Chris Dumez <[email protected]>
Reduce the cost of argumentCount checks in the JS bindings
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerModelObject.cpp (175939 => 175940)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-11-11 17:16:02 UTC (rev 175939)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerModelObject.cpp 2014-11-11 17:21:41 UTC (rev 175940)
@@ -47,6 +47,11 @@
RenderLayerModelObject::~RenderLayerModelObject()
{
+ if (isPositioned()) {
+ if (style().hasViewportConstrainedPosition())
+ view().frameView().removeViewportConstrainedObject(this);
+ }
+
// Our layer should have been destroyed and cleared by now
ASSERT(!hasLayer());
ASSERT(!m_layer);
@@ -72,17 +77,6 @@
return m_layer && m_layer->isSelfPaintingLayer();
}
-void RenderLayerModelObject::willBeDestroyed()
-{
- if (isPositioned()) {
- if (style().hasViewportConstrainedPosition())
- view().frameView().removeViewportConstrainedObject(this);
- }
-
- // RenderObject::willBeDestroyed calls back to destroyLayer() for layer destruction
- RenderElement::willBeDestroyed();
-}
-
void RenderLayerModelObject::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
{
s_wasFloating = isFloating();
Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerModelObject.h (175939 => 175940)
--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerModelObject.h 2014-11-11 17:16:02 UTC (rev 175939)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderLayerModelObject.h 2014-11-11 17:21:41 UTC (rev 175940)
@@ -57,8 +57,6 @@
void createLayer();
- virtual void willBeDestroyed() override;
-
private:
std::unique_ptr<RenderLayer> m_layer;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
