<!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>[170196] 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/170196">170196</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-06-20 12:14:47 -0700 (Fri, 20 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make ScrollingTreeNodes refounted, for easier tree reconfiguration
https://bugs.webkit.org/show_bug.cgi?id=134075
Reviewed by Tim Horton.
Make ScrollingTreeNode be ref-counted.
Source/WebCore:
* page/scrolling/AsyncScrollingCoordinator.h:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::handleWheelEvent):
(WebCore::ScrollingTree::updateTreeFromStateNode):
* page/scrolling/ScrollingTree.h:
(WebCore::ScrollingTree::rootNode):
* page/scrolling/ScrollingTreeNode.cpp:
(WebCore::ScrollingTreeNode::appendChild):
* page/scrolling/ScrollingTreeNode.h:
* page/scrolling/ThreadedScrollingTree.cpp:
(WebCore::ThreadedScrollingTree::createNode):
* page/scrolling/ThreadedScrollingTree.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.h:
* page/scrolling/ios/ScrollingCoordinatorIOS.mm:
(WebCore::ScrollingCoordinatorIOS::createScrollingTreeNode):
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
* page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
(WebCore::ScrollingTreeFrameScrollingNodeIOS::create):
* page/scrolling/ios/ScrollingTreeIOS.cpp:
(WebCore::ScrollingTreeIOS::createNode):
* page/scrolling/ios/ScrollingTreeIOS.h:
* page/scrolling/mac/ScrollingCoordinatorMac.h:
* page/scrolling/mac/ScrollingCoordinatorMac.mm:
(WebCore::ScrollingCoordinatorMac::createScrollingTreeNode):
* page/scrolling/mac/ScrollingTreeFixedNode.h:
* page/scrolling/mac/ScrollingTreeFixedNode.mm:
(WebCore::ScrollingTreeFixedNode::create):
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
* page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
(WebCore::ScrollingTreeFrameScrollingNodeMac::create):
* page/scrolling/mac/ScrollingTreeStickyNode.h:
* page/scrolling/mac/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::create):
Source/WebKit2:
* UIProcess/Scrolling/RemoteScrollingTree.cpp:
(WebKit::RemoteScrollingTree::createNode):
* UIProcess/Scrolling/RemoteScrollingTree.h:
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
* UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
(WebKit::ScrollingTreeOverflowScrollingNodeIOS::create):
* WebProcess/Scrolling/RemoteScrollingCoordinator.h:
* WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
(WebKit::RemoteScrollingCoordinator::createScrollingTreeNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh">trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.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="#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="#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="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm">trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm</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="#trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach">trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.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="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh">trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.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="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatorh">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm">trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/ChangeLog 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-06-19 Simon Fraser <simon.fraser@apple.com>
+
+ Make ScrollingTreeNodes refounted, for easier tree reconfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=134075
+
+ Reviewed by Tim Horton.
+
+ Make ScrollingTreeNode be ref-counted.
+
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::handleWheelEvent):
+ (WebCore::ScrollingTree::updateTreeFromStateNode):
+ * page/scrolling/ScrollingTree.h:
+ (WebCore::ScrollingTree::rootNode):
+ * page/scrolling/ScrollingTreeNode.cpp:
+ (WebCore::ScrollingTreeNode::appendChild):
+ * page/scrolling/ScrollingTreeNode.h:
+ * page/scrolling/ThreadedScrollingTree.cpp:
+ (WebCore::ThreadedScrollingTree::createNode):
+ * page/scrolling/ThreadedScrollingTree.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.h:
+ * page/scrolling/ios/ScrollingCoordinatorIOS.mm:
+ (WebCore::ScrollingCoordinatorIOS::createScrollingTreeNode):
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
+ * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeIOS::create):
+ * page/scrolling/ios/ScrollingTreeIOS.cpp:
+ (WebCore::ScrollingTreeIOS::createNode):
+ * page/scrolling/ios/ScrollingTreeIOS.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.h:
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::createScrollingTreeNode):
+ * page/scrolling/mac/ScrollingTreeFixedNode.h:
+ * page/scrolling/mac/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::create):
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
+ * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
+ (WebCore::ScrollingTreeFrameScrollingNodeMac::create):
+ * page/scrolling/mac/ScrollingTreeStickyNode.h:
+ * page/scrolling/mac/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::create):
+
</ins><span class="cx"> 2014-06-20 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> iOS build fix after http://trac.webkit.org/changeset/170167.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingAsyncScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> ScrollingTree* scrollingTree() const { return m_scrollingTree.get(); }
</span><span class="cx">
</span><del>- virtual PassOwnPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) = 0;
</del><ins>+ virtual PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) = 0;
</ins><span class="cx">
</span><span class="cx"> void scrollingStateTreePropertiesChanged();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void ScrollingTree::handleWheelEvent(const PlatformWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><span class="cx"> if (m_rootNode)
</span><del>- m_rootNode->handleWheelEvent(wheelEvent);
</del><ins>+ toScrollingTreeScrollingNode(m_rootNode.get())->handleWheelEvent(wheelEvent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ScrollingTree::viewportChangedViaDelegatedScrolling(ScrollingNodeID nodeID, const WebCore::FloatRect& fixedPositionRect, double scale)
</span><span class="lines">@@ -177,12 +177,12 @@
</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 = static_pointer_cast<ScrollingTreeScrollingNode>(createNode(FrameScrollingNode, nodeID));
</del><ins>+ m_rootNode = createNode(FrameScrollingNode, nodeID);
</ins><span class="cx"> m_nodeMap.set(nodeID, m_rootNode.get());
</span><span class="cx"> m_rootNode->updateBeforeChildren(*stateNode);
</span><span class="cx"> node = m_rootNode.get();
</span><span class="cx"> } else {
</span><del>- OwnPtr<ScrollingTreeNode> newNode = createNode(stateNode->nodeType(), nodeID);
</del><ins>+ RefPtr<ScrollingTreeNode> newNode = createNode(stateNode->nodeType(), nodeID);
</ins><span class="cx"> node = newNode.get();
</span><span class="cx"> m_nodeMap.set(nodeID, node);
</span><span class="cx"> ScrollingTreeNodeMap::const_iterator it = m_nodeMap.find(stateNode->parent()->scrollingNodeID());
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> void setScrollingPerformanceLoggingEnabled(bool flag);
</span><span class="cx"> bool scrollingPerformanceLoggingEnabled();
</span><span class="cx">
</span><del>- ScrollingTreeScrollingNode* rootNode() const { return m_rootNode.get(); }
</del><ins>+ ScrollingTreeNode* rootNode() const { return m_rootNode.get(); }
</ins><span class="cx">
</span><span class="cx"> ScrollingNodeID latchedNode();
</span><span class="cx"> void setLatchedNode(ScrollingNodeID);
</span><span class="lines">@@ -133,11 +133,11 @@
</span><span class="cx"> void removeDestroyedNodes(const ScrollingStateTree&);
</span><span class="cx"> void updateTreeFromStateNode(const ScrollingStateNode*);
</span><span class="cx">
</span><del>- virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) = 0;
</del><ins>+ virtual PassRefPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) = 0;
</ins><span class="cx">
</span><span class="cx"> ScrollingTreeNode* nodeForID(ScrollingNodeID) const;
</span><span class="cx">
</span><del>- OwnPtr<ScrollingTreeScrollingNode> m_rootNode;
</del><ins>+ RefPtr<ScrollingTreeNode> m_rootNode;
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<ScrollingNodeID, ScrollingTreeNode*> ScrollingTreeNodeMap;
</span><span class="cx"> ScrollingTreeNodeMap m_nodeMap;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ScrollingTreeNode::appendChild(PassOwnPtr<ScrollingTreeNode> childNode)
</del><ins>+void ScrollingTreeNode::appendChild(PassRefPtr<ScrollingTreeNode> childNode)
</ins><span class="cx"> {
</span><span class="cx"> childNode->setParent(this);
</span><span class="cx">
</span><span class="cx"> if (!m_children)
</span><del>- m_children = adoptPtr(new Vector<OwnPtr<ScrollingTreeNode>>);
</del><ins>+ m_children = adoptPtr(new ScrollingTreeChildrenVector);
</ins><span class="cx">
</span><span class="cx"> m_children->append(childNode);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreeNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -31,7 +31,7 @@
</span><span class="cx"> #include "IntRect.h"
</span><span class="cx"> #include "ScrollTypes.h"
</span><span class="cx"> #include "ScrollingCoordinator.h"
</span><del>-#include <wtf/PassOwnPtr.h>
</del><ins>+#include <wtf/RefCounted.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> class ScrollingStateNode;
</span><span class="cx"> class ScrollingStateScrollingNode;
</span><span class="cx">
</span><del>-class ScrollingTreeNode {
</del><ins>+class ScrollingTreeNode : public RefCounted<ScrollingTreeNode> {
</ins><span class="cx"> public:
</span><span class="cx"> virtual ~ScrollingTreeNode();
</span><span class="cx">
</span><span class="lines">@@ -60,14 +60,14 @@
</span><span class="cx"> ScrollingTreeNode* parent() const { return m_parent; }
</span><span class="cx"> void setParent(ScrollingTreeNode* parent) { m_parent = parent; }
</span><span class="cx">
</span><del>- void appendChild(PassOwnPtr<ScrollingTreeNode>);
</del><ins>+ void appendChild(PassRefPtr<ScrollingTreeNode>);
</ins><span class="cx"> void removeChild(ScrollingTreeNode*);
</span><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> ScrollingTreeNode(ScrollingTree&, ScrollingNodeType, ScrollingNodeID);
</span><span class="cx"> ScrollingTree& scrollingTree() const { return m_scrollingTree; }
</span><span class="cx">
</span><del>- typedef Vector<OwnPtr<ScrollingTreeNode>> ScrollingTreeChildrenVector;
</del><ins>+ typedef Vector<RefPtr<ScrollingTreeNode>> ScrollingTreeChildrenVector;
</ins><span class="cx"> OwnPtr<ScrollingTreeChildrenVector> m_children;
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeNode> ThreadedScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeNode> ThreadedScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx"> return m_scrollingCoordinator->createScrollingTreeNode(nodeType, nodeID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingThreadedScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> protected:
</span><span class="cx"> explicit ThreadedScrollingTree(AsyncScrollingCoordinator*);
</span><span class="cx">
</span><del>- virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
</del><ins>+ virtual PassRefPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
</ins><span class="cx">
</span><span class="cx"> virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) override { return false; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual PassOwnPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
</del><ins>+ virtual PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
</ins><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span><span class="cx">
</span><span class="cx"> void scrollingStateTreeCommitterTimerFired(Timer<ScrollingCoordinatorIOS>*);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingCoordinatorIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> // FIXME: figure out how to commit.
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeNode> ScrollingCoordinatorIOS::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeNode> ScrollingCoordinatorIOS::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(scrollingTree());
</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 (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class ScrollingTreeFrameScrollingNodeIOS : public ScrollingTreeFrameScrollingNode {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ScrollingTreeFrameScrollingNodeIOS> create(ScrollingTree&, ScrollingNodeID);
</del><ins>+ static PassRefPtr<ScrollingTreeFrameScrollingNodeIOS> create(ScrollingTree&, ScrollingNodeID);
</ins><span class="cx"> virtual ~ScrollingTreeFrameScrollingNodeIOS();
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeFrameScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeFrameScrollingNodeIOS> ScrollingTreeFrameScrollingNodeIOS::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeFrameScrollingNodeIOS> ScrollingTreeFrameScrollingNodeIOS::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new ScrollingTreeFrameScrollingNodeIOS(scrollingTree, nodeID));
</del><ins>+ return adoptRef(new ScrollingTreeFrameScrollingNodeIOS(scrollingTree, nodeID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingTreeFrameScrollingNodeIOS::ScrollingTreeFrameScrollingNodeIOS(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOScpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> callOnMainThread(bind(&AsyncScrollingCoordinator::scheduleUpdateScrollPositionAfterAsyncScroll, m_scrollingCoordinator.get(), nodeID, scrollPosition, isHandlingProgrammaticScroll(), scrollingLayerPositionAction));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeNode> ScrollingTreeIOS::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeNode> ScrollingTreeIOS::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx"> return m_scrollingCoordinator->createScrollingTreeNode(nodeType, nodeID);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingiosScrollingTreeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> explicit ScrollingTreeIOS(AsyncScrollingCoordinator*);
</span><span class="cx"> virtual bool isScrollingTreeIOS() const override { return true; }
</span><span class="cx">
</span><del>- virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
</del><ins>+ virtual PassRefPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
</ins><span class="cx">
</span><span class="cx"> virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual PassOwnPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
</del><ins>+ virtual PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
</ins><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span><span class="cx">
</span><span class="cx"> void scrollingStateTreeCommitterTimerFired(Timer<ScrollingCoordinatorMac>*);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingCoordinatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> tiledBacking->setScrollingModeIndication(indicatorMode);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeNode> ScrollingCoordinatorMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeNode> ScrollingCoordinatorMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(scrollingTree());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class ScrollingTreeFixedNode : public ScrollingTreeNode {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ScrollingTreeFixedNode> create(ScrollingTree&, ScrollingNodeID);
</del><ins>+ static PassRefPtr<ScrollingTreeFixedNode> create(ScrollingTree&, ScrollingNodeID);
</ins><span class="cx">
</span><span class="cx"> virtual ~ScrollingTreeFixedNode();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFixedNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new ScrollingTreeFixedNode(scrollingTree, nodeID));
</del><ins>+ return adoptRef(new ScrollingTreeFixedNode(scrollingTree, nodeID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingTreeFixedNode::ScrollingTreeFixedNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> class ScrollingTreeFrameScrollingNodeMac : public ScrollingTreeFrameScrollingNode, private ScrollElasticityControllerClient {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ScrollingTreeFrameScrollingNode> create(ScrollingTree&, ScrollingNodeID);
</del><ins>+ static PassRefPtr<ScrollingTreeFrameScrollingNode> create(ScrollingTree&, ScrollingNodeID);
</ins><span class="cx"> virtual ~ScrollingTreeFrameScrollingNodeMac();
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeFrameScrollingNodeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -50,9 +50,9 @@
</span><span class="cx"> static void logWheelEventHandlerCountChanged(unsigned);
</span><span class="cx">
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeFrameScrollingNode> ScrollingTreeFrameScrollingNodeMac::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeFrameScrollingNode> ScrollingTreeFrameScrollingNodeMac::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new ScrollingTreeFrameScrollingNodeMac(scrollingTree, nodeID));
</del><ins>+ return adoptRef(new ScrollingTreeFrameScrollingNodeMac(scrollingTree, nodeID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingTreeFrameScrollingNodeMac::ScrollingTreeFrameScrollingNodeMac(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class ScrollingTreeStickyNode : public ScrollingTreeNode {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ScrollingTreeStickyNode> create(ScrollingTree&, ScrollingNodeID);
</del><ins>+ static PassRefPtr<ScrollingTreeStickyNode> create(ScrollingTree&, ScrollingNodeID);
</ins><span class="cx">
</span><span class="cx"> virtual ~ScrollingTreeStickyNode();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingmacScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new ScrollingTreeStickyNode(scrollingTree, nodeID));
</del><ins>+ return adoptRef(new ScrollingTreeStickyNode(scrollingTree, nodeID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingTreeStickyNode::ScrollingTreeStickyNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-19 Simon Fraser <simon.fraser@apple.com>
+
+ Make ScrollingTreeNodes refounted, for easier tree reconfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=134075
+
+ Reviewed by Tim Horton.
+
+ Make ScrollingTreeNode be ref-counted.
+
+ * UIProcess/Scrolling/RemoteScrollingTree.cpp:
+ (WebKit::RemoteScrollingTree::createNode):
+ * UIProcess/Scrolling/RemoteScrollingTree.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
+ * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
+ (WebKit::ScrollingTreeOverflowScrollingNodeIOS::create):
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.h:
+ * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
+ (WebKit::RemoteScrollingCoordinator::createScrollingTreeNode):
+
</ins><span class="cx"> 2014-06-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] No way to get the MIME type of the main frame
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> m_scrollingCoordinatorProxy.scrollingTreeNodeRequestsScroll(nodeID, scrollPosition, representsProgrammaticScroll);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeNode> RemoteScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeNode> RemoteScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><span class="cx"> switch (nodeType) {
</span><span class="cx"> case FrameScrollingNode:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingRemoteScrollingTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> virtual void scrollingTreeNodeWillStartPanGesture() override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- virtual PassOwnPtr<WebCore::ScrollingTreeNode> createNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
</del><ins>+ virtual PassRefPtr<WebCore::ScrollingTreeNode> createNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
</ins><span class="cx">
</span><span class="cx"> RemoteScrollingCoordinatorProxy& m_scrollingCoordinatorProxy;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> class ScrollingTreeOverflowScrollingNodeIOS : public WebCore::ScrollingTreeOverflowScrollingNode {
</span><span class="cx"> public:
</span><del>- static PassOwnPtr<ScrollingTreeOverflowScrollingNodeIOS> create(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
</del><ins>+ static PassRefPtr<ScrollingTreeOverflowScrollingNodeIOS> create(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
</ins><span class="cx"> virtual ~ScrollingTreeOverflowScrollingNodeIOS();
</span><span class="cx">
</span><span class="cx"> void scrollViewWillStartPanGesture();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessScrollingiosScrollingTreeOverflowScrollingNodeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -91,9 +91,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeOverflowScrollingNodeIOS> ScrollingTreeOverflowScrollingNodeIOS::create(WebCore::ScrollingTree& scrollingTree, WebCore::ScrollingNodeID nodeID)
</del><ins>+PassRefPtr<ScrollingTreeOverflowScrollingNodeIOS> ScrollingTreeOverflowScrollingNodeIOS::create(WebCore::ScrollingTree& scrollingTree, WebCore::ScrollingNodeID nodeID)
</ins><span class="cx"> {
</span><del>- return adoptPtr(new ScrollingTreeOverflowScrollingNodeIOS(scrollingTree, nodeID));
</del><ins>+ return adoptRef(new ScrollingTreeOverflowScrollingNodeIOS(scrollingTree, nodeID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingTreeOverflowScrollingNodeIOS::ScrollingTreeOverflowScrollingNodeIOS(WebCore::ScrollingTree& scrollingTree, WebCore::ScrollingNodeID nodeID)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> virtual bool coordinatesScrollingForFrameView(WebCore::FrameView*) const override;
</span><span class="cx"> virtual void scheduleTreeStateCommit() override;
</span><span class="cx">
</span><del>- virtual PassOwnPtr<WebCore::ScrollingTreeNode> createScrollingTreeNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID) override;
</del><ins>+ virtual PassRefPtr<WebCore::ScrollingTreeNode> createScrollingTreeNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID) override;
</ins><span class="cx"> virtual bool isRubberBandInProgress() const override;
</span><span class="cx"> virtual void setScrollPinningBehavior(WebCore::ScrollPinningBehavior) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessScrollingRemoteScrollingCoordinatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm (170195 => 170196)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2014-06-20 19:05:55 UTC (rev 170195)
+++ trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm 2014-06-20 19:14:47 UTC (rev 170196)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> m_webPage->drawingArea()->scheduleCompositingLayerFlush();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<ScrollingTreeNode> RemoteScrollingCoordinator::createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID)
</del><ins>+PassRefPtr<ScrollingTreeNode> RemoteScrollingCoordinator::createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID)
</ins><span class="cx"> {
</span><span class="cx"> // We never created scrolling nodes in the WebProcess with remote scrolling.
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre>
</div>
</div>
</body>
</html>