Changeset 175475 in webkit
- Timestamp:
- Nov 3, 2014 10:39:08 AM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r175472 r175475 1 2014-11-03 Andreas Kling <akling@apple.com> 2 3 RenderLayerModelObject shouldn't need a pre-destructor hook. 4 <https://webkit.org/b/138314> 5 6 Reviewed by Antti Koivisto. 7 8 Move code from the willBeDestroyed() pre-destructor hook to the regular 9 ~RenderLayerModelObject() destructor. 10 11 We just need to unregister the renderer from the FrameView's set of 12 viewport-constrained objects. That doesn't require being able to walk 13 the render tree or call virtuals, which is the main reason you'd use 14 willBeDestroyed(). 15 16 * rendering/RenderLayerModelObject.cpp: 17 (WebCore::RenderLayerModelObject::~RenderLayerModelObject): 18 (WebCore::RenderLayerModelObject::willBeDestroyed): Deleted. 19 * rendering/RenderLayerModelObject.h: 20 1 21 2014-11-03 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com> 2 22 -
trunk/Source/WebCore/rendering/RenderLayerModelObject.cpp
r173268 r175475 48 48 RenderLayerModelObject::~RenderLayerModelObject() 49 49 { 50 if (isPositioned()) { 51 if (style().hasViewportConstrainedPosition()) 52 view().frameView().removeViewportConstrainedObject(this); 53 } 54 50 55 // Our layer should have been destroyed and cleared by now 51 56 ASSERT(!hasLayer()); … … 71 76 { 72 77 return m_layer && m_layer->isSelfPaintingLayer(); 73 }74 75 void RenderLayerModelObject::willBeDestroyed()76 {77 if (isPositioned()) {78 if (style().hasViewportConstrainedPosition())79 view().frameView().removeViewportConstrainedObject(this);80 }81 82 // RenderObject::willBeDestroyed calls back to destroyLayer() for layer destruction83 RenderElement::willBeDestroyed();84 78 } 85 79 -
trunk/Source/WebCore/rendering/RenderLayerModelObject.h
r174875 r175475 58 58 void createLayer(); 59 59 60 virtual void willBeDestroyed() override;61 62 60 private: 63 61 std::unique_ptr<RenderLayer> m_layer;
Note: See TracChangeset
for help on using the changeset viewer.