Changeset 170196 in webkit


Ignore:
Timestamp:
Jun 20, 2014, 12:14:47 PM (12 years ago)
Author:
Simon Fraser
Message:

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):

Location:
trunk/Source
Files:
29 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r170193 r170196  
     12014-06-19  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Make ScrollingTreeNodes refounted, for easier tree reconfiguration
     4        https://bugs.webkit.org/show_bug.cgi?id=134075
     5
     6        Reviewed by Tim Horton.
     7
     8        Make ScrollingTreeNode be ref-counted.
     9
     10        * page/scrolling/AsyncScrollingCoordinator.h:
     11        * page/scrolling/ScrollingTree.cpp:
     12        (WebCore::ScrollingTree::handleWheelEvent):
     13        (WebCore::ScrollingTree::updateTreeFromStateNode):
     14        * page/scrolling/ScrollingTree.h:
     15        (WebCore::ScrollingTree::rootNode):
     16        * page/scrolling/ScrollingTreeNode.cpp:
     17        (WebCore::ScrollingTreeNode::appendChild):
     18        * page/scrolling/ScrollingTreeNode.h:
     19        * page/scrolling/ThreadedScrollingTree.cpp:
     20        (WebCore::ThreadedScrollingTree::createNode):
     21        * page/scrolling/ThreadedScrollingTree.h:
     22        * page/scrolling/ios/ScrollingCoordinatorIOS.h:
     23        * page/scrolling/ios/ScrollingCoordinatorIOS.mm:
     24        (WebCore::ScrollingCoordinatorIOS::createScrollingTreeNode):
     25        * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h:
     26        * page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm:
     27        (WebCore::ScrollingTreeFrameScrollingNodeIOS::create):
     28        * page/scrolling/ios/ScrollingTreeIOS.cpp:
     29        (WebCore::ScrollingTreeIOS::createNode):
     30        * page/scrolling/ios/ScrollingTreeIOS.h:
     31        * page/scrolling/mac/ScrollingCoordinatorMac.h:
     32        * page/scrolling/mac/ScrollingCoordinatorMac.mm:
     33        (WebCore::ScrollingCoordinatorMac::createScrollingTreeNode):
     34        * page/scrolling/mac/ScrollingTreeFixedNode.h:
     35        * page/scrolling/mac/ScrollingTreeFixedNode.mm:
     36        (WebCore::ScrollingTreeFixedNode::create):
     37        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h:
     38        * page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm:
     39        (WebCore::ScrollingTreeFrameScrollingNodeMac::create):
     40        * page/scrolling/mac/ScrollingTreeStickyNode.h:
     41        * page/scrolling/mac/ScrollingTreeStickyNode.mm:
     42        (WebCore::ScrollingTreeStickyNode::create):
     43
    1442014-06-20  Enrica Casucci  <enrica@apple.com>
    245

  • trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h

    r169733 r170196  
    5454    ScrollingTree* scrollingTree() const { return m_scrollingTree.get(); }
    5555
    56     virtual PassOwnPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) = 0;
     56    virtual PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) = 0;
    5757
    5858    void scrollingStateTreePropertiesChanged();

  • trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp

    r170118 r170196  
    9696{
    9797    if (m_rootNode)
    98         m_rootNode->handleWheelEvent(wheelEvent);
     98        toScrollingTreeScrollingNode(m_rootNode.get())->handleWheelEvent(wheelEvent);
    9999}
    100100
    … …  
    178178            m_nodeMap.clear();
    179179
    180             m_rootNode = static_pointer_cast<ScrollingTreeScrollingNode>(createNode(FrameScrollingNode, nodeID));
     180            m_rootNode = createNode(FrameScrollingNode, nodeID);
    181181            m_nodeMap.set(nodeID, m_rootNode.get());
    182182            m_rootNode->updateBeforeChildren(*stateNode);
    183183            node = m_rootNode.get();
    184184        } else {
    185             OwnPtr<ScrollingTreeNode> newNode = createNode(stateNode->nodeType(), nodeID);
     185            RefPtr<ScrollingTreeNode> newNode = createNode(stateNode->nodeType(), nodeID);
    186186            node = newNode.get();
    187187            m_nodeMap.set(nodeID, node);

  • trunk/Source/WebCore/page/scrolling/ScrollingTree.h

    r169791 r170196  
    117117    bool scrollingPerformanceLoggingEnabled();
    118118
    119     ScrollingTreeScrollingNode* rootNode() const { return m_rootNode.get(); }
     119    ScrollingTreeNode* rootNode() const { return m_rootNode.get(); }
    120120
    121121    ScrollingNodeID latchedNode();
    … …  
    134134    void updateTreeFromStateNode(const ScrollingStateNode*);
    135135
    136     virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) = 0;
     136    virtual PassRefPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) = 0;
    137137
    138138    ScrollingTreeNode* nodeForID(ScrollingNodeID) const;
    139139
    140     OwnPtr<ScrollingTreeScrollingNode> m_rootNode;
     140    RefPtr<ScrollingTreeNode> m_rootNode;
    141141
    142142    typedef HashMap<ScrollingNodeID, ScrollingTreeNode*> ScrollingTreeNodeMap;

  • trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp

    r169773 r170196  
    4545}
    4646
    47 void ScrollingTreeNode::appendChild(PassOwnPtr<ScrollingTreeNode> childNode)
     47void ScrollingTreeNode::appendChild(PassRefPtr<ScrollingTreeNode> childNode)
    4848{
    4949    childNode->setParent(this);
    5050
    5151    if (!m_children)
    52         m_children = adoptPtr(new Vector<OwnPtr<ScrollingTreeNode>>);
     52        m_children = adoptPtr(new ScrollingTreeChildrenVector);
    5353
    5454    m_children->append(childNode);

  • trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h

    r169410 r170196  
    3232#include "ScrollTypes.h"
    3333#include "ScrollingCoordinator.h"
    34 #include <wtf/PassOwnPtr.h>
     34#include <wtf/RefCounted.h>
    3535
    3636namespace WebCore {
    … …  
    4040class ScrollingStateScrollingNode;
    4141
    42 class ScrollingTreeNode {
     42class ScrollingTreeNode : public RefCounted<ScrollingTreeNode> {
    4343public:
    4444    virtual ~ScrollingTreeNode();
    … …  
    6161    void setParent(ScrollingTreeNode* parent) { m_parent = parent; }
    6262
    63     void appendChild(PassOwnPtr<ScrollingTreeNode>);
     63    void appendChild(PassRefPtr<ScrollingTreeNode>);
    6464    void removeChild(ScrollingTreeNode*);
    6565
    … …  
    6868    ScrollingTree& scrollingTree() const { return m_scrollingTree; }
    6969
    70     typedef Vector<OwnPtr<ScrollingTreeNode>> ScrollingTreeChildrenVector;
     70    typedef Vector<RefPtr<ScrollingTreeNode>> ScrollingTreeChildrenVector;
    7171    OwnPtr<ScrollingTreeChildrenVector> m_children;
    7272

  • trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp

    r169409 r170196  
    117117#endif
    118118
    119 PassOwnPtr<ScrollingTreeNode> ThreadedScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
     119PassRefPtr<ScrollingTreeNode> ThreadedScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
    120120{
    121121    return m_scrollingCoordinator->createScrollingTreeNode(nodeType, nodeID);

  • trunk/Source/WebCore/page/scrolling/ThreadedScrollingTree.h

    r169409 r170196  
    6060    explicit ThreadedScrollingTree(AsyncScrollingCoordinator*);
    6161
    62     virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
     62    virtual PassRefPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
    6363
    6464    virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.h

    r162139 r170196  
    5252
    5353private:
    54     virtual PassOwnPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
     54    virtual PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
    5555    virtual void scheduleTreeStateCommit() override;
    5656

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingCoordinatorIOS.mm

    r169063 r170196  
    105105}
    106106
    107 PassOwnPtr<ScrollingTreeNode> ScrollingCoordinatorIOS::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
     107PassRefPtr<ScrollingTreeNode> ScrollingCoordinatorIOS::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
    108108{
    109109    ASSERT(scrollingTree());

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.h

    r169410 r170196  
    3838class ScrollingTreeFrameScrollingNodeIOS : public ScrollingTreeFrameScrollingNode {
    3939public:
    40     static PassOwnPtr<ScrollingTreeFrameScrollingNodeIOS> create(ScrollingTree&, ScrollingNodeID);
     40    static PassRefPtr<ScrollingTreeFrameScrollingNodeIOS> create(ScrollingTree&, ScrollingNodeID);
    4141    virtual ~ScrollingTreeFrameScrollingNodeIOS();
    4242

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeFrameScrollingNodeIOS.mm

    r169411 r170196  
    4141namespace WebCore {
    4242
    43 PassOwnPtr<ScrollingTreeFrameScrollingNodeIOS> ScrollingTreeFrameScrollingNodeIOS::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
    44 {
    45     return adoptPtr(new ScrollingTreeFrameScrollingNodeIOS(scrollingTree, nodeID));
     43PassRefPtr<ScrollingTreeFrameScrollingNodeIOS> ScrollingTreeFrameScrollingNodeIOS::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
     44{
     45    return adoptRef(new ScrollingTreeFrameScrollingNodeIOS(scrollingTree, nodeID));
    4646}
    4747

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp

    r169411 r170196  
    9393}
    9494
    95 PassOwnPtr<ScrollingTreeNode> ScrollingTreeIOS::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
     95PassRefPtr<ScrollingTreeNode> ScrollingTreeIOS::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
    9696{
    9797    return m_scrollingCoordinator->createScrollingTreeNode(nodeType, nodeID);

  • trunk/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.h

    r169411 r170196  
    5555    virtual bool isScrollingTreeIOS() const override { return true; }
    5656
    57     virtual PassOwnPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
     57    virtual PassRefPtr<ScrollingTreeNode> createNode(ScrollingNodeType, ScrollingNodeID) override;
    5858
    5959    virtual void scrollingTreeNodeDidScroll(ScrollingNodeID, const FloatPoint& scrollPosition, SetOrSyncScrollingLayerPosition = SyncScrollingLayerPosition) override;

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.h

    r169409 r170196  
    5252
    5353private:
    54     virtual PassOwnPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
     54    virtual PassRefPtr<ScrollingTreeNode> createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID) override;
    5555    virtual void scheduleTreeStateCommit() override;
    5656

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm

    r169409 r170196  
    143143}
    144144
    145 PassOwnPtr<ScrollingTreeNode> ScrollingCoordinatorMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
     145PassRefPtr<ScrollingTreeNode> ScrollingCoordinatorMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
    146146{
    147147    ASSERT(scrollingTree());

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.h

    r169410 r170196  
    4141class ScrollingTreeFixedNode : public ScrollingTreeNode {
    4242public:
    43     static PassOwnPtr<ScrollingTreeFixedNode> create(ScrollingTree&, ScrollingNodeID);
     43    static PassRefPtr<ScrollingTreeFixedNode> create(ScrollingTree&, ScrollingNodeID);
    4444
    4545    virtual ~ScrollingTreeFixedNode();

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm

    r169430 r170196  
    3535namespace WebCore {
    3636
    37 PassOwnPtr<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
     37PassRefPtr<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
    3838{
    39     return adoptPtr(new ScrollingTreeFixedNode(scrollingTree, nodeID));
     39    return adoptRef(new ScrollingTreeFixedNode(scrollingTree, nodeID));
    4040}
    4141

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.h

    r169410 r170196  
    4040class ScrollingTreeFrameScrollingNodeMac : public ScrollingTreeFrameScrollingNode, private ScrollElasticityControllerClient {
    4141public:
    42     static PassOwnPtr<ScrollingTreeFrameScrollingNode> create(ScrollingTree&, ScrollingNodeID);
     42    static PassRefPtr<ScrollingTreeFrameScrollingNode> create(ScrollingTree&, ScrollingNodeID);
    4343    virtual ~ScrollingTreeFrameScrollingNodeMac();
    4444

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm

    r169773 r170196  
    5151
    5252
    53 PassOwnPtr<ScrollingTreeFrameScrollingNode> ScrollingTreeFrameScrollingNodeMac::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
    54 {
    55     return adoptPtr(new ScrollingTreeFrameScrollingNodeMac(scrollingTree, nodeID));
     53PassRefPtr<ScrollingTreeFrameScrollingNode> ScrollingTreeFrameScrollingNodeMac::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
     54{
     55    return adoptRef(new ScrollingTreeFrameScrollingNodeMac(scrollingTree, nodeID));
    5656}
    5757

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.h

    r169410 r170196  
    4141class ScrollingTreeStickyNode : public ScrollingTreeNode {
    4242public:
    43     static PassOwnPtr<ScrollingTreeStickyNode> create(ScrollingTree&, ScrollingNodeID);
     43    static PassRefPtr<ScrollingTreeStickyNode> create(ScrollingTree&, ScrollingNodeID);
    4444
    4545    virtual ~ScrollingTreeStickyNode();

  • trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm

    r169430 r170196  
    3636namespace WebCore {
    3737
    38 PassOwnPtr<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
     38PassRefPtr<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
    3939{
    40     return adoptPtr(new ScrollingTreeStickyNode(scrollingTree, nodeID));
     40    return adoptRef(new ScrollingTreeStickyNode(scrollingTree, nodeID));
    4141}
    4242

  • trunk/Source/WebKit2/ChangeLog

    r170195 r170196  
     12014-06-19  Simon Fraser  <simon.fraser@apple.com>
     2
     3        Make ScrollingTreeNodes refounted, for easier tree reconfiguration
     4        https://bugs.webkit.org/show_bug.cgi?id=134075
     5
     6        Reviewed by Tim Horton.
     7
     8        Make ScrollingTreeNode be ref-counted.
     9
     10        * UIProcess/Scrolling/RemoteScrollingTree.cpp:
     11        (WebKit::RemoteScrollingTree::createNode):
     12        * UIProcess/Scrolling/RemoteScrollingTree.h:
     13        * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h:
     14        * UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm:
     15        (WebKit::ScrollingTreeOverflowScrollingNodeIOS::create):
     16        * WebProcess/Scrolling/RemoteScrollingCoordinator.h:
     17        * WebProcess/Scrolling/RemoteScrollingCoordinator.mm:
     18        (WebKit::RemoteScrollingCoordinator::createScrollingTreeNode):
     19
    1202014-06-20  Dan Bernstein  <mitz@apple.com>
    221

  • trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.cpp

    r169791 r170196  
    100100}
    101101
    102 PassOwnPtr<ScrollingTreeNode> RemoteScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
     102PassRefPtr<ScrollingTreeNode> RemoteScrollingTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
    103103{
    104104    switch (nodeType) {

  • trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingTree.h

    r169791 r170196  
    6262#endif
    6363
    64     virtual PassOwnPtr<WebCore::ScrollingTreeNode> createNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
     64    virtual PassRefPtr<WebCore::ScrollingTreeNode> createNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID);
    6565   
    6666    RemoteScrollingCoordinatorProxy& m_scrollingCoordinatorProxy;

  • trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.h

    r169791 r170196  
    3838class ScrollingTreeOverflowScrollingNodeIOS : public WebCore::ScrollingTreeOverflowScrollingNode {
    3939public:
    40     static PassOwnPtr<ScrollingTreeOverflowScrollingNodeIOS> create(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
     40    static PassRefPtr<ScrollingTreeOverflowScrollingNodeIOS> create(WebCore::ScrollingTree&, WebCore::ScrollingNodeID);
    4141    virtual ~ScrollingTreeOverflowScrollingNodeIOS();
    4242

  • trunk/Source/WebKit2/UIProcess/Scrolling/ios/ScrollingTreeOverflowScrollingNodeIOS.mm

    r169791 r170196  
    9292namespace WebKit {
    9393
    94 PassOwnPtr<ScrollingTreeOverflowScrollingNodeIOS> ScrollingTreeOverflowScrollingNodeIOS::create(WebCore::ScrollingTree& scrollingTree, WebCore::ScrollingNodeID nodeID)
    95 {
    96     return adoptPtr(new ScrollingTreeOverflowScrollingNodeIOS(scrollingTree, nodeID));
     94PassRefPtr<ScrollingTreeOverflowScrollingNodeIOS> ScrollingTreeOverflowScrollingNodeIOS::create(WebCore::ScrollingTree& scrollingTree, WebCore::ScrollingNodeID nodeID)
     95{
     96    return adoptRef(new ScrollingTreeOverflowScrollingNodeIOS(scrollingTree, nodeID));
    9797}
    9898

  • trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.h

    r169733 r170196  
    6565    virtual void scheduleTreeStateCommit() override;
    6666
    67     virtual PassOwnPtr<WebCore::ScrollingTreeNode> createScrollingTreeNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID) override;
     67    virtual PassRefPtr<WebCore::ScrollingTreeNode> createScrollingTreeNode(WebCore::ScrollingNodeType, WebCore::ScrollingNodeID) override;
    6868    virtual bool isRubberBandInProgress() const override;
    6969    virtual void setScrollPinningBehavior(WebCore::ScrollPinningBehavior) override;

  • trunk/Source/WebKit2/WebProcess/Scrolling/RemoteScrollingCoordinator.mm

    r169733 r170196  
    6868}
    6969
    70 PassOwnPtr<ScrollingTreeNode> RemoteScrollingCoordinator::createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID)
     70PassRefPtr<ScrollingTreeNode> RemoteScrollingCoordinator::createScrollingTreeNode(ScrollingNodeType, ScrollingNodeID)
    7171{
    7272    // We never created scrolling nodes in the WebProcess with remote scrolling.
Note: See TracChangeset for help on using the changeset viewer.