<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[246913] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/246913">246913</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2019-06-27 18:09:45 -0700 (Thu, 27 Jun 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fix crash in ScrollingStateNode::insertChild()
https://bugs.webkit.org/show_bug.cgi?id=199297
rdar://problem/49415136

Reviewed by Tim Horton.

Crash data suggest that 'parent' can be deleted in ScrollingStateTree::insertNode(). To avoid this,
have ScrollingStateTree::m_stateNodeMap store RefPts, and do the same for ScrollingTree::m_nodeMap.

* page/scrolling/ScrollingStateNode.cpp:
(WebCore::ScrollingStateNode::ScrollingStateNode): The relaxAdoptionRequirement() is required
to avoid ASSERT(!m_adoptionIsRequired) when the node is added to the tree in its constructor.
* page/scrolling/ScrollingStateTree.cpp:
(WebCore::ScrollingStateTree::unparentNode):
(WebCore::ScrollingStateTree::unparentChildrenAndDestroyNode):
(WebCore::ScrollingStateTree::detachAndDestroySubtree):
(WebCore::ScrollingStateTree::stateNodeForID const):
* page/scrolling/ScrollingStateTree.h:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::updateTreeFromStateNode):
* page/scrolling/ScrollingTree.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateTreeh">trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeh">trunk/Source/WebCore/page/scrolling/ScrollingTree.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (246912 => 246913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-06-28 01:06:38 UTC (rev 246912)
+++ trunk/Source/WebCore/ChangeLog      2019-06-28 01:09:45 UTC (rev 246913)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2019-06-27  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Fix crash in ScrollingStateNode::insertChild()
+        https://bugs.webkit.org/show_bug.cgi?id=199297
+        rdar://problem/49415136
+
+        Reviewed by Tim Horton.
+
+        Crash data suggest that 'parent' can be deleted in ScrollingStateTree::insertNode(). To avoid this,
+        have ScrollingStateTree::m_stateNodeMap store RefPts, and do the same for ScrollingTree::m_nodeMap.
+
+        * page/scrolling/ScrollingStateNode.cpp:
+        (WebCore::ScrollingStateNode::ScrollingStateNode): The relaxAdoptionRequirement() is required
+        to avoid ASSERT(!m_adoptionIsRequired) when the node is added to the tree in its constructor.
+        * page/scrolling/ScrollingStateTree.cpp:
+        (WebCore::ScrollingStateTree::unparentNode):
+        (WebCore::ScrollingStateTree::unparentChildrenAndDestroyNode):
+        (WebCore::ScrollingStateTree::detachAndDestroySubtree):
+        (WebCore::ScrollingStateTree::stateNodeForID const):
+        * page/scrolling/ScrollingStateTree.h:
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::updateTreeFromStateNode):
+        * page/scrolling/ScrollingTree.h:
+
+2019-06-27  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         REGRESSION (r246869): ASSERTION FAILED: !renderer().hasRepaintLayoutRects() || renderer().repaintLayoutRects().m_repaintRect == renderer().clippedOverflowRectForRepaint(renderer().containerForRepaint())
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=199274
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (246912 => 246913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp       2019-06-28 01:06:38 UTC (rev 246912)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp  2019-06-28 01:09:45 UTC (rev 246913)
</span><span class="lines">@@ -53,6 +53,8 @@
</span><span class="cx"> {
</span><span class="cx">     if (hasChangedProperty(Layer))
</span><span class="cx">         setLayer(stateNode.layer().toRepresentation(adoptiveTree.preferredLayerRepresentation()));
</span><ins>+
+    relaxAdoptionRequirement();
</ins><span class="cx">     scrollingStateTree().addNode(*this);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (246912 => 246913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp       2019-06-28 01:06:38 UTC (rev 246912)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp  2019-06-28 01:09:45 UTC (rev 246913)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">     LOG_WITH_STREAM(Scrolling, stream << "ScrollingStateTree " << this << " unparentNode " << nodeID);
</span><span class="cx"> 
</span><span class="cx">     // The node may not be found if clear() was recently called.
</span><del>-    RefPtr<ScrollingStateNode> protectedNode = m_stateNodeMap.get(nodeID);
</del><ins>+    auto protectedNode = m_stateNodeMap.get(nodeID);
</ins><span class="cx">     if (!protectedNode)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx">     LOG_WITH_STREAM(Scrolling, stream << "ScrollingStateTree " << this << " unparentChildrenAndDestroyNode " << nodeID);
</span><span class="cx"> 
</span><span class="cx">     // The node may not be found if clear() was recently called.
</span><del>-    RefPtr<ScrollingStateNode> protectedNode = m_stateNodeMap.take(nodeID);
</del><ins>+    auto protectedNode = m_stateNodeMap.take(nodeID);
</ins><span class="cx">     if (!protectedNode)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="lines">@@ -256,13 +256,13 @@
</span><span class="cx">     LOG_WITH_STREAM(Scrolling, stream << "ScrollingStateTree " << this << " detachAndDestroySubtree " << nodeID);
</span><span class="cx"> 
</span><span class="cx">     // The node may not be found if clear() was recently called.
</span><del>-    auto* node = m_stateNodeMap.take(nodeID);
</del><ins>+    auto node = m_stateNodeMap.take(nodeID);
</ins><span class="cx">     if (!node)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     // If the node was unparented, remove it from m_unparentedNodes (keeping it alive until this function returns).
</span><span class="cx">     auto unparentedNode = m_unparentedNodes.take(nodeID);
</span><del>-    removeNodeAndAllDescendants(node);
</del><ins>+    removeNodeAndAllDescendants(node.get());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingStateTree::clear()
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx">         return nullptr;
</span><span class="cx"> 
</span><span class="cx">     ASSERT(it->value->scrollingNodeID() == scrollLayerID);
</span><del>-    return it->value;
</del><ins>+    return it->value.get();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingStateTree::reconcileLayerPositionsRecursive(ScrollingStateNode& currNode, const LayoutRect& layoutViewport, ScrollingLayerPositionAction action)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h (246912 => 246913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2019-06-28 01:06:38 UTC (rev 246912)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h    2019-06-28 01:09:45 UTC (rev 246913)
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> 
</span><span class="cx">     unsigned nodeCount() const { return m_stateNodeMap.size(); }
</span><span class="cx"> 
</span><del>-    typedef HashMap<ScrollingNodeID, ScrollingStateNode*> StateNodeMap;
</del><ins>+    typedef HashMap<ScrollingNodeID, RefPtr<ScrollingStateNode>> StateNodeMap;
</ins><span class="cx">     const StateNodeMap& nodeMap() const { return m_stateNodeMap; }
</span><span class="cx"> 
</span><span class="cx">     LayerRepresentation::Type preferredLayerRepresentation() const { return m_preferredLayerRepresentation; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (246912 => 246913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp    2019-06-28 01:06:38 UTC (rev 246912)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp       2019-06-28 01:09:45 UTC (rev 246913)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx">         auto parentIt = m_nodeMap.find(parentNodeID);
</span><span class="cx">         ASSERT_WITH_SECURITY_IMPLICATION(parentIt != m_nodeMap.end());
</span><span class="cx">         if (parentIt != m_nodeMap.end()) {
</span><del>-            auto* parent = parentIt->value;
</del><ins>+            auto* parent = parentIt->value.get();
</ins><span class="cx"> 
</span><span class="cx">             auto* oldParent = node->parent();
</span><span class="cx">             if (oldParent)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (246912 => 246913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h      2019-06-28 01:06:38 UTC (rev 246912)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2019-06-28 01:09:45 UTC (rev 246913)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> 
</span><span class="cx">     RefPtr<ScrollingTreeFrameScrollingNode> m_rootNode;
</span><span class="cx"> 
</span><del>-    using ScrollingTreeNodeMap = HashMap<ScrollingNodeID, ScrollingTreeNode*>;
</del><ins>+    using ScrollingTreeNodeMap = HashMap<ScrollingNodeID, RefPtr<ScrollingTreeNode>>;
</ins><span class="cx">     ScrollingTreeNodeMap m_nodeMap;
</span><span class="cx"> 
</span><span class="cx">     RelatedNodesMap m_overflowRelatedNodesMap;
</span></span></pre>
</div>
</div>

</body>
</html>