<!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>[158893] 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/158893">158893</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2013-11-07 18:41:19 -0800 (Thu, 07 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>CTTE: Scrolling tree nodes should always have a ScrollingTree&amp;.
&lt;https://webkit.org/b/124022&gt;

Let ScrollingTreeNode and subclasses store the backpointer to the
tree as a ScrollingTree&amp; reference.

Reviewed by Anders Carlsson.</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="#trunkSourceWebCorepagescrollingScrollingTreeNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp</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 (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/ChangeLog        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-11-07  Andreas Kling  &lt;akling@apple.com&gt;
+
+        CTTE: Scrolling tree nodes should always have a ScrollingTree&amp;.
+        &lt;https://webkit.org/b/124022&gt;
+
+        Let ScrollingTreeNode and subclasses store the backpointer to the
+        tree as a ScrollingTree&amp; reference.
+
+        Reviewed by Anders Carlsson.
+
</ins><span class="cx"> 2013-11-07  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Lots of layers get solid color but transparent contents layers now
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -174,18 +174,18 @@
</span><span class="cx">             // This is the root node. Nuke the node map.
</span><span class="cx">             m_nodeMap.clear();
</span><span class="cx"> 
</span><del>-            m_rootNode = ScrollingTreeScrollingNode::create(this, nodeID);
</del><ins>+            m_rootNode = ScrollingTreeScrollingNode::create(*this, nodeID);
</ins><span class="cx">             m_nodeMap.set(nodeID, m_rootNode.get());
</span><span class="cx">             m_rootNode-&gt;updateBeforeChildren(stateNode);
</span><span class="cx">             node = m_rootNode.get();
</span><span class="cx">         } else {
</span><span class="cx">             OwnPtr&lt;ScrollingTreeNode&gt; newNode;
</span><span class="cx">             if (stateNode-&gt;isScrollingNode())
</span><del>-                newNode = ScrollingTreeScrollingNode::create(this, nodeID);
</del><ins>+                newNode = ScrollingTreeScrollingNode::create(*this, nodeID);
</ins><span class="cx">             else if (stateNode-&gt;isFixedNode())
</span><del>-                newNode = ScrollingTreeFixedNode::create(this, nodeID);
</del><ins>+                newNode = ScrollingTreeFixedNode::create(*this, nodeID);
</ins><span class="cx">             else if (stateNode-&gt;isStickyNode())
</span><del>-                newNode = ScrollingTreeStickyNode::create(this, nodeID);
</del><ins>+                newNode = ScrollingTreeStickyNode::create(*this, nodeID);
</ins><span class="cx">             else
</span><span class="cx">                 ASSERT_NOT_REACHED();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-ScrollingTreeNode::ScrollingTreeNode(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+ScrollingTreeNode::ScrollingTreeNode(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx">     : m_scrollingTree(scrollingTree)
</span><span class="cx">     , m_nodeID(nodeID)
</span><span class="cx">     , m_parent(0)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -41,7 +41,6 @@
</span><span class="cx"> 
</span><span class="cx"> class ScrollingTreeNode {
</span><span class="cx"> public:
</span><del>-    explicit ScrollingTreeNode(ScrollingTree*, ScrollingNodeID);
</del><span class="cx">     virtual ~ScrollingTreeNode();
</span><span class="cx"> 
</span><span class="cx">     virtual void updateBeforeChildren(ScrollingStateNode*) = 0;
</span><span class="lines">@@ -58,13 +57,14 @@
</span><span class="cx">     void removeChild(ScrollingTreeNode*);
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    ScrollingTree* scrollingTree() const { return m_scrollingTree; }
</del><ins>+    ScrollingTreeNode(ScrollingTree&amp;, ScrollingNodeID);
+    ScrollingTree&amp; scrollingTree() const { return m_scrollingTree; }
</ins><span class="cx"> 
</span><span class="cx">     typedef Vector&lt;OwnPtr&lt;ScrollingTreeNode&gt;&gt; ScrollingTreeChildrenVector;
</span><span class="cx">     OwnPtr&lt;ScrollingTreeChildrenVector&gt; m_children;
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    ScrollingTree* m_scrollingTree;
</del><ins>+    ScrollingTree&amp; m_scrollingTree;
</ins><span class="cx"> 
</span><span class="cx">     ScrollingNodeID m_nodeID;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-ScrollingTreeScrollingNode::ScrollingTreeScrollingNode(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+ScrollingTreeScrollingNode::ScrollingTreeScrollingNode(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx">     : ScrollingTreeNode(scrollingTree, nodeID)
</span><span class="cx">     , m_frameScaleFactor(1)
</span><span class="cx">     , m_shouldUpdateScrollLayerPositionOnMainThread(0)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">         m_viewportRect = state-&gt;viewportRect();
</span><span class="cx"> 
</span><span class="cx">     if (state-&gt;hasChangedProperty(ScrollingStateScrollingNode::TotalContentsSize)) {
</span><del>-        if (scrollingTree()-&gt;isRubberBandInProgress())
</del><ins>+        if (scrollingTree().isRubberBandInProgress())
</ins><span class="cx">             m_totalContentsSizeForRubberBand = m_totalContentsSize;
</span><span class="cx">         else
</span><span class="cx">             m_totalContentsSizeForRubberBand = state-&gt;totalContentsSize();
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> 
</span><span class="cx"> class ScrollingTreeScrollingNode : public ScrollingTreeNode {
</span><span class="cx"> public:
</span><del>-    static PassOwnPtr&lt;ScrollingTreeScrollingNode&gt; create(ScrollingTree*, ScrollingNodeID);
</del><ins>+    static PassOwnPtr&lt;ScrollingTreeScrollingNode&gt; create(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx">     virtual ~ScrollingTreeScrollingNode();
</span><span class="cx"> 
</span><span class="cx">     virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">     MainThreadScrollingReasons shouldUpdateScrollLayerPositionOnMainThread() const { return m_shouldUpdateScrollLayerPositionOnMainThread; }
</span><span class="cx"> 
</span><span class="cx"> protected:
</span><del>-    explicit ScrollingTreeScrollingNode(ScrollingTree*, ScrollingNodeID);
</del><ins>+    ScrollingTreeScrollingNode(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx"> 
</span><span class="cx">     const IntRect&amp; viewportRect() const { return m_viewportRect; }
</span><span class="cx">     const IntSize&amp; totalContentsSize() const { return m_totalContentsSize; }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> 
</span><span class="cx"> class ScrollingTreeFixedNode : public ScrollingTreeNode {
</span><span class="cx"> public:
</span><del>-    static PassOwnPtr&lt;ScrollingTreeFixedNode&gt; create(ScrollingTree*, ScrollingNodeID);
</del><ins>+    static PassOwnPtr&lt;ScrollingTreeFixedNode&gt; create(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx"> 
</span><span class="cx">     virtual ~ScrollingTreeFixedNode();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    ScrollingTreeFixedNode(ScrollingTree*, ScrollingNodeID);
</del><ins>+    ScrollingTreeFixedNode(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx"> 
</span><span class="cx">     virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
</span><span class="cx">     virtual void parentScrollPositionDidChange(const IntRect&amp; viewportRect, const FloatSize&amp; cumulativeDelta) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-PassOwnPtr&lt;ScrollingTreeFixedNode&gt; ScrollingTreeFixedNode::create(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassOwnPtr&lt;ScrollingTreeFixedNode&gt; ScrollingTreeFixedNode::create(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx">     return adoptPtr(new ScrollingTreeFixedNode(scrollingTree, nodeID));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ScrollingTreeFixedNode::ScrollingTreeFixedNode(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+ScrollingTreeFixedNode::ScrollingTreeFixedNode(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx">     : ScrollingTreeNode(scrollingTree, nodeID)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.h        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> 
</span><span class="cx"> class ScrollingTreeScrollingNodeMac : public ScrollingTreeScrollingNode, private ScrollElasticityControllerClient {
</span><span class="cx"> public:
</span><del>-    explicit ScrollingTreeScrollingNodeMac(ScrollingTree*, ScrollingNodeID);
</del><ins>+    ScrollingTreeScrollingNodeMac(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx">     virtual ~ScrollingTreeScrollingNodeMac();
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeMac.mm        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -50,12 +50,12 @@
</span><span class="cx"> static void logWheelEventHandlerCountChanged(unsigned);
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PassOwnPtr&lt;ScrollingTreeScrollingNode&gt; ScrollingTreeScrollingNode::create(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassOwnPtr&lt;ScrollingTreeScrollingNode&gt; ScrollingTreeScrollingNode::create(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx">     return adoptPtr(new ScrollingTreeScrollingNodeMac(scrollingTree, nodeID));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ScrollingTreeScrollingNodeMac::ScrollingTreeScrollingNodeMac(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+ScrollingTreeScrollingNodeMac::ScrollingTreeScrollingNodeMac(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx">     : ScrollingTreeScrollingNode(scrollingTree, nodeID)
</span><span class="cx">     , m_scrollElasticityController(this)
</span><span class="cx">     , m_verticalScrollbarPainter(0)
</span><span class="lines">@@ -106,12 +106,12 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        if (scrollingTree()-&gt;scrollingPerformanceLoggingEnabled())
</del><ins>+        if (scrollingTree().scrollingPerformanceLoggingEnabled())
</ins><span class="cx">             logThreadedScrollingMode(mainThreadScrollingReasons);
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (scrollingStateNode-&gt;hasChangedProperty(ScrollingStateScrollingNode::WheelEventHandlerCount)) {
</span><del>-        if (scrollingTree()-&gt;scrollingPerformanceLoggingEnabled())
</del><ins>+        if (scrollingTree().scrollingPerformanceLoggingEnabled())
</ins><span class="cx">             logWheelEventHandlerCountChanged(scrollingStateNode-&gt;wheelEventHandlerCount());
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     m_scrollElasticityController.handleWheelEvent(wheelEvent);
</span><del>-    scrollingTree()-&gt;handleWheelEventPhase(wheelEvent.phase());
</del><ins>+    scrollingTree().handleWheelEventPhase(wheelEvent.phase());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ScrollingTreeScrollingNodeMac::allowsHorizontalStretching()
</span><span class="lines">@@ -183,11 +183,11 @@
</span><span class="cx">     else if (scrollPosition().x() &gt; maximumScrollPosition().x())
</span><span class="cx">         stretch.setWidth(scrollPosition().x() - maximumScrollPosition().x());
</span><span class="cx"> 
</span><del>-    if (scrollingTree()-&gt;rootNode() == this) {
</del><ins>+    if (scrollingTree().rootNode() == this) {
</ins><span class="cx">         if (stretch.isZero())
</span><del>-            scrollingTree()-&gt;setMainFrameIsRubberBanding(false);
</del><ins>+            scrollingTree().setMainFrameIsRubberBanding(false);
</ins><span class="cx">         else
</span><del>-            scrollingTree()-&gt;setMainFrameIsRubberBanding(true);
</del><ins>+            scrollingTree().setMainFrameIsRubberBanding(true);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     return stretch;
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx">     if (!m_snapRubberbandTimer)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    scrollingTree()-&gt;setMainFrameIsRubberBanding(false);
</del><ins>+    scrollingTree().setMainFrameIsRubberBanding(false);
</ins><span class="cx"> 
</span><span class="cx">     // Since the rubberband timer has stopped, totalContentsSizeForRubberBand can be synchronized with totalContentsSize.
</span><span class="cx">     setTotalContentsSizeForRubberBand(totalContentsSize());
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> 
</span><span class="cx">     setScrollPositionWithoutContentEdgeConstraints(newScrollPosition);
</span><span class="cx"> 
</span><del>-    if (scrollingTree()-&gt;scrollingPerformanceLoggingEnabled())
</del><ins>+    if (scrollingTree().scrollingPerformanceLoggingEnabled())
</ins><span class="cx">         logExposedUnfilledArea();
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -304,12 +304,12 @@
</span><span class="cx"> 
</span><span class="cx">     if (shouldUpdateScrollLayerPositionOnMainThread()) {
</span><span class="cx">         m_probableMainThreadScrollPosition = scrollPosition;
</span><del>-        scrollingTree()-&gt;updateMainFrameScrollPosition(scrollPosition, SetScrollingLayerPosition);
</del><ins>+        scrollingTree().updateMainFrameScrollPosition(scrollPosition, SetScrollingLayerPosition);
</ins><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     setScrollLayerPosition(scrollPosition);
</span><del>-    scrollingTree()-&gt;updateMainFrameScrollPosition(scrollPosition);
</del><ins>+    scrollingTree().updateMainFrameScrollPosition(scrollPosition);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingTreeScrollingNodeMac::setScrollLayerPosition(const IntPoint&amp; position)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> {
</span><span class="cx">     IntPoint position;
</span><span class="cx">     
</span><del>-    if (scrollingTree()-&gt;rootNode() == this &amp;&amp; scrollingTree()-&gt;scrollPinningBehavior() == PinToBottom)
</del><ins>+    if (scrollingTree().rootNode() == this &amp;&amp; scrollingTree().scrollPinningBehavior() == PinToBottom)
</ins><span class="cx">         position.setY(maximumScrollPosition().y());
</span><span class="cx"> 
</span><span class="cx">     return position;
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> 
</span><span class="cx">     position.clampNegativeToZero();
</span><span class="cx"> 
</span><del>-    if (scrollingTree()-&gt;rootNode() == this &amp;&amp; scrollingTree()-&gt;scrollPinningBehavior() == PinToTop)
</del><ins>+    if (scrollingTree().rootNode() == this &amp;&amp; scrollingTree().scrollPinningBehavior() == PinToTop)
</ins><span class="cx">         position.setY(minimumScrollPosition().y());
</span><span class="cx"> 
</span><span class="cx">     return position;
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx">     bool pinnedToTheTop = scrollPosition.y() &lt;= minimumScrollPosition().y();
</span><span class="cx">     bool pinnedToTheBottom = scrollPosition.y() &gt;= maximumScrollPosition().y();
</span><span class="cx"> 
</span><del>-    scrollingTree()-&gt;setMainFramePinState(pinnedToTheLeft, pinnedToTheRight, pinnedToTheTop, pinnedToTheBottom);
</del><ins>+    scrollingTree().setMainFramePinState(pinnedToTheLeft, pinnedToTheRight, pinnedToTheTop, pinnedToTheBottom);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollingTreeScrollingNodeMac::logExposedUnfilledArea()
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> 
</span><span class="cx"> class ScrollingTreeStickyNode : public ScrollingTreeNode {
</span><span class="cx"> public:
</span><del>-    static PassOwnPtr&lt;ScrollingTreeStickyNode&gt; create(ScrollingTree*, ScrollingNodeID);
</del><ins>+    static PassOwnPtr&lt;ScrollingTreeStickyNode&gt; create(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx"> 
</span><span class="cx">     virtual ~ScrollingTreeStickyNode();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    ScrollingTreeStickyNode(ScrollingTree*, ScrollingNodeID);
</del><ins>+    ScrollingTreeStickyNode(ScrollingTree&amp;, ScrollingNodeID);
</ins><span class="cx"> 
</span><span class="cx">     virtual void updateBeforeChildren(ScrollingStateNode*) OVERRIDE;
</span><span class="cx">     virtual void parentScrollPositionDidChange(const IntRect&amp; viewportRect, const FloatSize&amp; cumulativeDelta) OVERRIDE;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (158892 => 158893)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm        2013-11-08 02:22:40 UTC (rev 158892)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm        2013-11-08 02:41:19 UTC (rev 158893)
</span><span class="lines">@@ -33,12 +33,12 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-PassOwnPtr&lt;ScrollingTreeStickyNode&gt; ScrollingTreeStickyNode::create(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassOwnPtr&lt;ScrollingTreeStickyNode&gt; ScrollingTreeStickyNode::create(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx">     return adoptPtr(new ScrollingTreeStickyNode(scrollingTree, nodeID));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-ScrollingTreeStickyNode::ScrollingTreeStickyNode(ScrollingTree* scrollingTree, ScrollingNodeID nodeID)
</del><ins>+ScrollingTreeStickyNode::ScrollingTreeStickyNode(ScrollingTree&amp; scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx">     : ScrollingTreeNode(scrollingTree, nodeID)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>