Changeset 222823 in webkit

Timestamp:

Oct 3, 2017 5:13:33 PM (7 years ago)

Author:

Alan Bujtas

Message:

Move scroll snap point unregistration from willBeRemovedFromTree to willBeDestroyed
​https://bugs.webkit.org/show_bug.cgi?id=177830
<rdar://problem/34796065>

Reviewed by Antti Koivisto.

willBeRemovedFromTree is called conditionally, relying on unregistering objects in there is highly error prone.

Covered by existing tests.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::willBeDestroyed):
(WebCore::RenderBox::willBeRemovedFromTree): Deleted.

• rendering/RenderBox.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-03  Zalan Bujtas <zalan@apple.com>
+
+        Move scroll snap point unregistration from willBeRemovedFromTree to willBeDestroyed
+        https://bugs.webkit.org/show_bug.cgi?id=177830
+        <rdar://problem/34796065>
+
+        Reviewed by Antti Koivisto.
+
+        willBeRemovedFromTree is called conditionally, relying on unregistering objects in there is highly error prone.
+
+        Covered by existing tests.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::willBeDestroyed):
+        (WebCore::RenderBox::willBeRemovedFromTree): Deleted.
+        * rendering/RenderBox.h:
+
 2017-10-03  Joanmarie Diggs  <jdiggs@igalia.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -161 +161 @@
     view().unscheduleLazyRepaint(*this);
     removeControlStatesForRenderer(*this);
-    
+
+#if ENABLE(CSS_SCROLL_SNAP)
+    if (hasInitializedStyle() && style().scrollSnapArea().hasSnapPosition())
+        view().unregisterBoxWithScrollSnapPositions(*this);
+#endif
+
     RenderBoxModelObject::willBeDestroyed();
 }
@@ -402 +407 @@
     updateGridPositionAfterStyleChange(style(), oldStyle);
 }
-
-void RenderBox::willBeRemovedFromTree()
-{
-#if ENABLE(CSS_SCROLL_SNAP)
-    if (hasInitializedStyle() && style().scrollSnapArea().hasSnapPosition())
-        view().unregisterBoxWithScrollSnapPositions(*this);
-#endif
-    
-    RenderBoxModelObject::willBeRemovedFromTree();
-}
-    
 
 void RenderBox::updateGridPositionAfterStyleChange(const RenderStyle& style, const RenderStyle* oldStyle)

trunk/Source/WebCore/rendering/RenderBox.h

@@ -629 +629 @@
     void updateFromStyle() override;
 
-    void willBeRemovedFromTree() override;
     void willBeDestroyed() override;