Changeset 131221 in webkit

Timestamp:

Oct 12, 2012 1:50:36 PM (12 years ago)

Author:

Beth Dakin

Message:

​https://bugs.webkit.org/show_bug.cgi?id=99204
ScrollingStateNodes should keep track of their IDs

Reviewed by Simon Fraser.

There is a HashMap in ScrollingCoordinatorMac that maps
ScrollingNodeIDs to ScrollingStateNodes. The nodes themselves should
keep track of this id. Then the id can be used to make sure
ScrollingStateNodes remove themselves from the HashMap when they are
destroyed, and it will also be useful for associating
ScrollingStateNodes with ScrollingTreeNodes over on the scrolling
thread.

This patch only has the ScrollingStateNodes cache the id. I will
actually make use of the id in follow-up patches.

• page/scrolling/ScrollingStateNode.cpp:

(WebCore::ScrollingStateNode::ScrollingStateNode):

• page/scrolling/ScrollingStateNode.h:

(ScrollingStateNode):
(WebCore::ScrollingStateNode::scrollingNodeID):

• page/scrolling/ScrollingStateScrollingNode.cpp:

(WebCore::ScrollingStateScrollingNode::create):
(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):

• page/scrolling/ScrollingStateScrollingNode.h:

(ScrollingStateScrollingNode):

• page/scrolling/mac/ScrollingCoordinatorMac.mm:

(WebCore::ScrollingCoordinatorMac::attachToStateTree):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingStateNode.cpp (modified) (2 diffs)
• page/scrolling/ScrollingStateNode.h (modified) (4 diffs)
• page/scrolling/ScrollingStateScrollingNode.cpp (modified) (1 diff)
• page/scrolling/ScrollingStateScrollingNode.h (modified) (2 diffs)
• page/scrolling/mac/ScrollingCoordinatorMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-12  Beth Dakin  <bdakin@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=99204
+        ScrollingStateNodes should keep track of their IDs
+
+        Reviewed by Simon Fraser.
+
+        There is a HashMap in ScrollingCoordinatorMac that maps 
+        ScrollingNodeIDs to ScrollingStateNodes. The nodes themselves should 
+        keep track of this id. Then the id can be used to make sure 
+        ScrollingStateNodes remove themselves from the HashMap when they are 
+        destroyed, and it will also be useful for associating 
+        ScrollingStateNodes with ScrollingTreeNodes over on the scrolling 
+        thread.
+  
+        This patch only has the ScrollingStateNodes cache the id. I will 
+        actually make use of the id in follow-up patches.
+
+        * page/scrolling/ScrollingStateNode.cpp:
+        (WebCore::ScrollingStateNode::ScrollingStateNode):
+        * page/scrolling/ScrollingStateNode.h:
+        (ScrollingStateNode):
+        (WebCore::ScrollingStateNode::scrollingNodeID):
+        * page/scrolling/ScrollingStateScrollingNode.cpp:
+        (WebCore::ScrollingStateScrollingNode::create):
+        (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+        * page/scrolling/ScrollingStateScrollingNode.h:
+        (ScrollingStateScrollingNode):
+        * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+        (WebCore::ScrollingCoordinatorMac::attachToStateTree):
+
 2012-10-01  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp

@@ -33 +33 @@
 namespace WebCore {
 
-ScrollingStateNode::ScrollingStateNode(ScrollingStateTree* scrollingStateTree)
+ScrollingStateNode::ScrollingStateNode(ScrollingStateTree* scrollingStateTree, ScrollingNodeID nodeID)
     : m_scrollingStateTree(scrollingStateTree)
+    , m_nodeID(nodeID)
     , m_parent(0)
     , m_scrollLayerDidChange(false)
@@ -45 +46 @@
 ScrollingStateNode::ScrollingStateNode(ScrollingStateNode* stateNode)
     : m_scrollingStateTree(0)
+    , m_nodeID(stateNode->scrollingNodeID())
     , m_parent(0)
     , m_scrollLayerDidChange(stateNode->scrollLayerDidChange())

trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h

@@ -30 +30 @@
 
 #include "GraphicsLayer.h"
+#include "ScrollingCoordinator.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
@@ -46 +47 @@
 
 public:
-    ScrollingStateNode(ScrollingStateTree*);
+    ScrollingStateNode(ScrollingStateTree*, ScrollingNodeID);
     virtual ~ScrollingStateNode();
 
@@ -69 +70 @@
     void setScrollingStateTree(ScrollingStateTree* tree) { m_scrollingStateTree = tree; }
 
+    ScrollingNodeID scrollingNodeID() const { return m_nodeID; }
+
     ScrollingStateNode* parent() const { return m_parent; }
     void setParent(ScrollingStateNode* parent) { m_parent = parent; }
@@ -82 +85 @@
 
 private:
+    ScrollingNodeID m_nodeID;
+
     ScrollingStateNode* m_parent;
-
     OwnPtr<Vector<OwnPtr<ScrollingStateNode> > > m_children;
 

trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp

@@ -34 +34 @@
 namespace WebCore {
 
-PassOwnPtr<ScrollingStateScrollingNode> ScrollingStateScrollingNode::create(ScrollingStateTree* stateTree)
-{
-    return adoptPtr(new ScrollingStateScrollingNode(stateTree));
-}
-
-ScrollingStateScrollingNode::ScrollingStateScrollingNode(ScrollingStateTree* stateTree)
-    : ScrollingStateNode(stateTree)
+PassOwnPtr<ScrollingStateScrollingNode> ScrollingStateScrollingNode::create(ScrollingStateTree* stateTree, ScrollingNodeID nodeID)
+{
+    return adoptPtr(new ScrollingStateScrollingNode(stateTree, nodeID));
+}
+
+ScrollingStateScrollingNode::ScrollingStateScrollingNode(ScrollingStateTree* stateTree, ScrollingNodeID nodeID)
+    : ScrollingStateNode(stateTree, nodeID)
     , m_changedProperties(0)
     , m_wheelEventHandlerCount(0)

trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h

@@ -40 +40 @@
 class ScrollingStateScrollingNode : public ScrollingStateNode {
 public:
-    static PassOwnPtr<ScrollingStateScrollingNode> create(ScrollingStateTree*);
+    static PassOwnPtr<ScrollingStateScrollingNode> create(ScrollingStateTree*, ScrollingNodeID);
     virtual ~ScrollingStateScrollingNode();
 
@@ -111 +111 @@
 
 private:
-    ScrollingStateScrollingNode(ScrollingStateTree*);
+    ScrollingStateScrollingNode(ScrollingStateTree*, ScrollingNodeID);
     ScrollingStateScrollingNode(ScrollingStateScrollingNode*);
 

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

@@ -248 +248 @@
     // append the node in the appropriate spot in the state tree. For now we always assume
     // this is the root node.
-    m_scrollingStateTree->setRootStateNode(ScrollingStateScrollingNode::create(m_scrollingStateTree.get()));
+    m_scrollingStateTree->setRootStateNode(ScrollingStateScrollingNode::create(m_scrollingStateTree.get(), scrollLayerID));
     m_stateNodeMap.set(scrollLayerID, m_scrollingStateTree->rootStateNode());
     return scrollLayerID;