<!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>[161194] 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/161194">161194</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-01 11:53:21 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updating the scrolling tree should use references to state nodes
https://bugs.webkit.org/show_bug.cgi?id=126360
Reviewed by Anders Carlsson.
Change functions related to ScrollingTreeNode updating to take
const references to state nodes rather than pointers.
* page/scrolling/ScrollingStateNode.h:
(WebCore::ScrollingStateNode::hasChangedProperty):
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::commitNewTreeState):
(WebCore::ScrollingTree::updateTreeFromStateNode): The node can be nil so
this continues to take a pointer.
(WebCore::ScrollingTree::removeDestroyedNodes):
* page/scrolling/ScrollingTree.h:
* page/scrolling/ScrollingTreeNode.h:
(WebCore::ScrollingTreeNode::updateAfterChildren):
* page/scrolling/ScrollingTreeScrollingNode.cpp:
(WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
* page/scrolling/ScrollingTreeScrollingNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::updateBeforeChildren):
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
(WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
(WebCore::ScrollingTreeScrollingNodeMac::updateAfterChildren):
* page/scrolling/mac/ScrollingTreeStickyNode.h:
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::updateBeforeChildren):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.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>
<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="#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="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm">trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/ChangeLog 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2014-01-01 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><ins>+ Updating the scrolling tree should use references to state nodes
+ https://bugs.webkit.org/show_bug.cgi?id=126360
+
+ Reviewed by Anders Carlsson.
+
+ Change functions related to ScrollingTreeNode updating to take
+ const references to state nodes rather than pointers.
+
+ * page/scrolling/ScrollingStateNode.h:
+ (WebCore::ScrollingStateNode::hasChangedProperty):
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::commitNewTreeState):
+ (WebCore::ScrollingTree::updateTreeFromStateNode): The node can be nil so
+ this continues to take a pointer.
+ (WebCore::ScrollingTree::removeDestroyedNodes):
+ * page/scrolling/ScrollingTree.h:
+ * page/scrolling/ScrollingTreeNode.h:
+ (WebCore::ScrollingTreeNode::updateAfterChildren):
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::updateBeforeChildren):
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::updateBeforeChildren):
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeScrollingNodeMac::updateBeforeChildren):
+ (WebCore::ScrollingTreeScrollingNodeMac::updateAfterChildren):
+ * page/scrolling/mac/ScrollingTreeStickyNode.h:
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::updateBeforeChildren):
+
+2014-01-01 Simon Fraser <simon.fraser@apple.com>
+
</ins><span class="cx"> Add a typedef for PlatformLayerID on GraphicsLayer, and migrate RemoteLayerTreeTransaction to use it
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126346
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> typedef unsigned ChangedProperties;
</span><span class="cx">
</span><span class="cx"> bool hasChangedProperties() const { return m_changedProperties; }
</span><del>- bool hasChangedProperty(unsigned propertyBit) { return m_changedProperties & (1 << propertyBit); }
</del><ins>+ bool hasChangedProperty(unsigned propertyBit) const { return m_changedProperties & (1 << propertyBit); }
</ins><span class="cx"> void resetChangedProperties() { m_changedProperties = 0; }
</span><span class="cx"> void setPropertyChanged(unsigned propertyBit) { m_changedProperties |= (1 << propertyBit); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -146,11 +146,11 @@
</span><span class="cx"> bool scrollRequestIsProgammatic = rootNode ? rootNode->requestedScrollPositionRepresentsProgrammaticScroll() : false;
</span><span class="cx"> TemporaryChange<bool> changeHandlingProgrammaticScroll(m_isHandlingProgrammaticScroll, scrollRequestIsProgammatic);
</span><span class="cx">
</span><del>- removeDestroyedNodes(scrollingStateTree.get());
</del><ins>+ removeDestroyedNodes(*scrollingStateTree);
</ins><span class="cx"> updateTreeFromStateNode(rootNode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTree::updateTreeFromStateNode(ScrollingStateNode* stateNode)
</del><ins>+void ScrollingTree::updateTreeFromStateNode(const ScrollingStateNode* stateNode)
</ins><span class="cx"> {
</span><span class="cx"> if (!stateNode) {
</span><span class="cx"> m_nodeMap.clear();
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> ScrollingTreeNode* node;
</span><span class="cx"> if (it != m_nodeMap.end()) {
</span><span class="cx"> node = it->value;
</span><del>- node->updateBeforeChildren(stateNode);
</del><ins>+ node->updateBeforeChildren(*stateNode);
</ins><span class="cx"> } else {
</span><span class="cx"> // If the node isn't found, it's either new and needs to be added to the tree, or there is a new ID for our
</span><span class="cx"> // root node.
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx">
</span><span class="cx"> m_rootNode = ScrollingTreeScrollingNode::create(*this, nodeID);
</span><span class="cx"> m_nodeMap.set(nodeID, m_rootNode.get());
</span><del>- m_rootNode->updateBeforeChildren(stateNode);
</del><ins>+ m_rootNode->updateBeforeChildren(*stateNode);
</ins><span class="cx"> node = m_rootNode.get();
</span><span class="cx"> } else {
</span><span class="cx"> OwnPtr<ScrollingTreeNode> newNode;
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> newNode->setParent(parent);
</span><span class="cx"> parent->appendChild(newNode.release());
</span><span class="cx"> }
</span><del>- node->updateBeforeChildren(stateNode);
</del><ins>+ node->updateBeforeChildren(*stateNode);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -212,12 +212,12 @@
</span><span class="cx"> for (size_t i = 0; i < size; ++i)
</span><span class="cx"> updateTreeFromStateNode(stateNodeChildren->at(i).get());
</span><span class="cx"> }
</span><del>- node->updateAfterChildren(stateNode);
</del><ins>+ node->updateAfterChildren(*stateNode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTree::removeDestroyedNodes(ScrollingStateTree* stateTree)
</del><ins>+void ScrollingTree::removeDestroyedNodes(const ScrollingStateTree& stateTree)
</ins><span class="cx"> {
</span><del>- const Vector<ScrollingNodeID>& removedNodes = stateTree->removedNodes();
</del><ins>+ const Vector<ScrollingNodeID>& removedNodes = stateTree.removedNodes();
</ins><span class="cx"> size_t size = removedNodes.size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><span class="cx"> ScrollingTreeNode* node = m_nodeMap.take(removedNodes[i]);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -112,8 +112,8 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit ScrollingTree(ScrollingCoordinator*);
</span><span class="cx">
</span><del>- void removeDestroyedNodes(ScrollingStateTree*);
- void updateTreeFromStateNode(ScrollingStateNode*);
</del><ins>+ void removeDestroyedNodes(const ScrollingStateTree&);
+ void updateTreeFromStateNode(const ScrollingStateNode*);
</ins><span class="cx">
</span><span class="cx"> RefPtr<ScrollingCoordinator> m_scrollingCoordinator;
</span><span class="cx"> OwnPtr<ScrollingTreeScrollingNode> m_rootNode;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~ScrollingTreeNode();
</span><span class="cx">
</span><del>- virtual void updateBeforeChildren(ScrollingStateNode*) = 0;
- virtual void updateAfterChildren(ScrollingStateNode*) { }
</del><ins>+ virtual void updateBeforeChildren(const ScrollingStateNode&) = 0;
+ virtual void updateAfterChildren(const ScrollingStateNode&) { }
</ins><span class="cx">
</span><span class="cx"> virtual void parentScrollPositionDidChange(const IntRect& viewportRect, 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 (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -47,41 +47,41 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNode::updateBeforeChildren(ScrollingStateNode* stateNode)
</del><ins>+void ScrollingTreeScrollingNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingStateScrollingNode* state = toScrollingStateScrollingNode(stateNode);
</del><ins>+ const ScrollingStateScrollingNode& state = toScrollingStateScrollingNode(stateNode);
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::ViewportRect))
- m_viewportRect = state->viewportRect();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::ViewportRect))
+ m_viewportRect = state.viewportRect();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize)) {
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize)) {
</ins><span class="cx"> if (scrollingTree().isRubberBandInProgress())
</span><span class="cx"> m_totalContentsSizeForRubberBand = m_totalContentsSize;
</span><span class="cx"> else
</span><del>- m_totalContentsSizeForRubberBand = state->totalContentsSize();
- m_totalContentsSize = state->totalContentsSize();
</del><ins>+ m_totalContentsSizeForRubberBand = state.totalContentsSize();
+ m_totalContentsSize = state.totalContentsSize();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::ScrollOrigin))
- m_scrollOrigin = state->scrollOrigin();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrollOrigin))
+ m_scrollOrigin = state.scrollOrigin();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::ScrollableAreaParams))
- m_scrollableAreaParameters = state->scrollableAreaParameters();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::ScrollableAreaParams))
+ m_scrollableAreaParameters = state.scrollableAreaParameters();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::FrameScaleFactor))
- m_frameScaleFactor = state->frameScaleFactor();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::FrameScaleFactor))
+ m_frameScaleFactor = state.frameScaleFactor();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::ReasonsForSynchronousScrolling))
- m_synchronousScrollingReasons = state->synchronousScrollingReasons();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::ReasonsForSynchronousScrolling))
+ m_synchronousScrollingReasons = state.synchronousScrollingReasons();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::HeaderHeight))
- m_headerHeight = state->headerHeight();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::HeaderHeight))
+ m_headerHeight = state.headerHeight();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::FooterHeight))
- m_footerHeight = state->footerHeight();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::FooterHeight))
+ m_footerHeight = state.footerHeight();
</ins><span class="cx">
</span><del>- if (state->hasChangedProperty(ScrollingStateScrollingNode::BehaviorForFixedElements))
- m_behaviorForFixed = state->scrollBehaviorForFixedElements();
</del><ins>+ if (state.hasChangedProperty(ScrollingStateScrollingNode::BehaviorForFixedElements))
+ m_behaviorForFixed = state.scrollBehaviorForFixedElements();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> static PassOwnPtr<ScrollingTreeScrollingNode> create(ScrollingTree&, ScrollingNodeID);
</span><span class="cx"> virtual ~ScrollingTreeScrollingNode();
</span><span class="cx">
</span><del>- virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
</del><ins>+ virtual void updateBeforeChildren(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"> virtual void parentScrollPositionDidChange(const IntRect& /*viewportRect*/, const FloatSize& /*cumulativeDelta*/) OVERRIDE { }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ScrollingTreeFixedNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><del>- virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
</del><ins>+ virtual void updateBeforeChildren(const ScrollingStateNode&) OVERRIDE;
</ins><span class="cx"> virtual void parentScrollPositionDidChange(const IntRect& viewportRect, 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 (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -47,15 +47,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeFixedNode::updateBeforeChildren(ScrollingStateNode* stateNode)
</del><ins>+void ScrollingTreeFixedNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingStateFixedNode* fixedStateNode = toScrollingStateFixedNode(stateNode);
</del><ins>+ const ScrollingStateFixedNode& fixedStateNode = toScrollingStateFixedNode(stateNode);
</ins><span class="cx">
</span><del>- if (fixedStateNode->hasChangedProperty(ScrollingStateNode::ScrollLayer))
- m_layer = fixedStateNode->platformScrollLayer();
</del><ins>+ if (fixedStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
+ m_layer = fixedStateNode.platformScrollLayer();
</ins><span class="cx">
</span><del>- if (stateNode->hasChangedProperty(ScrollingStateFixedNode::ViewportConstraints))
- m_constraints = fixedStateNode->viewportConstraints();
</del><ins>+ if (stateNode.hasChangedProperty(ScrollingStateFixedNode::ViewportConstraints))
+ m_constraints = fixedStateNode.viewportConstraints();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline CGPoint operator*(CGPoint& a, const CGSize& b)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -44,8 +44,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // ScrollingTreeNode member functions.
</span><del>- virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
- virtual void updateAfterChildren(ScrollingStateNode*) OVERRIDE;
</del><ins>+ virtual void updateBeforeChildren(const ScrollingStateNode&) OVERRIDE;
+ virtual void updateAfterChildren(const ScrollingStateNode&) OVERRIDE;
</ins><span class="cx"> virtual void handleWheelEvent(const PlatformWheelEvent&) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> // ScrollElasticityController member functions.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -70,34 +70,34 @@
</span><span class="cx"> CFRunLoopTimerInvalidate(m_snapRubberbandTimer.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNodeMac::updateBeforeChildren(ScrollingStateNode* stateNode)
</del><ins>+void ScrollingTreeScrollingNodeMac::updateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> ScrollingTreeScrollingNode::updateBeforeChildren(stateNode);
</span><del>- ScrollingStateScrollingNode* scrollingStateNode = toScrollingStateScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = toScrollingStateScrollingNode(stateNode);
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateNode::ScrollLayer))
- m_scrollLayer = scrollingStateNode->platformScrollLayer();
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
+ m_scrollLayer = scrollingStateNode.platformScrollLayer();
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer))
- m_counterScrollingLayer = scrollingStateNode->counterScrollingPlatformLayer();
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::CounterScrollingLayer))
+ m_counterScrollingLayer = scrollingStateNode.counterScrollingPlatformLayer();
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::HeaderLayer))
- m_headerLayer = scrollingStateNode->headerPlatformLayer();
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::HeaderLayer))
+ m_headerLayer = scrollingStateNode.headerPlatformLayer();
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::FooterLayer))
- m_footerLayer = scrollingStateNode->footerPlatformLayer();
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::FooterLayer))
+ m_footerLayer = scrollingStateNode.footerPlatformLayer();
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::PainterForScrollbar)) {
- m_verticalScrollbarPainter = scrollingStateNode->verticalScrollbarPainter();
- m_horizontalScrollbarPainter = scrollingStateNode->horizontalScrollbarPainter();
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::PainterForScrollbar)) {
+ m_verticalScrollbarPainter = scrollingStateNode.verticalScrollbarPainter();
+ m_horizontalScrollbarPainter = scrollingStateNode.horizontalScrollbarPainter();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::ReasonsForSynchronousScrolling)) {
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ReasonsForSynchronousScrolling)) {
</ins><span class="cx"> if (shouldUpdateScrollLayerPositionSynchronously()) {
</span><span class="cx"> // We're transitioning to the slow "update scroll layer position on the main thread" mode.
</span><span class="cx"> // Initialize the probable main thread scroll position with the current scroll layer position.
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
- m_probableMainThreadScrollPosition = scrollingStateNode->requestedScrollPosition();
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
+ m_probableMainThreadScrollPosition = scrollingStateNode.requestedScrollPosition();
</ins><span class="cx"> else {
</span><span class="cx"> CGPoint scrollLayerPosition = m_scrollLayer.get().position;
</span><span class="cx"> m_probableMainThreadScrollPosition = IntPoint(-scrollLayerPosition.x, -scrollLayerPosition.y);
</span><span class="lines">@@ -108,23 +108,23 @@
</span><span class="cx"> logThreadedScrollingMode(synchronousScrollingReasons());
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::WheelEventHandlerCount)) {
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::WheelEventHandlerCount)) {
</ins><span class="cx"> if (scrollingTree().scrollingPerformanceLoggingEnabled())
</span><del>- logWheelEventHandlerCountChanged(scrollingStateNode->wheelEventHandlerCount());
</del><ins>+ logWheelEventHandlerCountChanged(scrollingStateNode.wheelEventHandlerCount());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeScrollingNodeMac::updateAfterChildren(ScrollingStateNode* stateNode)
</del><ins>+void ScrollingTreeScrollingNodeMac::updateAfterChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><span class="cx"> ScrollingTreeScrollingNode::updateAfterChildren(stateNode);
</span><span class="cx">
</span><del>- ScrollingStateScrollingNode* scrollingStateNode = toScrollingStateScrollingNode(stateNode);
</del><ins>+ const auto& scrollingStateNode = toScrollingStateScrollingNode(stateNode);
</ins><span class="cx">
</span><span class="cx"> // Update the scroll position after child nodes have been updated, because they need to have updated their constraints before any scrolling happens.
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
- setScrollPosition(scrollingStateNode->requestedScrollPosition());
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::RequestedScrollPosition))
+ setScrollPosition(scrollingStateNode.requestedScrollPosition());
</ins><span class="cx">
</span><del>- if (scrollingStateNode->hasChangedProperty(ScrollingStateNode::ScrollLayer) || scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize) || scrollingStateNode->hasChangedProperty(ScrollingStateScrollingNode::ViewportRect))
</del><ins>+ if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize) || scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ViewportRect))
</ins><span class="cx"> updateMainFramePinState(scrollPosition());
</span><span class="cx"> }
</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 (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> private:
</span><span class="cx"> ScrollingTreeStickyNode(ScrollingTree&, ScrollingNodeID);
</span><span class="cx">
</span><del>- virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
</del><ins>+ virtual void updateBeforeChildren(const ScrollingStateNode&) OVERRIDE;
</ins><span class="cx"> virtual void parentScrollPositionDidChange(const IntRect& viewportRect, 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 (161193 => 161194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-01-01 18:36:15 UTC (rev 161193)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-01-01 19:53:21 UTC (rev 161194)
</span><span class="lines">@@ -47,15 +47,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeStickyNode::updateBeforeChildren(ScrollingStateNode* stateNode)
</del><ins>+void ScrollingTreeStickyNode::updateBeforeChildren(const ScrollingStateNode& stateNode)
</ins><span class="cx"> {
</span><del>- ScrollingStateStickyNode* stickyStateNode = toScrollingStateStickyNode(stateNode);
</del><ins>+ const ScrollingStateStickyNode& stickyStateNode = toScrollingStateStickyNode(stateNode);
</ins><span class="cx">
</span><del>- if (stickyStateNode->hasChangedProperty(ScrollingStateNode::ScrollLayer))
- m_layer = stickyStateNode->platformScrollLayer();
</del><ins>+ if (stickyStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
+ m_layer = stickyStateNode.platformScrollLayer();
</ins><span class="cx">
</span><del>- if (stateNode->hasChangedProperty(ScrollingStateStickyNode::ViewportConstraints))
- m_constraints = stickyStateNode->viewportConstraints();
</del><ins>+ if (stateNode.hasChangedProperty(ScrollingStateStickyNode::ViewportConstraints))
+ m_constraints = stickyStateNode.viewportConstraints();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline CGPoint operator*(CGPoint& a, const CGSize& b)
</span></span></pre>
</div>
</div>
</body>
</html>