<!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>[161190] 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/161190">161190</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-01-01 10:14:27 -0800 (Wed, 01 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give ScrollingStateNodes a nodeType()
https://bugs.webkit.org/show_bug.cgi?id=126347
Reviewed by Tim Horton.
When we start serializing ScrollingStateNodes to send to the UI process,
it's more convenient if they have a nodeType member rather than virtual functions,
so give them one, and fix the casting macros to use it. This allows us to use
a switch() on node creation, so the compiler will tell us if we forgot to create
a node type.
* page/scrolling/ScrollingStateFixedNode.cpp:
(WebCore::ScrollingStateFixedNode::ScrollingStateFixedNode):
* page/scrolling/ScrollingStateFixedNode.h:
* page/scrolling/ScrollingStateNode.cpp:
(WebCore::ScrollingStateNode::ScrollingStateNode):
* page/scrolling/ScrollingStateNode.h: const ScrollingNodeType field
(can't be modified after construction), and move the m_scrollingStateTree
member after it (the awkward protected:/private: will be cleaned up in a later patch).
(WebCore::ScrollingStateNode::nodeType):
* page/scrolling/ScrollingStateScrollingNode.cpp:
(WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
* page/scrolling/ScrollingStateScrollingNode.h:
* page/scrolling/ScrollingStateStickyNode.cpp:
(WebCore::ScrollingStateStickyNode::ScrollingStateStickyNode):
* page/scrolling/ScrollingStateStickyNode.h:
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::updateTreeFromStateNode):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFixedNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateFixedNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateStickyNodecpp">trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingStateStickyNodeh">trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingTreecpp">trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp">trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/ChangeLog 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2013-12-31 Simon Fraser <simon.fraser@apple.com>
+
+ Give ScrollingStateNodes a nodeType()
+ https://bugs.webkit.org/show_bug.cgi?id=126347
+
+ Reviewed by Tim Horton.
+
+ When we start serializing ScrollingStateNodes to send to the UI process,
+ it's more convenient if they have a nodeType member rather than virtual functions,
+ so give them one, and fix the casting macros to use it. This allows us to use
+ a switch() on node creation, so the compiler will tell us if we forgot to create
+ a node type.
+
+ * page/scrolling/ScrollingStateFixedNode.cpp:
+ (WebCore::ScrollingStateFixedNode::ScrollingStateFixedNode):
+ * page/scrolling/ScrollingStateFixedNode.h:
+ * page/scrolling/ScrollingStateNode.cpp:
+ (WebCore::ScrollingStateNode::ScrollingStateNode):
+ * page/scrolling/ScrollingStateNode.h: const ScrollingNodeType field
+ (can't be modified after construction), and move the m_scrollingStateTree
+ member after it (the awkward protected:/private: will be cleaned up in a later patch).
+ (WebCore::ScrollingStateNode::nodeType):
+ * page/scrolling/ScrollingStateScrollingNode.cpp:
+ (WebCore::ScrollingStateScrollingNode::ScrollingStateScrollingNode):
+ * page/scrolling/ScrollingStateScrollingNode.h:
+ * page/scrolling/ScrollingStateStickyNode.cpp:
+ (WebCore::ScrollingStateStickyNode::ScrollingStateStickyNode):
+ * page/scrolling/ScrollingStateStickyNode.h:
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::updateTreeFromStateNode):
+
</ins><span class="cx"> 2013-12-31 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Out-of-line RenderStyle substructure copying helpers.
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFixedNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingStateFixedNode::ScrollingStateFixedNode(ScrollingStateTree* tree, ScrollingNodeID nodeID)
</span><del>- : ScrollingStateNode(tree, nodeID)
</del><ins>+ : ScrollingStateNode(FixedNode, tree, nodeID)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateFixedNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -56,8 +56,6 @@
</span><span class="cx"> ScrollingStateFixedNode(ScrollingStateTree*, ScrollingNodeID);
</span><span class="cx"> ScrollingStateFixedNode(const ScrollingStateFixedNode&);
</span><span class="cx">
</span><del>- virtual bool isFixedNode() const OVERRIDE { return true; }
-
</del><span class="cx"> virtual void syncLayerPositionForViewportRect(const LayoutRect& viewportRect) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void dumpProperties(TextStream&, int indent) const OVERRIDE;
</span><span class="lines">@@ -65,7 +63,7 @@
</span><span class="cx"> FixedPositionViewportConstraints m_constraints;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateFixedNode, isFixedNode());
</del><ins>+SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateFixedNode, nodeType() == FixedNode);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -36,10 +36,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-ScrollingStateNode::ScrollingStateNode(ScrollingStateTree* scrollingStateTree, ScrollingNodeID nodeID)
- : m_scrollingStateTree(scrollingStateTree)
</del><ins>+ScrollingStateNode::ScrollingStateNode(ScrollingNodeType nodeType, ScrollingStateTree* scrollingStateTree, ScrollingNodeID nodeID)
+ : m_nodeType(nodeType)
</ins><span class="cx"> , m_nodeID(nodeID)
</span><span class="cx"> , m_changedProperties(0)
</span><ins>+ , m_scrollingStateTree(scrollingStateTree)
</ins><span class="cx"> , m_parent(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -48,9 +49,10 @@
</span><span class="cx"> // to clone the relationship pointers, so don't copy that information from the original
</span><span class="cx"> // node.
</span><span class="cx"> ScrollingStateNode::ScrollingStateNode(const ScrollingStateNode& stateNode)
</span><del>- : m_scrollingStateTree(0)
</del><ins>+ : m_nodeType(stateNode.nodeType())
</ins><span class="cx"> , m_nodeID(stateNode.scrollingNodeID())
</span><span class="cx"> , m_changedProperties(stateNode.changedProperties())
</span><ins>+ , m_scrollingStateTree(0)
</ins><span class="cx"> , m_parent(0)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: why doesn't this set the GraphicsLayer?
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -46,13 +46,11 @@
</span><span class="cx">
</span><span class="cx"> class ScrollingStateNode {
</span><span class="cx"> public:
</span><del>- ScrollingStateNode(ScrollingStateTree*, ScrollingNodeID);
</del><ins>+ ScrollingStateNode(ScrollingNodeType, ScrollingStateTree*, ScrollingNodeID);
</ins><span class="cx"> virtual ~ScrollingStateNode();
</span><ins>+
+ ScrollingNodeType nodeType() const { return m_nodeType; }
</ins><span class="cx">
</span><del>- virtual bool isScrollingNode() const { return false; }
- virtual bool isFixedNode() const { return false; }
- virtual bool isStickyNode() const { return false; }
-
</del><span class="cx"> virtual PassOwnPtr<ScrollingStateNode> clone() = 0;
</span><span class="cx"> PassOwnPtr<ScrollingStateNode> cloneAndReset();
</span><span class="cx"> void cloneAndResetChildren(ScrollingStateNode*);
</span><span class="lines">@@ -93,8 +91,6 @@
</span><span class="cx"> protected:
</span><span class="cx"> ScrollingStateNode(const ScrollingStateNode&);
</span><span class="cx">
</span><del>- ScrollingStateTree* m_scrollingStateTree;
-
</del><span class="cx"> private:
</span><span class="cx"> void dump(TextStream&, int indent) const;
</span><span class="cx">
</span><span class="lines">@@ -102,9 +98,14 @@
</span><span class="cx"> ChangedProperties changedProperties() const { return m_changedProperties; }
</span><span class="cx"> void willBeRemovedFromStateTree();
</span><span class="cx">
</span><ins>+ const ScrollingNodeType m_nodeType;
</ins><span class="cx"> ScrollingNodeID m_nodeID;
</span><span class="cx"> ChangedProperties m_changedProperties;
</span><span class="cx">
</span><ins>+protected:
+ ScrollingStateTree* m_scrollingStateTree; // FIXME: this should be a reference.
+
+private:
</ins><span class="cx"> ScrollingStateNode* m_parent;
</span><span class="cx"> OwnPtr<Vector<OwnPtr<ScrollingStateNode>>> m_children;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingStateScrollingNode::ScrollingStateScrollingNode(ScrollingStateTree* stateTree, ScrollingNodeID nodeID)
</span><del>- : ScrollingStateNode(stateTree, nodeID)
</del><ins>+ : ScrollingStateNode(ScrollingNode, stateTree, nodeID)
</ins><span class="cx"> , m_counterScrollingLayer(0)
</span><span class="cx"> , m_headerLayer(0)
</span><span class="cx"> , m_footerLayer(0)
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateScrollingNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -132,8 +132,6 @@
</span><span class="cx"> ScrollingStateScrollingNode(ScrollingStateTree*, ScrollingNodeID);
</span><span class="cx"> ScrollingStateScrollingNode(const ScrollingStateScrollingNode&);
</span><span class="cx">
</span><del>- virtual bool isScrollingNode() const OVERRIDE { return true; }
-
</del><span class="cx"> GraphicsLayer* m_counterScrollingLayer;
</span><span class="cx"> GraphicsLayer* m_headerLayer;
</span><span class="cx"> GraphicsLayer* m_footerLayer;
</span><span class="lines">@@ -161,7 +159,7 @@
</span><span class="cx"> bool m_requestedScrollPositionRepresentsProgrammaticScroll;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateScrollingNode, isScrollingNode());
</del><ins>+SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateScrollingNode, nodeType() == ScrollingNode);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateStickyNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScrollingStateStickyNode::ScrollingStateStickyNode(ScrollingStateTree* tree, ScrollingNodeID nodeID)
</span><del>- : ScrollingStateNode(tree, nodeID)
</del><ins>+ : ScrollingStateNode(StickyNode, tree, nodeID)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingStateStickyNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -56,8 +56,6 @@
</span><span class="cx"> ScrollingStateStickyNode(ScrollingStateTree*, ScrollingNodeID);
</span><span class="cx"> ScrollingStateStickyNode(const ScrollingStateStickyNode&);
</span><span class="cx">
</span><del>- virtual bool isStickyNode() const OVERRIDE { return true; }
-
</del><span class="cx"> virtual void syncLayerPositionForViewportRect(const LayoutRect& viewportRect) OVERRIDE;
</span><span class="cx">
</span><span class="cx"> virtual void dumpProperties(TextStream&, int indent) const OVERRIDE;
</span><span class="lines">@@ -65,7 +63,7 @@
</span><span class="cx"> StickyPositionViewportConstraints m_constraints;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateStickyNode, isStickyNode());
</del><ins>+SCROLLING_STATE_NODE_TYPE_CASTS(ScrollingStateStickyNode, nodeType() == StickyNode);
</ins><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingTreecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -180,14 +180,17 @@
</span><span class="cx"> node = m_rootNode.get();
</span><span class="cx"> } else {
</span><span class="cx"> OwnPtr<ScrollingTreeNode> newNode;
</span><del>- if (stateNode->isScrollingNode())
</del><ins>+ switch (stateNode->nodeType()) {
+ case ScrollingNode:
</ins><span class="cx"> newNode = ScrollingTreeScrollingNode::create(*this, nodeID);
</span><del>- else if (stateNode->isFixedNode())
</del><ins>+ break;
+ case FixedNode:
</ins><span class="cx"> newNode = ScrollingTreeFixedNode::create(*this, nodeID);
</span><del>- else if (stateNode->isStickyNode())
</del><ins>+ break;
+ case StickyNode:
</ins><span class="cx"> newNode = ScrollingTreeStickyNode::create(*this, nodeID);
</span><del>- else
- ASSERT_NOT_REACHED();
</del><ins>+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> node = newNode.get();
</span><span class="cx"> m_nodeMap.set(nodeID, node);
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingcoordinatedgraphicsScrollingCoordinatorCoordinatedGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp (161189 => 161190)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2014-01-01 15:41:43 UTC (rev 161189)
+++ trunk/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingCoordinatorCoordinatedGraphics.cpp 2014-01-01 18:14:27 UTC (rev 161190)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> void ScrollingCoordinatorCoordinatedGraphics::detachFromStateTree(ScrollingNodeID nodeID)
</span><span class="cx"> {
</span><span class="cx"> ScrollingStateNode* node = m_scrollingStateTree->stateNodeForID(nodeID);
</span><del>- if (node && node->isFixedNode())
</del><ins>+ if (node && node->nodeType() == FixedNode)
</ins><span class="cx"> toCoordinatedGraphicsLayer(node->graphicsLayer())->setFixedToViewport(false);
</span><span class="cx">
</span><span class="cx"> m_scrollingStateTree->detachNode(nodeID);
</span></span></pre>
</div>
</div>
</body>
</html>