Attachment 322560 Details for Bug 177830 – Patch

[patch] Patch

bug-177830-20171003121833.patch (text/plain), 2.75 KB, created by alan on 2017-10-03 12:18:34 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: alan

Created: 2017-10-03 12:18:34 PDT

Size: 2.75 KB

patch

obsolete

>Subversion Revision: 222710
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index fde1699aa46e345703134299269ac5c5418a456d..56def95c4c60fdf63d0276ab66ed9f7c2266a01f 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+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 NOBODY (OOPS!).
>+
>+        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-02  Antti Koivisto  <antti@apple.com>
> 
>         Fix memory leaks in RenderMultiColumnFlow
>diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
>index b8e929be497a65d31ba3911e4aaa8e7d940325dd..ad1d5030b9d7918ebbc02ab3f3368350fd9720ad 100644
>--- a/Source/WebCore/rendering/RenderBox.cpp
>+++ b/Source/WebCore/rendering/RenderBox.cpp
>@@ -160,7 +160,12 @@ void RenderBox::willBeDestroyed()
> 
>     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 @@ void RenderBox::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle
>     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()))
>diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
>index c2159520e337968536041382e66b5456606e8152..77d2fd4afac6a4c1ab8fc461b6b9ead9c814cad9 100644
>--- a/Source/WebCore/rendering/RenderBox.h
>+++ b/Source/WebCore/rendering/RenderBox.h
>@@ -628,7 +628,6 @@ protected:
>     void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
>     void updateFromStyle() override;
> 
>-    void willBeRemovedFromTree() override;
>     void willBeDestroyed() override;
> 
>     bool createsNewFormattingContext() const;

Actions: View | Formatted Diff | Diff

Attachments on bug 177830: 322560