Attachment 360381 Details for Bug 193925 – Patch

[patch] Patch

bug-193925-20190128151212.patch (text/plain), 2.11 KB, created by Simon Fraser (smfr) on 2019-01-28 15:12:13 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-01-28 15:12:13 PST

Size: 2.11 KB

patch

obsolete

>Subversion Revision: 240598
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index dad7450a94448006eb972a12262a27fec00c400f..f96783cbc9887756e111a62144c6a0fd9c1d2261 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-01-28  Simon Fraser  <simon.fraser@apple.com>
>+
>+        css3/filters/blur-filter-page-scroll-self.html crashes under WebCore::ScrollingStateNode::ScrollingStateNode
>+        https://bugs.webkit.org/show_bug.cgi?id=193925
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Some css3/filters/ tests disable accelerated compositing (which is crazy). Make these
>+        tests not crash by ensuring that unparentNode() and unparentChildrenAndDestroyNode() clears the root
>+        node if it's the node being unparented or destroyed.
>+
>+        Tested by existing tests.
>+
>+        * page/scrolling/ScrollingStateTree.cpp:
>+        (WebCore::ScrollingStateTree::unparentNode):
>+        (WebCore::ScrollingStateTree::unparentChildrenAndDestroyNode):
>+
> 2019-01-28  Antoine Quint  <graouts@apple.com>
> 
>         Limit user-agent interactions based on the touch-action property on iOS
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateTree.cpp b/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>index d5456984ae6263e263ccd31d932261ea074826a1..5fa12294e3323ea7ad8c942141e4bf92444e6fa2 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>@@ -204,6 +204,9 @@ void ScrollingStateTree::unparentNode(ScrollingNodeID nodeID)
>     if (!protectedNode)
>         return;
> 
>+    if (protectedNode == m_rootStateNode)
>+        m_rootStateNode = nullptr;
>+
>     protectedNode->removeFromParent();
>     m_unparentedNodes.add(nodeID, WTFMove(protectedNode));
> }
>@@ -220,6 +223,9 @@ void ScrollingStateTree::unparentChildrenAndDestroyNode(ScrollingNodeID nodeID)
>     if (!protectedNode)
>         return;
> 
>+    if (protectedNode == m_rootStateNode)
>+        m_rootStateNode = nullptr;
>+
>     if (auto* children = protectedNode->children()) {
>         for (auto child : *children) {
>             child->removeFromParent();

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193925: 360381