<!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>[170131] 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/170131">170131</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-18 16:49:26 -0700 (Wed, 18 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the removeNode() tree walking from ScrollingStateNote into ScrollingStateTree
https://bugs.webkit.org/show_bug.cgi?id=134043
Reviewed by Beth Dakin.
It's cleaner if ScrollingStateTree does the descendant walk when removing nodes.
We can simply start the "willBeRemoved" walk at the node in question.
Have willRemoveNode() just remove the node from the m_stateNodeMap directly, rather
than this happening in a separate walk of m_nodesRemovedSinceLastCommit.
* page/scrolling/ScrollingStateNode.cpp:
(WebCore::ScrollingStateNode::removeDescendant): Deleted.
(WebCore::ScrollingStateNode::willBeRemovedFromStateTree): Deleted.
* page/scrolling/ScrollingStateNode.h:
* page/scrolling/ScrollingStateTree.cpp:
(WebCore::ScrollingStateTree::attachNode):
(WebCore::ScrollingStateTree::detachNode):
(WebCore::ScrollingStateTree::clear):
(WebCore::ScrollingStateTree::removeNodeAndAllDescendants):
(WebCore::ScrollingStateTree::recursiveNodeWillBeRemoved):
(WebCore::ScrollingStateTree::willRemoveNode):
(WebCore::ScrollingStateTree::removeNode): Deleted.
* page/scrolling/ScrollingStateTree.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="#trunkSourceWebCorepagescrollingScrollingStateNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170130 => 170131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-18 23:42:57 UTC (rev 170130)
+++ trunk/Source/WebCore/ChangeLog 2014-06-18 23:49:26 UTC (rev 170131)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-06-18 Simon Fraser <simon.fraser@apple.com>
+
+ Move the removeNode() tree walking from ScrollingStateNote into ScrollingStateTree
+ https://bugs.webkit.org/show_bug.cgi?id=134043
+
+ Reviewed by Beth Dakin.
+
+ It's cleaner if ScrollingStateTree does the descendant walk when removing nodes.
+ We can simply start the "willBeRemoved" walk at the node in question.
+
+ Have willRemoveNode() just remove the node from the m_stateNodeMap directly, rather
+ than this happening in a separate walk of m_nodesRemovedSinceLastCommit.
+
+ * page/scrolling/ScrollingStateNode.cpp:
+ (WebCore::ScrollingStateNode::removeDescendant): Deleted.
+ (WebCore::ScrollingStateNode::willBeRemovedFromStateTree): Deleted.
+ * page/scrolling/ScrollingStateNode.h:
+ * page/scrolling/ScrollingStateTree.cpp:
+ (WebCore::ScrollingStateTree::attachNode):
+ (WebCore::ScrollingStateTree::detachNode):
+ (WebCore::ScrollingStateTree::clear):
+ (WebCore::ScrollingStateTree::removeNodeAndAllDescendants):
+ (WebCore::ScrollingStateTree::recursiveNodeWillBeRemoved):
+ (WebCore::ScrollingStateTree::willRemoveNode):
+ (WebCore::ScrollingStateTree::removeNode): Deleted.
+ * page/scrolling/ScrollingStateTree.h:
+
</ins><span class="cx"> 2014-06-18 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [iOS WebGL] Fixed WEBGL_compressed_texture_pvrtc.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (170130 => 170131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2014-06-18 23:42:57 UTC (rev 170130)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2014-06-18 23:49:26 UTC (rev 170131)
</span><span class="lines">@@ -102,32 +102,6 @@
</span><span class="cx"> m_children->append(childNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingStateNode::removeDescendant(ScrollingStateNode* node)
-{
- if (!m_children)
- return;
-
- size_t index = m_children->find(node);
- if (index != notFound) {
- node->willBeRemovedFromStateTree();
- m_children->remove(index);
- return;
- }
-
- for (auto& child : *m_children)
- child->removeDescendant(node);
-}
-
-void ScrollingStateNode::willBeRemovedFromStateTree()
-{
- scrollingStateTree().willRemoveNode(this);
- if (!m_children)
- return;
-
- for (auto& child : *m_children)
- child->willBeRemovedFromStateTree();
-}
-
</del><span class="cx"> void ScrollingStateNode::setLayer(const LayerRepresentation& layerRepresentation)
</span><span class="cx"> {
</span><span class="cx"> if (layerRepresentation == m_layer)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (170130 => 170131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-06-18 23:42:57 UTC (rev 170130)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-06-18 23:49:26 UTC (rev 170131)
</span><span class="lines">@@ -198,7 +198,6 @@
</span><span class="cx"> Vector<RefPtr<ScrollingStateNode>>* children() const { return m_children.get(); }
</span><span class="cx">
</span><span class="cx"> void appendChild(PassRefPtr<ScrollingStateNode>);
</span><del>- void removeDescendant(ScrollingStateNode*);
</del><span class="cx">
</span><span class="cx"> String scrollingStateTreeAsText() const;
</span><span class="cx">
</span><span class="lines">@@ -209,7 +208,6 @@
</span><span class="cx"> void dump(TextStream&, int indent) const;
</span><span class="cx">
</span><span class="cx"> virtual void dumpProperties(TextStream&, int indent) const = 0;
</span><del>- void willBeRemovedFromStateTree();
</del><span class="cx">
</span><span class="cx"> const ScrollingNodeType m_nodeType;
</span><span class="cx"> ScrollingNodeID m_nodeID;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (170130 => 170131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2014-06-18 23:42:57 UTC (rev 170130)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2014-06-18 23:49:26 UTC (rev 170131)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> return newNodeID;
</span><span class="cx">
</span><span class="cx"> // The node is being re-parented. To do that, we'll remove it, and then re-create a new node.
</span><del>- removeNode(node);
</del><ins>+ removeNodeAndAllDescendants(node);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingStateNode* newNode = nullptr;
</span><span class="lines">@@ -141,12 +141,13 @@
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- removeNode(node);
</del><ins>+ removeNodeAndAllDescendants(node);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingStateTree::clear()
</span><span class="cx"> {
</span><del>- removeNode(rootStateNode());
</del><ins>+ removeNodeAndAllDescendants(rootStateNode());
+ ASSERT(m_stateNodeMap.isEmpty());
</ins><span class="cx"> m_stateNodeMap.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,29 +178,39 @@
</span><span class="cx"> m_stateNodeMap.add(node->scrollingNodeID(), node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingStateTree::removeNode(ScrollingStateNode* node)
</del><ins>+void ScrollingStateTree::removeNodeAndAllDescendants(ScrollingStateNode* node)
</ins><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (node == m_rootStateNode) {
- willRemoveNode(node);
</del><ins>+ recursiveNodeWillBeRemoved(node);
+
+ if (node == m_rootStateNode)
</ins><span class="cx"> m_rootStateNode = nullptr;
</span><del>- return;
</del><ins>+ else if (ScrollingStateNode* parent = node->parent()) {
+ ASSERT(parent->children() && parent->children()->find(node) != notFound);
+ if (auto children = parent->children()) {
+ size_t index = children->find(node);
+ if (index != notFound)
+ children->remove(index);
+ }
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><del>- ASSERT(m_rootStateNode);
- m_rootStateNode->removeDescendant(node);
</del><ins>+void ScrollingStateTree::recursiveNodeWillBeRemoved(ScrollingStateNode* currNode)
+{
+ willRemoveNode(currNode);
</ins><span class="cx">
</span><del>- // ScrollingStateTree::removeDescendant() will destroy children, so we have to make sure we remove those children
- // from the HashMap.
- for (auto removedNodeID : m_nodesRemovedSinceLastCommit)
- m_stateNodeMap.remove(removedNodeID);
</del><ins>+ if (auto children = currNode->children()) {
+ for (auto& child : *children)
+ recursiveNodeWillBeRemoved(child.get());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingStateTree::willRemoveNode(ScrollingStateNode* node)
</span><span class="cx"> {
</span><span class="cx"> m_nodesRemovedSinceLastCommit.append(node->scrollingNodeID());
</span><ins>+ m_stateNodeMap.remove(node->scrollingNodeID());
</ins><span class="cx"> setHasChangedProperties();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h (170130 => 170131)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2014-06-18 23:42:57 UTC (rev 170130)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.h 2014-06-18 23:49:26 UTC (rev 170131)
</span><span class="lines">@@ -81,7 +81,9 @@
</span><span class="cx">
</span><span class="cx"> void setRootStateNode(PassRefPtr<ScrollingStateFrameScrollingNode> rootStateNode) { m_rootStateNode = rootStateNode; }
</span><span class="cx"> void addNode(ScrollingStateNode*);
</span><del>- void removeNode(ScrollingStateNode*);
</del><ins>+ void removeNodeAndAllDescendants(ScrollingStateNode*);
+
+ void recursiveNodeWillBeRemoved(ScrollingStateNode* currNode);
</ins><span class="cx"> void willRemoveNode(ScrollingStateNode*);
</span><span class="cx">
</span><span class="cx"> AsyncScrollingCoordinator* m_scrollingCoordinator;
</span></span></pre>
</div>
</div>
</body>
</html>