Title: [222823] trunk/Source/WebCore
- Revision
- 222823
- Author
- [email protected]
- Date
- 2017-10-03 17:13:33 -0700 (Tue, 03 Oct 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (222822 => 222823)
--- trunk/Source/WebCore/ChangeLog 2017-10-04 00:05:10 UTC (rev 222822)
+++ trunk/Source/WebCore/ChangeLog 2017-10-04 00:13:33 UTC (rev 222823)
@@ -1,3 +1,20 @@
+2017-10-03 Zalan Bujtas <[email protected]>
+
+ 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 <[email protected]>
AX: [ATK] ARIA menuitems should be exposed with ATK_ROLE_MENU_ITEM even when it's the child of group role
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (222822 => 222823)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2017-10-04 00:05:10 UTC (rev 222822)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2017-10-04 00:13:33 UTC (rev 222823)
@@ -160,7 +160,12 @@
view().unscheduleLazyRepaint(*this);
removeControlStatesForRenderer(*this);
-
+
+#if ENABLE(CSS_SCROLL_SNAP)
+ if (hasInitializedStyle() && style().scrollSnapArea().hasSnapPosition())
+ view().unregisterBoxWithScrollSnapPositions(*this);
+#endif
+
RenderBoxModelObject::willBeDestroyed();
}
@@ -402,17 +407,6 @@
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)
{
if (!oldStyle || !is<RenderGrid>(parent()))
Modified: trunk/Source/WebCore/rendering/RenderBox.h (222822 => 222823)
--- trunk/Source/WebCore/rendering/RenderBox.h 2017-10-04 00:05:10 UTC (rev 222822)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2017-10-04 00:13:33 UTC (rev 222823)
@@ -628,7 +628,6 @@
void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
void updateFromStyle() override;
- void willBeRemovedFromTree() override;
void willBeDestroyed() override;
bool createsNewFormattingContext() const;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
