Title: [223337] trunk/Source/WebCore
- Revision
- 223337
- Author
- fred.w...@free.fr
- Date
- 2017-10-16 00:04:48 -0700 (Mon, 16 Oct 2017)
Log Message
Replace some ScrollingTreeNode::nodeType() calls with is*Node()
https://bugs.webkit.org/show_bug.cgi?id=178259
Patch by Frederic Wang <fw...@igalia.com> on 2017-10-16
Reviewed by Darin Adler.
No new tests, behavior unchanged.
* page/scrolling/AsyncScrollingCoordinator.cpp:
(WebCore::AsyncScrollingCoordinator::frameViewForScrollingNode const):
* page/scrolling/ScrollingStateNode.h:
(WebCore::ScrollingStateNode::isScrollingNode const):
* page/scrolling/ScrollingTree.cpp:
(WebCore::ScrollingTree::updateTreeFromStateNode):
* page/scrolling/ScrollingTreeNode.cpp:
(WebCore::ScrollingTreeNode::enclosingFrameNode const):
* page/scrolling/ScrollingTreeNode.h:
(WebCore::ScrollingTreeNode::isScrollingNode const):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223336 => 223337)
--- trunk/Source/WebCore/ChangeLog 2017-10-16 06:25:54 UTC (rev 223336)
+++ trunk/Source/WebCore/ChangeLog 2017-10-16 07:04:48 UTC (rev 223337)
@@ -1,3 +1,23 @@
+2017-10-16 Frederic Wang <fw...@igalia.com>
+
+ Replace some ScrollingTreeNode::nodeType() calls with is*Node()
+ https://bugs.webkit.org/show_bug.cgi?id=178259
+
+ Reviewed by Darin Adler.
+
+ No new tests, behavior unchanged.
+
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::frameViewForScrollingNode const):
+ * page/scrolling/ScrollingStateNode.h:
+ (WebCore::ScrollingStateNode::isScrollingNode const):
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::updateTreeFromStateNode):
+ * page/scrolling/ScrollingTreeNode.cpp:
+ (WebCore::ScrollingTreeNode::enclosingFrameNode const):
+ * page/scrolling/ScrollingTreeNode.h:
+ (WebCore::ScrollingTreeNode::isScrollingNode const):
+
2017-10-16 Tomas Popela <tpop...@redhat.com>
DataTransfer.cpp triggers -Wunused-but-set-variable
Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (223336 => 223337)
--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2017-10-16 06:25:54 UTC (rev 223336)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2017-10-16 07:04:48 UTC (rev 223337)
@@ -307,7 +307,7 @@
// Find the enclosing frame scrolling node.
ScrollingStateNode* parentNode = stateNode;
- while (parentNode && parentNode->nodeType() != FrameScrollingNode)
+ while (parentNode && !parentNode->isFrameScrollingNode())
parentNode = parentNode->parent();
if (!parentNode)
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (223336 => 223337)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2017-10-16 06:25:54 UTC (rev 223336)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2017-10-16 07:04:48 UTC (rev 223337)
@@ -196,7 +196,7 @@
bool isFixedNode() const { return m_nodeType == FixedNode; }
bool isStickyNode() const { return m_nodeType == StickyNode; }
- bool isScrollingNode() const { return m_nodeType == FrameScrollingNode || m_nodeType == OverflowScrollingNode; }
+ bool isScrollingNode() const { return isFrameScrollingNode() || isOverflowScrollingNode(); }
bool isFrameScrollingNode() const { return m_nodeType == FrameScrollingNode; }
bool isOverflowScrollingNode() const { return m_nodeType == OverflowScrollingNode; }
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (223336 => 223337)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2017-10-16 06:25:54 UTC (rev 223336)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2017-10-16 07:04:48 UTC (rev 223337)
@@ -167,7 +167,7 @@
node = createScrollingTreeNode(stateNode->nodeType(), nodeID);
if (!parentNodeID) {
// This is the root node. Clear the node map.
- ASSERT(stateNode->nodeType() == FrameScrollingNode);
+ ASSERT(stateNode->isFrameScrollingNode());
m_rootNode = node;
m_nodeMap.clear();
}
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp (223336 => 223337)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2017-10-16 06:25:54 UTC (rev 223336)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2017-10-16 07:04:48 UTC (rev 223337)
@@ -82,7 +82,7 @@
ScrollingTreeFrameScrollingNode* ScrollingTreeNode::enclosingFrameNode() const
{
ScrollingTreeNode* node = parent();
- while (node && node->nodeType() != FrameScrollingNode)
+ while (node && !node->isFrameScrollingNode())
node = node->parent();
return downcast<ScrollingTreeFrameScrollingNode>(node);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (223336 => 223337)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2017-10-16 06:25:54 UTC (rev 223336)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2017-10-16 07:04:48 UTC (rev 223337)
@@ -49,7 +49,7 @@
bool isFixedNode() const { return nodeType() == FixedNode; }
bool isStickyNode() const { return nodeType() == StickyNode; }
- bool isScrollingNode() const { return nodeType() == FrameScrollingNode || nodeType() == OverflowScrollingNode; }
+ bool isScrollingNode() const { return isFrameScrollingNode() || isOverflowScrollingNode(); }
bool isFrameScrollingNode() const { return nodeType() == FrameScrollingNode; }
bool isOverflowScrollingNode() const { return nodeType() == OverflowScrollingNode; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
