<!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>[208395] trunk/Source</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/208395">208395</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-11-04 12:42:26 -0700 (Fri, 04 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename some ScrollingTree/Node-related functions to reduce the number of uses of "update"
https://bugs.webkit.org/show_bug.cgi?id=164420
Reviewed by Tim Horton.
Rename:
commitNewTreeState -> commitTreeState ("new" was redundant)
updateBeforeChildren -> commitStateBeforeChildren
updateAfterChildren -> commitStateAfterChildren
Source/WebCore:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::commitTreeState):
(WebCore::ScrollingTree::updateTreeFromStateNode):
(WebCore::ScrollingTree::commitNewTreeState): Deleted.
* page/scrolling/ScrollingTree.h:
* page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
(WebCore::ScrollingTreeFrameScrollingNode::commitStateBeforeChildren):
(WebCore::ScrollingTreeFrameScrollingNode::updateBeforeChildren): Deleted.
* page/scrolling/ScrollingTreeFrameScrollingNode.h:
* page/scrolling/ScrollingTreeNode.h:
(WebCore::ScrollingTreeNode::commitStateAfterChildren):
(WebCore::ScrollingTreeNode::updateAfterChildren): Deleted.
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
(WebCore::ScrollingTreeScrollingNode::commitStateAfterChildren):
(WebCore::ScrollingTreeScrollingNode::updateBeforeChildren): Deleted.
(WebCore::ScrollingTreeScrollingNode::updateAfterChildren): Deleted.
* page/scrolling/ScrollingTreeScrollingNode.h:
* page/scrolling/ThreadedScrollingTree.cpp:
(WebCore::ThreadedScrollingTree::commitTreeState):
(WebCore::ThreadedScrollingTree::commitNewTreeState): Deleted.
* page/scrolling/ThreadedScrollingTree.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::commitStateBeforeChildren):
(WebCore::ScrollingTreeFrameScrollingNodeIOS::commitStateAfterChildren):
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren): Deleted.
(WebCore::ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren): Deleted.
* page/scrolling/ios/ScrollingTreeIOS.cpp:
(WebCore::ScrollingTreeIOS::commitNewTreeState): Deleted.
* page/scrolling/ios/ScrollingTreeIOS.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::commitTreeState):
* page/scrolling/mac/ScrollingTreeFixedNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::commitStateBeforeChildren):
(WebCore::ScrollingTreeFixedNode::updateBeforeChildren): Deleted.
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren):
(WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateAfterChildren):
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren): Deleted.
(WebCore::ScrollingTreeFrameScrollingNodeMac::updateAfterChildren): Deleted.
* page/scrolling/mac/ScrollingTreeStickyNode.h:
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::commitStateBeforeChildren):
(WebCore::ScrollingTreeStickyNode::updateBeforeChildren): Deleted.
Source/WebKit2:
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
(WebKit::RemoteScrollingCoordinatorProxy::commitScrollingTreeState):
(WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree): Deleted.
* UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::commitStateBeforeChildren):
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::commitStateAfterChildren):
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren): Deleted.
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren): Deleted.
* UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
(WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingThreadedScrollingTreeh">trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingTreeIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh">trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm">trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm">trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/ChangeLog 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -1,3 +1,63 @@
</span><ins>+2016-11-04 Simon Fraser <simon.fraser@apple.com>
+
+ Rename some ScrollingTree/Node-related functions to reduce the number of uses of "update"
+ https://bugs.webkit.org/show_bug.cgi?id=164420
+
+ Reviewed by Tim Horton.
+
+ Rename:
+ commitNewTreeState -> commitTreeState ("new" was redundant)
+ updateBeforeChildren -> commitStateBeforeChildren
+ updateAfterChildren -> commitStateAfterChildren
+
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::commitTreeState):
+ (WebCore::ScrollingTree::updateTreeFromStateNode):
+ (WebCore::ScrollingTree::commitNewTreeState): Deleted.
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+ (WebCore::ScrollingTreeFrameScrollingNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNode::updateBeforeChildren): Deleted.
+ * page/scrolling/ScrollingTreeFrameScrollingNode.h:
+ * page/scrolling/ScrollingTreeNode.h:
+ (WebCore::ScrollingTreeNode::commitStateAfterChildren):
+ (WebCore::ScrollingTreeNode::updateAfterChildren): Deleted.
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeScrollingNode::commitStateAfterChildren):
+ (WebCore::ScrollingTreeScrollingNode::updateBeforeChildren): Deleted.
+ (WebCore::ScrollingTreeScrollingNode::updateAfterChildren): Deleted.
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ (WebCore::ThreadedScrollingTree::commitTreeState):
+ (WebCore::ThreadedScrollingTree::commitNewTreeState): Deleted.
+ * page/scrolling/ThreadedScrollingTree.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::commitStateAfterChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren): Deleted.
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren): Deleted.
+ * page/scrolling/ios/ScrollingTreeIOS.cpp:
+ (WebCore::ScrollingTreeIOS::commitNewTreeState): Deleted.
+ * page/scrolling/ios/ScrollingTreeIOS.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::commitTreeState):
+ * page/scrolling/mac/ScrollingTreeFixedNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFixedNode::updateBeforeChildren): Deleted.
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::commitStateAfterChildren):
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren): Deleted.
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::updateAfterChildren): Deleted.
+ * page/scrolling/mac/ScrollingTreeStickyNode.h:
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::commitStateBeforeChildren):
+ (WebCore::ScrollingTreeStickyNode::updateBeforeChildren): Deleted.
+
</ins><span class="cx"> 2016-11-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add new 'other' Apple Pay button style
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> scrollingTreeNodeDidScroll(nodeID, scrollPosition, inUserInteration ? SyncScrollingLayerPosition : SetScrollingLayerPosition);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTree::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</del><ins>+void ScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</ins><span class="cx"> {
</span><span class="cx"> bool rootStateNodeChanged = scrollingStateTree->hasNewRootStateNode();
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- node->updateBeforeChildren(*stateNode);
</del><ins>+ node->commitStateBeforeChildren(*stateNode);
</ins><span class="cx">
</span><span class="cx"> // Move all children into the orphanNodes map. Live ones will get added back as we recurse over children.
</span><span class="cx"> if (auto nodeChildren = node->children()) {
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> updateTreeFromStateNode(child.get(), orphanNodes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- node->updateAfterChildren(*stateNode);
</del><ins>+ node->commitStateAfterChildren(*stateNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTree::removeDestroyedNodes(const ScrollingStateTree& stateTree)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> bool isScrollSnapInProgress();
</span><span class="cx">
</span><span class="cx"> virtual void invalidate() { }
</span><del>- WEBCORE_EXPORT virtual void commitNewTreeState(std::unique_ptr<ScrollingStateTree>);
</del><ins>+ WEBCORE_EXPORT virtual void commitTreeState(std::unique_ptr<ScrollingStateTree>);
</ins><span class="cx">
</span><span class="cx"> void setMainFramePinState(bool pinnedToTheLeft, bool pinnedToTheRight, bool pinnedToTheTop, bool pinnedToTheBottom);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingTreeScrollingNode::updateBeforeChildren(stateNode);
</del><ins>+ ScrollingTreeScrollingNode::commitStateBeforeChildren(stateNode);
</ins><span class="cx">
</span><span class="cx"> const ScrollingStateFrameScrollingNode& state = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeFrameScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ScrollingTreeFrameScrollingNode();
</span><span class="cx">
</span><del>- void updateBeforeChildren(const ScrollingStateNode&) override;
</del><ins>+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
</ins><span class="cx">
</span><span class="cx"> // FIXME: We should implement this when we support ScrollingTreeScrollingNodes as children.
</span><span class="cx"> void updateLayersAfterAncestorChange(const ScrollingTreeNode& /*changedNode*/, const FloatRect& /*fixedPositionRect*/, const FloatSize& /*cumulativeDelta*/) override { }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> bool isFrameScrollingNode() const { return nodeType() == FrameScrollingNode; }
</span><span class="cx"> bool isOverflowScrollingNode() const { return nodeType() == OverflowScrollingNode; }
</span><span class="cx">
</span><del>- virtual void updateBeforeChildren(const ScrollingStateNode&) = 0;
- virtual void updateAfterChildren(const ScrollingStateNode&) { }
</del><ins>+ virtual void commitStateBeforeChildren(const ScrollingStateNode&) = 0;
+ virtual void commitStateAfterChildren(const ScrollingStateNode&) { }
</ins><span class="cx">
</span><span class="cx"> virtual void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeScrollingNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> const ScrollingStateScrollingNode& state = downcast<ScrollingStateScrollingNode>(stateNode);
</span><span class="cx">
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> m_scrollableAreaParameters = state.scrollableAreaParameters();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNode::updateAfterChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeScrollingNode::commitStateAfterChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> const ScrollingStateScrollingNode& scrollingStateNode = downcast<ScrollingStateScrollingNode>(stateNode);
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -41,8 +41,8 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ScrollingTreeScrollingNode();
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void updateBeforeChildren(const ScrollingStateNode&) override;
- WEBCORE_EXPORT void updateAfterChildren(const ScrollingStateNode&) override;
</del><ins>+ WEBCORE_EXPORT void commitStateBeforeChildren(const ScrollingStateNode&) override;
+ WEBCORE_EXPORT void commitStateAfterChildren(const ScrollingStateNode&) override;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -86,10 +86,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadedScrollingTree::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</del><ins>+void ThreadedScrollingTree::commitTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(ScrollingThread::isCurrentThread());
</span><del>- ScrollingTree::commitNewTreeState(WTFMove(scrollingStateTree));
</del><ins>+ ScrollingTree::commitTreeState(WTFMove(scrollingStateTree));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadedScrollingTree::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ThreadedScrollingTree();
</span><span class="cx">
</span><del>- void commitNewTreeState(std::unique_ptr<ScrollingStateTree>) override;
</del><ins>+ void commitTreeState(std::unique_ptr<ScrollingStateTree>) override;
</ins><span class="cx">
</span><span class="cx"> void handleWheelEvent(const PlatformWheelEvent&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -43,8 +43,9 @@
</span><span class="cx"> ScrollingTreeFrameScrollingNodeIOS(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><span class="cx"> // ScrollingTreeNode member functions.
</span><del>- void updateBeforeChildren(const ScrollingStateNode&) override;
- void updateAfterChildren(const ScrollingStateNode&) override;
</del><ins>+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateAfterChildren(const ScrollingStateNode&) override;
+
</ins><span class="cx"> void handleWheelEvent(const PlatformWheelEvent&) override { }
</span><span class="cx">
</span><span class="cx"> FloatPoint scrollPosition() const override;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNodeIOS::updateBeforeChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeFrameScrollingNodeIOS::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingTreeFrameScrollingNode::updateBeforeChildren(stateNode);
</del><ins>+ ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(stateNode);
</ins><span class="cx">
</span><span class="cx"> const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</span><span class="cx">
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNodeIOS::updateAfterChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeFrameScrollingNodeIOS::commitStateAfterChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingTreeFrameScrollingNode::updateAfterChildren(stateNode);
</del><ins>+ ScrollingTreeFrameScrollingNode::commitStateAfterChildren(stateNode);
</ins><span class="cx">
</span><span class="cx"> const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -70,11 +70,6 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeIOS::commitNewTreeState(std::unique_ptr<ScrollingStateTree> scrollingStateTree)
-{
- ScrollingTree::commitNewTreeState(WTFMove(scrollingStateTree));
-}
-
</del><span class="cx"> void ScrollingTreeIOS::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition scrollingLayerPositionAction)
</span><span class="cx"> {
</span><span class="cx"> if (!m_scrollingCoordinator)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -41,8 +41,6 @@
</span><span class="cx"> static Ref<ScrollingTreeIOS> create(AsyncScrollingCoordinator*);
</span><span class="cx"> virtual ~ScrollingTreeIOS();
</span><span class="cx">
</span><del>- void commitNewTreeState(std::unique_ptr<ScrollingStateTree>) override;
-
</del><span class="cx"> // No wheel events on iOS
</span><span class="cx"> void handleWheelEvent(const PlatformWheelEvent&) override { }
</span><span class="cx"> EventResult tryToHandleWheelEvent(const PlatformWheelEvent&) override { return DidNotHandleEvent; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingThread::dispatch([threadedScrollingTree, unprotectedTreeState] {
</span><span class="cx"> std::unique_ptr<ScrollingStateTree> treeState(unprotectedTreeState);
</span><del>- threadedScrollingTree->commitNewTreeState(WTFMove(treeState));
</del><ins>+ threadedScrollingTree->commitTreeState(WTFMove(treeState));
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> updateTiledScrollingIndicator();
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ScrollingTreeFixedNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><del>- void updateBeforeChildren(const ScrollingStateNode&) override;
</del><ins>+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
</ins><span class="cx"> void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
</span><span class="cx">
</span><span class="cx"> FixedPositionViewportConstraints m_constraints;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> scrollingTree().fixedOrStickyNodeRemoved();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFixedNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeFixedNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> const ScrollingStateFixedNode& fixedStateNode = downcast<ScrollingStateFixedNode>(stateNode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -47,8 +47,9 @@
</span><span class="cx"> void releaseReferencesToScrollerImpsOnTheMainThread();
</span><span class="cx">
</span><span class="cx"> // ScrollingTreeNode member functions.
</span><del>- void updateBeforeChildren(const ScrollingStateNode&) override;
- void updateAfterChildren(const ScrollingStateNode&) override;
</del><ins>+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
+ void commitStateAfterChildren(const ScrollingStateNode&) override;
+
</ins><span class="cx"> void handleWheelEvent(const PlatformWheelEvent&) override;
</span><span class="cx">
</span><span class="cx"> // ScrollController member functions.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -92,9 +92,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNodeMac::updateBeforeChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeFrameScrollingNodeMac::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingTreeFrameScrollingNode::updateBeforeChildren(stateNode);
</del><ins>+ ScrollingTreeFrameScrollingNode::commitStateBeforeChildren(stateNode);
</ins><span class="cx"> const auto& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(stateNode);
</span><span class="cx">
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="lines">@@ -165,9 +165,9 @@
</span><span class="cx"> m_hadFirstUpdate = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFrameScrollingNodeMac::updateAfterChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeFrameScrollingNodeMac::commitStateAfterChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingTreeFrameScrollingNode::updateAfterChildren(stateNode);
</del><ins>+ ScrollingTreeFrameScrollingNode::commitStateAfterChildren(stateNode);
</ins><span class="cx">
</span><span class="cx"> const auto& scrollingStateNode = downcast<ScrollingStateScrollingNode>(stateNode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ScrollingTreeStickyNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><del>- void updateBeforeChildren(const ScrollingStateNode&) override;
</del><ins>+ void commitStateBeforeChildren(const ScrollingStateNode&) override;
</ins><span class="cx"> void updateLayersAfterAncestorChange(const ScrollingTreeNode& changedNode, const FloatRect& fixedPositionRect, const FloatSize& cumulativeDelta) override;
</span><span class="cx">
</span><span class="cx"> StickyPositionViewportConstraints m_constraints;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> scrollingTree().fixedOrStickyNodeRemoved();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeStickyNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeStickyNode::commitStateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> const ScrollingStateStickyNode& stickyStateNode = downcast<ScrollingStateStickyNode>(stateNode);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-11-04 Simon Fraser <simon.fraser@apple.com>
+
+ Rename some ScrollingTree/Node-related functions to reduce the number of uses of "update"
+ https://bugs.webkit.org/show_bug.cgi?id=164420
+
+ Reviewed by Tim Horton.
+
+ Rename:
+ commitNewTreeState -> commitTreeState ("new" was redundant)
+ updateBeforeChildren -> commitStateBeforeChildren
+ updateAfterChildren -> commitStateAfterChildren
+
+
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+ (WebKit::RemoteScrollingCoordinatorProxy::commitScrollingTreeState):
+ (WebKit::RemoteScrollingCoordinatorProxy::updateScrollingTree): Deleted.
+ * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::commitStateBeforeChildren):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::commitStateAfterChildren):
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren): Deleted.
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren): Deleted.
+ * UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm:
+ (WebKit::RemoteLayerTreeDrawingAreaProxy::commitLayerTree):
+
</ins><span class="cx"> 2016-11-04 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> NetworkSession: Add NetworkDataTask implementation for blobs
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> return &remoteDrawingArea.remoteLayerTreeHost();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RemoteScrollingCoordinatorProxy::updateScrollingTree(const RemoteScrollingCoordinatorTransaction& transaction, RequestedScrollInfo& requestedScrollInfo)
</del><ins>+void RemoteScrollingCoordinatorProxy::commitScrollingTreeState(const RemoteScrollingCoordinatorTransaction& transaction, RequestedScrollInfo& requestedScrollInfo)
</ins><span class="cx"> {
</span><span class="cx"> m_requestedScrollInfo = &requestedScrollInfo;
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> connectStateNodeLayers(*stateTree, *layerTreeHost);
</span><del>- m_scrollingTree->commitNewTreeState(WTFMove(stateTree));
</del><ins>+ m_scrollingTree->commitTreeState(WTFMove(stateTree));
</ins><span class="cx">
</span><span class="cx"> m_requestedScrollInfo = nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingCoordinatorProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> bool requestIsProgrammaticScroll { };
</span><span class="cx"> WebCore::FloatPoint requestedScrollPosition;
</span><span class="cx"> };
</span><del>- void updateScrollingTree(const RemoteScrollingCoordinatorTransaction&, RequestedScrollInfo&);
</del><ins>+ void commitScrollingTreeState(const RemoteScrollingCoordinatorTransaction&, RequestedScrollInfo&);
</ins><span class="cx">
</span><span class="cx"> void setPropagatesMainFrameScrolls(bool propagatesMainFrameScrolls) { m_propagatesMainFrameScrolls = propagatesMainFrameScrolls; }
</span><span class="cx"> bool propagatesMainFrameScrolls() const { return m_propagatesMainFrameScrolls; }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -52,8 +52,8 @@
</span><span class="cx"> private:
</span><span class="cx"> ScrollingTreeOverflowScrollingNodeIOS(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
</span><span class="cx">
</span><del>- void updateBeforeChildren(const WebCore::ScrollingStateNode&) override;
- void updateAfterChildren(const WebCore::ScrollingStateNode&) override;
</del><ins>+ void commitStateBeforeChildren(const WebCore::ScrollingStateNode&) override;
+ void commitStateAfterChildren(const WebCore::ScrollingStateNode&) override;
</ins><span class="cx">
</span><span class="cx"> WebCore::FloatPoint scrollPosition() const override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeOverflowScrollingNodeIOS::updateBeforeChildren(const WebCore::ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeOverflowScrollingNodeIOS::commitStateBeforeChildren(const WebCore::ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> if (stateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrollLayer)) {
</span><span class="cx"> BEGIN_BLOCK_OBJC_EXCEPTIONS
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> END_BLOCK_OBJC_EXCEPTIONS
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ScrollingTreeOverflowScrollingNode::updateBeforeChildren(stateNode);
</del><ins>+ ScrollingTreeOverflowScrollingNode::commitStateBeforeChildren(stateNode);
</ins><span class="cx">
</span><span class="cx"> const auto& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(stateNode);
</span><span class="cx"> if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
</span><span class="lines">@@ -175,9 +175,9 @@
</span><span class="cx"> m_scrolledContentsLayer = scrollingStateNode.scrolledContentsLayer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeOverflowScrollingNodeIOS::updateAfterChildren(const ScrollingStateNode& stateNode)
</del><ins>+void ScrollingTreeOverflowScrollingNodeIOS::commitStateAfterChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingTreeOverflowScrollingNode::updateAfterChildren(stateNode);
</del><ins>+ ScrollingTreeOverflowScrollingNode::commitStateAfterChildren(stateNode);
</ins><span class="cx">
</span><span class="cx"> TemporaryChange<bool> updatingChange(m_updatingFromStateNode, true);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacRemoteLayerTreeDrawingAreaProxymm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm (208394 => 208395)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-11-04 19:21:11 UTC (rev 208394)
+++ trunk/Source/WebKit2/UIProcess/mac/RemoteLayerTreeDrawingAreaProxy.mm 2016-11-04 19:42:26 UTC (rev 208395)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx"> RemoteScrollingCoordinatorProxy::RequestedScrollInfo requestedScrollInfo;
</span><del>- m_webPageProxy.scrollingCoordinatorProxy()->updateScrollingTree(scrollingTreeTransaction, requestedScrollInfo);
</del><ins>+ m_webPageProxy.scrollingCoordinatorProxy()->commitScrollingTreeState(scrollingTreeTransaction, requestedScrollInfo);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_webPageProxy.didCommitLayerTree(layerTreeTransaction);
</span></span></pre>
</div>
</div>
</body>
</html>