Attachment 358043 Details for Bug 193009 – Patch

[patch] Patch

bug-193009-20181224094338.patch (text/plain), 37.10 KB, created by Simon Fraser (smfr) on 2018-12-24 09:43:39 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2018-12-24 09:43:39 PST

Size: 37.10 KB

patch

obsolete

>Subversion Revision: 239533
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 24291ccefc4f8271e4ba829b7e3040b12bccf0ba..880c7d2ab3d11aa9fbcceb0b205cda56fb10fab0 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,55 @@
>+2018-12-22  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Change ScrollingNodeType to an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=193009
>+
>+        Reviewed by Zalan Bujtas.
>+
>+        Change the ScrollingNodeType enum to an enum class.
>+        
>+        No behavior change.
>+
>+        * page/scrolling/AsyncScrollingCoordinator.cpp:
>+        (WebCore::AsyncScrollingCoordinator::ensureRootStateNodeForFrameView):
>+        * page/scrolling/ScrollingCoordinator.cpp:
>+        (WebCore::operator<<):
>+        * page/scrolling/ScrollingCoordinator.h:
>+        * page/scrolling/ScrollingStateFixedNode.cpp:
>+        (WebCore::ScrollingStateFixedNode::ScrollingStateFixedNode):
>+        * page/scrolling/ScrollingStateNode.h:
>+        (WebCore::ScrollingStateNode::isFixedNode const):
>+        (WebCore::ScrollingStateNode::isStickyNode const):
>+        (WebCore::ScrollingStateNode::isFrameScrollingNode const):
>+        (WebCore::ScrollingStateNode::isOverflowScrollingNode const):
>+        * page/scrolling/ScrollingStateOverflowScrollingNode.cpp:
>+        (WebCore::ScrollingStateOverflowScrollingNode::ScrollingStateOverflowScrollingNode):
>+        * page/scrolling/ScrollingStateStickyNode.cpp:
>+        (WebCore::ScrollingStateStickyNode::ScrollingStateStickyNode):
>+        * page/scrolling/ScrollingStateTree.cpp:
>+        (WebCore::ScrollingStateTree::createNode):
>+        (WebCore::ScrollingStateTree::attachNode):
>+        * page/scrolling/ScrollingTreeNode.h:
>+        (WebCore::ScrollingTreeNode::isFixedNode const):
>+        (WebCore::ScrollingTreeNode::isStickyNode const):
>+        (WebCore::ScrollingTreeNode::isFrameScrollingNode const):
>+        (WebCore::ScrollingTreeNode::isOverflowScrollingNode const):
>+        * page/scrolling/ScrollingTreeOverflowScrollingNode.cpp:
>+        (WebCore::ScrollingTreeOverflowScrollingNode::ScrollingTreeOverflowScrollingNode):
>+        * page/scrolling/ios/ScrollingTreeIOS.cpp:
>+        (WebCore::ScrollingTreeIOS::createScrollingTreeNode):
>+        * page/scrolling/mac/ScrollingTreeFixedNode.mm:
>+        (WebCore::ScrollingTreeFixedNode::ScrollingTreeFixedNode):
>+        * page/scrolling/mac/ScrollingTreeMac.cpp:
>+        (ScrollingTreeMac::createScrollingTreeNode):
>+        * page/scrolling/mac/ScrollingTreeStickyNode.mm:
>+        (WebCore::ScrollingTreeStickyNode::ScrollingTreeStickyNode):
>+        * platform/graphics/GraphicsLayerClient.h:
>+        * rendering/RenderLayerCompositor.cpp:
>+        (WebCore::RenderLayerCompositor::reattachSubframeScrollLayers):
>+        (WebCore::scrollCoordinationRoleForNodeType):
>+        (WebCore::RenderLayerCompositor::updateScrollCoordinationForThisFrame):
>+        (WebCore::RenderLayerCompositor::updateScrollCoordinatedLayer):
>+
> 2018-12-21  Youenn Fablet  <youenn@apple.com>
> 
>         RTCRtpSender.setParameters() does set active parameter
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 1a222fc62adc11507ca7e04ee1159a49e4f964b8..c18a7bda6445a2032541f206ad947e01390bdb39 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,27 @@
>+2018-12-22  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Change ScrollingNodeType to an enum class
>+        https://bugs.webkit.org/show_bug.cgi?id=193009
>+
>+        Reviewed by Zalan Bujtas.
>+
>+        Change the ScrollingNodeType enum to an enum class.
>+        
>+        No behavior change.
>+
>+        * Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp:
>+        (WebKit::encodeNodeAndDescendants):
>+        (WebKit::RemoteScrollingCoordinatorTransaction::decode):
>+        (WebKit::dump):
>+        * UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp:
>+        (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
>+        * UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp:
>+        (WebKit::RemoteScrollingTree::createScrollingTreeNode):
>+        * UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm:
>+        (WebKit::RemoteScrollingCoordinatorProxy::connectStateNodeLayers):
>+        * UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm:
>+        (WebKit::ScrollingTreeScrollingNodeDelegateIOS::updateChildNodesAfterScroll):
>+
> 2018-12-21  Alex Christensen  <achristensen@webkit.org>
> 
>         Expand use of sourceApplicationAuditData
>diff --git a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
>index fdfe315af6c2942e129dc0d77527438d614d703f..f63093846ab0f93af853eecee866b1a725893faf 100644
>--- a/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
>+++ b/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp
>@@ -510,7 +510,7 @@ void AsyncScrollingCoordinator::ensureRootStateNodeForFrameView(FrameView& frame
>     // For non-main frames, it is only possible to arrive in this function from
>     // RenderLayerCompositor::updateBacking where the node has already been created.
>     ASSERT(frameView.frame().isMainFrame());
>-    attachToStateTree(MainFrameScrollingNode, frameView.scrollLayerID(), 0, 0);
>+    attachToStateTree(ScrollingNodeType::MainFrame, frameView.scrollLayerID(), 0, 0);
> }
> 
> void AsyncScrollingCoordinator::updateFrameScrollingNode(ScrollingNodeID nodeID, GraphicsLayer* layer, GraphicsLayer* scrolledContentsLayer, GraphicsLayer* counterScrollingLayer, GraphicsLayer* insetClipLayer, const ScrollingGeometry& scrollingGeometry)
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>index 2818ea94bf0e93b43031be934ae6cb708be821f8..cb8738396a3a58ef4520ee548cf831eb415471b8 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp
>@@ -417,19 +417,19 @@ TextStream& operator<<(TextStream& ts, ScrollableAreaParameters scrollableAreaPa
> TextStream& operator<<(TextStream& ts, ScrollingNodeType nodeType)
> {
>     switch (nodeType) {
>-    case MainFrameScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>         ts << "main-frame-scrolling";
>         break;
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::Subframe:
>         ts << "subframe-scrolling";
>         break;
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         ts << "overflow-scrolling";
>         break;
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         ts << "fixed";
>         break;
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         ts << "sticky";
>         break;
>     }
>diff --git a/Source/WebCore/page/scrolling/ScrollingCoordinator.h b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>index fc723b0854621c5c498122051427ce4ba1f53861..a258ed11b8cf57dae5fd174552a168952cb82b7f 100644
>--- a/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>+++ b/Source/WebCore/page/scrolling/ScrollingCoordinator.h
>@@ -54,7 +54,13 @@ namespace WebCore {
> typedef unsigned SynchronousScrollingReasons;
> typedef uint64_t ScrollingNodeID;
> 
>-enum ScrollingNodeType { MainFrameScrollingNode, SubframeScrollingNode, OverflowScrollingNode, FixedNode, StickyNode };
>+enum class ScrollingNodeType : uint8_t {
>+    MainFrame,
>+    Subframe,
>+    Overflow,
>+    Fixed,
>+    Sticky
>+};
> 
> enum ScrollingStateTreeAsTextBehaviorFlags {
>     ScrollingStateTreeAsTextBehaviorNormal                  = 0,
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
>index 29a0b4df4d58238420b261d3c985dad43612ef43..7070b3c8daf31ccc399eef87e9e0e8ef6abb8de7 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp
>@@ -41,7 +41,7 @@ Ref<ScrollingStateFixedNode> ScrollingStateFixedNode::create(ScrollingStateTree&
> }
> 
> ScrollingStateFixedNode::ScrollingStateFixedNode(ScrollingStateTree& tree, ScrollingNodeID nodeID)
>-    : ScrollingStateNode(FixedNode, tree, nodeID)
>+    : ScrollingStateNode(ScrollingNodeType::Fixed, tree, nodeID)
> {
> }
> 
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateNode.h b/Source/WebCore/page/scrolling/ScrollingStateNode.h
>index 33908850c110fcfec03a6b97287d7ae606d49f8f..27c2154931ba3aa9a23d113297898ba51b9cbced 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingStateNode.h
>@@ -196,11 +196,11 @@ public:
>     
>     ScrollingNodeType nodeType() const { return m_nodeType; }
> 
>-    bool isFixedNode() const { return m_nodeType == FixedNode; }
>-    bool isStickyNode() const { return m_nodeType == StickyNode; }
>+    bool isFixedNode() const { return m_nodeType == ScrollingNodeType::Fixed; }
>+    bool isStickyNode() const { return m_nodeType == ScrollingNodeType::Sticky; }
>     bool isScrollingNode() const { return isFrameScrollingNode() || isOverflowScrollingNode(); }
>-    bool isFrameScrollingNode() const { return m_nodeType == MainFrameScrollingNode || m_nodeType == SubframeScrollingNode; }
>-    bool isOverflowScrollingNode() const { return m_nodeType == OverflowScrollingNode; }
>+    bool isFrameScrollingNode() const { return m_nodeType == ScrollingNodeType::MainFrame || m_nodeType == ScrollingNodeType::Subframe; }
>+    bool isOverflowScrollingNode() const { return m_nodeType == ScrollingNodeType::Overflow; }
> 
>     virtual Ref<ScrollingStateNode> clone(ScrollingStateTree& adoptiveTree) = 0;
>     Ref<ScrollingStateNode> cloneAndReset(ScrollingStateTree& adoptiveTree);
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
>index 931f57a443b50a93f342edb96c07cc91bb59535f..1e7686ccc9c0be0f6c4b21b2433c8cb792bd7c17 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp
>@@ -39,7 +39,7 @@ Ref<ScrollingStateOverflowScrollingNode> ScrollingStateOverflowScrollingNode::cr
> }
> 
> ScrollingStateOverflowScrollingNode::ScrollingStateOverflowScrollingNode(ScrollingStateTree& stateTree, ScrollingNodeID nodeID)
>-    : ScrollingStateScrollingNode(stateTree, OverflowScrollingNode, nodeID)
>+    : ScrollingStateScrollingNode(stateTree, ScrollingNodeType::Overflow, nodeID)
> {
> }
> 
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
>index 96011cf18f9f9b6da99bf71106a53c4bf0bfb9ad..127919c020b6a67061751854a920f60231234996 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp
>@@ -41,7 +41,7 @@ Ref<ScrollingStateStickyNode> ScrollingStateStickyNode::create(ScrollingStateTre
> }
> 
> ScrollingStateStickyNode::ScrollingStateStickyNode(ScrollingStateTree& tree, ScrollingNodeID nodeID)
>-    : ScrollingStateNode(StickyNode, tree, nodeID)
>+    : ScrollingStateNode(ScrollingNodeType::Sticky, tree, nodeID)
> {
> }
> 
>diff --git a/Source/WebCore/page/scrolling/ScrollingStateTree.cpp b/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>index 01cbe3e2857ad57c5d580ee7d45932c55a4e85fa..2db453c14e44be9e359ee91536951086d6e22d37 100644
>--- a/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingStateTree.cpp
>@@ -68,15 +68,15 @@ void ScrollingStateTree::setHasChangedProperties(bool changedProperties)
> Ref<ScrollingStateNode> ScrollingStateTree::createNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
> {
>     switch (nodeType) {
>-    case FixedNode:
>-        return ScrollingStateFixedNode::create(*this, nodeID);
>-    case StickyNode:
>-        return ScrollingStateStickyNode::create(*this, nodeID);
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>         return ScrollingStateFrameScrollingNode::create(*this, nodeType, nodeID);
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         return ScrollingStateOverflowScrollingNode::create(*this, nodeID);
>+    case ScrollingNodeType::Fixed:
>+        return ScrollingStateFixedNode::create(*this, nodeID);
>+    case ScrollingNodeType::Sticky:
>+        return ScrollingStateStickyNode::create(*this, nodeID);
>     }
>     ASSERT_NOT_REACHED();
>     return ScrollingStateFixedNode::create(*this, nodeID);
>@@ -132,7 +132,7 @@ ScrollingNodeID ScrollingStateTree::attachNode(ScrollingNodeType nodeType, Scrol
>         // If we're resetting the root node, we should clear the HashMap and destroy the current children.
>         clear();
> 
>-        setRootStateNode(ScrollingStateFrameScrollingNode::create(*this, MainFrameScrollingNode, newNodeID));
>+        setRootStateNode(ScrollingStateFrameScrollingNode::create(*this, ScrollingNodeType::MainFrame, newNodeID));
>         newNode = rootStateNode();
>         m_hasNewRootStateNode = true;
>     } else {
>@@ -142,7 +142,7 @@ ScrollingNodeID ScrollingStateTree::attachNode(ScrollingNodeType nodeType, Scrol
>             return 0;
>         }
> 
>-        if (nodeType == SubframeScrollingNode && parentID) {
>+        if (nodeType == ScrollingNodeType::Subframe && parentID) {
>             if (auto orphanedNode = m_orphanedSubframeNodes.take(newNodeID)) {
>                 newNode = orphanedNode.get();
>                 if (childIndex == notFound)
>diff --git a/Source/WebCore/page/scrolling/ScrollingTreeNode.h b/Source/WebCore/page/scrolling/ScrollingTreeNode.h
>index 7951dade6a64172be37bb192bda88309219f1bfa..bf7f61a361b93b47dfe434e05f93288ccf590bb6 100644
>--- a/Source/WebCore/page/scrolling/ScrollingTreeNode.h
>+++ b/Source/WebCore/page/scrolling/ScrollingTreeNode.h
>@@ -47,11 +47,11 @@ public:
>     ScrollingNodeType nodeType() const { return m_nodeType; }
>     ScrollingNodeID scrollingNodeID() const { return m_nodeID; }
>     
>-    bool isFixedNode() const { return nodeType() == FixedNode; }
>-    bool isStickyNode() const { return nodeType() == StickyNode; }
>+    bool isFixedNode() const { return nodeType() == ScrollingNodeType::Fixed; }
>+    bool isStickyNode() const { return nodeType() == ScrollingNodeType::Sticky; }
>     bool isScrollingNode() const { return isFrameScrollingNode() || isOverflowScrollingNode(); }
>-    bool isFrameScrollingNode() const { return nodeType() == MainFrameScrollingNode || nodeType() == SubframeScrollingNode; }
>-    bool isOverflowScrollingNode() const { return nodeType() == OverflowScrollingNode; }
>+    bool isFrameScrollingNode() const { return nodeType() == ScrollingNodeType::MainFrame || nodeType() == ScrollingNodeType::Subframe; }
>+    bool isOverflowScrollingNode() const { return nodeType() == ScrollingNodeType::Overflow; }
> 
>     virtual void commitStateBeforeChildren(const ScrollingStateNode&) = 0;
>     virtual void commitStateAfterChildren(const ScrollingStateNode&) { }
>diff --git a/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp b/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp
>index 04f4fff98982a555ded92ca1f391270bf9a3ab1b..dda04898f57e3aae43394a2fbe1bfc4f408705b7 100644
>--- a/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp
>+++ b/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp
>@@ -34,7 +34,7 @@
> namespace WebCore {
> 
> ScrollingTreeOverflowScrollingNode::ScrollingTreeOverflowScrollingNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
>-    : ScrollingTreeScrollingNode(scrollingTree, OverflowScrollingNode, nodeID)
>+    : ScrollingTreeScrollingNode(scrollingTree, ScrollingNodeType::Overflow, nodeID)
> {
> }
> 
>diff --git a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeCoordinatedGraphics.cpp b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeCoordinatedGraphics.cpp
>index 6bfca4dfd512f8c2c083999d6e71b9cdf4a3a5d6..88d69ab74c40d39313cd1bd5469fea0d26bf279b 100644
>--- a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeCoordinatedGraphics.cpp
>+++ b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeCoordinatedGraphics.cpp
>@@ -49,15 +49,15 @@ ScrollingTreeCoordinatedGraphics::ScrollingTreeCoordinatedGraphics(AsyncScrollin
> Ref<ScrollingTreeNode> ScrollingTreeCoordinatedGraphics::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
> {
>     switch (nodeType) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>         return ScrollingTreeFrameScrollingNodeCoordinatedGraphics::create(*this, nodeType, nodeID);
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         // Should not be reached -- caught by ASSERT_NOT_REACHED() below.
>         break;
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         return ScrollingTreeFixedNode::create(*this, nodeID);
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         return ScrollingTreeStickyNode::create(*this, nodeID);
>     }
> 
>diff --git a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp
>index 22cd1ff77190877f74a898f61c0874d316d701e8..21db0afc1744de1f336cb4d042e829f1c059060d 100644
>--- a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp
>+++ b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeFixedNode.cpp
>@@ -40,7 +40,7 @@ Ref<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scroll
> }
> 
> ScrollingTreeFixedNode::ScrollingTreeFixedNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
>-    : ScrollingTreeNode(scrollingTree, FixedNode, nodeID)
>+    : ScrollingTreeNode(scrollingTree, ScrollingNodeType::Fixed, nodeID)
> {
>     scrollingTree.fixedOrStickyNodeAdded();
> }
>diff --git a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp
>index 0322e676a687080c34a123208228110bf4c337c7..d130de36a3b4ba3e141bb5ffc90980b0fe278421 100644
>--- a/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp
>+++ b/Source/WebCore/page/scrolling/coordinatedgraphics/ScrollingTreeStickyNode.cpp
>@@ -40,7 +40,7 @@ Ref<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scro
> }
> 
> ScrollingTreeStickyNode::ScrollingTreeStickyNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
>-    : ScrollingTreeNode(scrollingTree, StickyNode, nodeID)
>+    : ScrollingTreeNode(scrollingTree, ScrollingNodeType::Sticky, nodeID)
> {
>     scrollingTree.fixedOrStickyNodeAdded();
> }
>diff --git a/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp b/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp
>index af56d790cff67d99e43ed968eb8ea24c5ae006a9..90861aed50aa7d2c62fb57095e4e7b7cdf97a621 100644
>--- a/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp
>+++ b/Source/WebCore/page/scrolling/ios/ScrollingTreeIOS.cpp
>@@ -86,15 +86,15 @@ void ScrollingTreeIOS::scrollingTreeNodeDidScroll(ScrollingNodeID nodeID, const
> Ref<ScrollingTreeNode> ScrollingTreeIOS::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
> {
>     switch (nodeType) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>         return ScrollingTreeFrameScrollingNodeIOS::create(*this, nodeType, nodeID);
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         ASSERT_NOT_REACHED();
>         break;
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         return ScrollingTreeFixedNode::create(*this, nodeID);
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         return ScrollingTreeStickyNode::create(*this, nodeID);
>     }
>     ASSERT_NOT_REACHED();
>diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm
>index 22fa199e33489987e56beeea2261608aadfdad7c..2dff1bbe5b4a46dfe122dfc2a6a8964d70389c4f 100644
>--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm
>+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeFixedNode.mm
>@@ -42,7 +42,7 @@ Ref<ScrollingTreeFixedNode> ScrollingTreeFixedNode::create(ScrollingTree& scroll
> }
> 
> ScrollingTreeFixedNode::ScrollingTreeFixedNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
>-    : ScrollingTreeNode(scrollingTree, FixedNode, nodeID)
>+    : ScrollingTreeNode(scrollingTree, ScrollingNodeType::Fixed, nodeID)
> {
>     scrollingTree.fixedOrStickyNodeAdded();
> }
>diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp b/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp
>index 649be4f59e35230daaac3c461c9b2fc7963505e3..78e6ee3cd639d6366d77c5c0701940218431729b 100644
>--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp
>+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeMac.cpp
>@@ -47,15 +47,15 @@ ScrollingTreeMac::ScrollingTreeMac(AsyncScrollingCoordinator& scrollingCoordinat
> Ref<ScrollingTreeNode> ScrollingTreeMac::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
> {
>     switch (nodeType) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>         return ScrollingTreeFrameScrollingNodeMac::create(*this, nodeType, nodeID);
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         ASSERT_NOT_REACHED();
>         break;
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         return ScrollingTreeFixedNode::create(*this, nodeID);
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         return ScrollingTreeStickyNode::create(*this, nodeID);
>     }
>     ASSERT_NOT_REACHED();
>diff --git a/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm b/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm
>index c8a82af89015ad7f01fba43ff39b5c1efabe2a77..fd5447af4fe23327fc99c160c083110bd2450db0 100644
>--- a/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm
>+++ b/Source/WebCore/page/scrolling/mac/ScrollingTreeStickyNode.mm
>@@ -44,7 +44,7 @@ Ref<ScrollingTreeStickyNode> ScrollingTreeStickyNode::create(ScrollingTree& scro
> }
> 
> ScrollingTreeStickyNode::ScrollingTreeStickyNode(ScrollingTree& scrollingTree, ScrollingNodeID nodeID)
>-    : ScrollingTreeNode(scrollingTree, StickyNode, nodeID)
>+    : ScrollingTreeNode(scrollingTree, ScrollingNodeType::Sticky, nodeID)
> {
>     scrollingTree.fixedOrStickyNodeAdded();
> }
>diff --git a/Source/WebCore/platform/graphics/GraphicsLayerClient.h b/Source/WebCore/platform/graphics/GraphicsLayerClient.h
>index dc2700c8e32ec148220e9c2bd8fa48783be2a36f..25068eb43f38db4e7811acf0d0b2d9e09572b53b 100644
>--- a/Source/WebCore/platform/graphics/GraphicsLayerClient.h
>+++ b/Source/WebCore/platform/graphics/GraphicsLayerClient.h
>@@ -55,9 +55,9 @@ enum AnimatedPropertyID {
>     AnimatedPropertyTransform,
>     AnimatedPropertyOpacity,
>     AnimatedPropertyBackgroundColor,
>-    AnimatedPropertyFilter
>+    AnimatedPropertyFilter,
> #if ENABLE(FILTERS_LEVEL_2)
>-    , AnimatedPropertyWebkitBackdropFilter
>+    AnimatedPropertyWebkitBackdropFilter,
> #endif
> };
> 
>diff --git a/Source/WebCore/rendering/RenderLayerCompositor.cpp b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>index 97039a45882f8f2ed2b26a483700b02cf3a89036..3cebd74edb4e53913a54105a941564ef5c9c86e0 100644
>--- a/Source/WebCore/rendering/RenderLayerCompositor.cpp
>+++ b/Source/WebCore/rendering/RenderLayerCompositor.cpp
>@@ -3806,19 +3806,19 @@ void RenderLayerCompositor::reattachSubframeScrollLayers()
>         if (!parentNodeID)
>             continue;
> 
>-        scrollingCoordinator->attachToStateTree(child->isMainFrame() ? MainFrameScrollingNode : SubframeScrollingNode, frameScrollingNodeID, parentNodeID);
>+        scrollingCoordinator->attachToStateTree(child->isMainFrame() ? ScrollingNodeType::MainFrame : ScrollingNodeType::Subframe, frameScrollingNodeID, parentNodeID);
>     }
> }
> 
> static inline LayerScrollCoordinationRole scrollCoordinationRoleForNodeType(ScrollingNodeType nodeType)
> {
>     switch (nodeType) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>+    case ScrollingNodeType::Overflow:
>         return Scrolling;
>-    case FixedNode:
>-    case StickyNode:
>+    case ScrollingNodeType::Fixed:
>+    case ScrollingNodeType::Sticky:
>         return ViewportConstrained;
>     }
>     ASSERT_NOT_REACHED();
>@@ -3874,7 +3874,7 @@ void RenderLayerCompositor::updateScrollCoordinationForThisFrame(ScrollingNodeID
>     FrameView& frameView = m_renderView.frameView();
>     ASSERT(scrollingCoordinator->coordinatesScrollingForFrameView(frameView));
> 
>-    ScrollingNodeID nodeID = attachScrollingNode(*m_renderView.layer(), m_renderView.frame().isMainFrame() ? MainFrameScrollingNode : SubframeScrollingNode, parentNodeID);
>+    ScrollingNodeID nodeID = attachScrollingNode(*m_renderView.layer(), m_renderView.frame().isMainFrame() ? ScrollingNodeType::MainFrame : ScrollingNodeType::Subframe, parentNodeID);
>     ScrollingCoordinator::ScrollingGeometry scrollingGeometry;
>     // FIXME(https://webkit.org/b/172917): Pass parentRelativeScrollableRect?
>     scrollingGeometry.scrollOrigin = frameView.scrollOrigin();
>@@ -3918,11 +3918,11 @@ void RenderLayerCompositor::updateScrollCoordinatedLayer(RenderLayer& layer, Opt
>     // Always call this even if the backing is already attached because the parent may have changed.
>     // If a node plays both roles, fixed/sticky is always the ancestor node of scrolling.
>     if (reasons & ViewportConstrained) {
>-        ScrollingNodeType nodeType = MainFrameScrollingNode;
>+        ScrollingNodeType nodeType = ScrollingNodeType::MainFrame;
>         if (layer.renderer().isFixedPositioned())
>-            nodeType = FixedNode;
>+            nodeType = ScrollingNodeType::Fixed;
>         else if (layer.renderer().style().position() == PositionType::Sticky)
>-            nodeType = StickyNode;
>+            nodeType = ScrollingNodeType::Sticky;
>         else
>             ASSERT_NOT_REACHED();
> 
>@@ -3937,15 +3937,15 @@ void RenderLayerCompositor::updateScrollCoordinatedLayer(RenderLayer& layer, Opt
> 
>         if (changes & ScrollingNodeChangeFlags::LayerGeometry) {
>             switch (nodeType) {
>-            case FixedNode:
>+            case ScrollingNodeType::Fixed:
>                 scrollingCoordinator->updateNodeViewportConstraints(nodeID, computeFixedViewportConstraints(layer));
>                 break;
>-            case StickyNode:
>+            case ScrollingNodeType::Sticky:
>                 scrollingCoordinator->updateNodeViewportConstraints(nodeID, computeStickyViewportConstraints(layer));
>                 break;
>-            case MainFrameScrollingNode:
>-            case SubframeScrollingNode:
>-            case OverflowScrollingNode:
>+            case ScrollingNodeType::MainFrame:
>+            case ScrollingNodeType::Subframe:
>+            case ScrollingNodeType::Overflow:
>                 break;
>             }
>         }
>@@ -3958,7 +3958,7 @@ void RenderLayerCompositor::updateScrollCoordinatedLayer(RenderLayer& layer, Opt
>         if (isRenderViewLayer)
>             updateScrollCoordinationForThisFrame(parentNodeID);
>         else {
>-            ScrollingNodeType nodeType = OverflowScrollingNode;
>+            ScrollingNodeType nodeType = ScrollingNodeType::Overflow;
>             ScrollingNodeID nodeID = attachScrollingNode(layer, nodeType, parentNodeID);
>             if (!nodeID)
>                 return;
>diff --git a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>index cad76bb32555a33bd9f5317c59b315128e392406..29924fb58e89fc2f27e4d2a51c2b5914af6dbd40 100644
>--- a/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>+++ b/Source/WebKit/Shared/RemoteLayerTree/RemoteScrollingCoordinatorTransaction.cpp
>@@ -333,17 +333,17 @@ static void encodeNodeAndDescendants(IPC::Encoder& encoder, const ScrollingState
>     ++encodedNodeCount;
> 
>     switch (stateNode.nodeType()) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>         encoder << downcast<ScrollingStateFrameScrollingNode>(stateNode);
>         break;
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         encoder << downcast<ScrollingStateOverflowScrollingNode>(stateNode);
>         break;
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         encoder << downcast<ScrollingStateFixedNode>(stateNode);
>         break;
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         encoder << downcast<ScrollingStateStickyNode>(stateNode);
>         break;
>     }
>@@ -418,20 +418,20 @@ bool RemoteScrollingCoordinatorTransaction::decode(IPC::Decoder& decoder)
>         ASSERT(!parentNodeID || newNode->parent());
>         
>         switch (nodeType) {
>-        case MainFrameScrollingNode:
>-        case SubframeScrollingNode:
>+        case ScrollingNodeType::MainFrame:
>+        case ScrollingNodeType::Subframe:
>             if (!decoder.decode(downcast<ScrollingStateFrameScrollingNode>(*newNode)))
>                 return false;
>             break;
>-        case OverflowScrollingNode:
>+        case ScrollingNodeType::Overflow:
>             if (!decoder.decode(downcast<ScrollingStateOverflowScrollingNode>(*newNode)))
>                 return false;
>             break;
>-        case FixedNode:
>+        case ScrollingNodeType::Fixed:
>             if (!decoder.decode(downcast<ScrollingStateFixedNode>(*newNode)))
>                 return false;
>             break;
>-        case StickyNode:
>+        case ScrollingNodeType::Sticky:
>             if (!decoder.decode(downcast<ScrollingStateStickyNode>(*newNode)))
>                 return false;
>             break;
>@@ -562,17 +562,17 @@ static void dump(TextStream& ts, const ScrollingStateNode& node, bool changedPro
>         ts.dumpProperty("layer", static_cast<GraphicsLayer::PlatformLayerID>(node.layer()));
>     
>     switch (node.nodeType()) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
>         dump(ts, downcast<ScrollingStateFrameScrollingNode>(node), changedPropertiesOnly);
>         break;
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
>         dump(ts, downcast<ScrollingStateOverflowScrollingNode>(node), changedPropertiesOnly);
>         break;
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         dump(ts, downcast<ScrollingStateFixedNode>(node), changedPropertiesOnly);
>         break;
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         dump(ts, downcast<ScrollingStateStickyNode>(node), changedPropertiesOnly);
>         break;
>     }
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>index 4117771a123852414fba5492c558ba65051757b6..ab64595647b128beea651d8dc9b3b3ce10f5726a 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingCoordinatorProxy.cpp
>@@ -103,8 +103,8 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree&
>             currNode->setLayer(layerTreeHost.layerForID(currNode->layer()));
> 
>         switch (currNode->nodeType()) {
>-        case MainFrameScrollingNode:
>-        case SubframeScrollingNode: {
>+        case ScrollingNodeType::MainFrame:
>+        case ScrollingNodeType::Subframe: {
>             ScrollingStateFrameScrollingNode& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(*currNode);
>             
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer))
>@@ -127,15 +127,15 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree&
>                 scrollingStateNode.setFooterLayer(layerTreeHost.layerForID(scrollingStateNode.footerLayer()));
>             break;
>         }
>-        case OverflowScrollingNode: {
>+        case ScrollingNodeType::Overflow: {
>             ScrollingStateOverflowScrollingNode& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(*currNode);
> 
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateScrollingNode::ScrolledContentsLayer))
>                 scrollingStateNode.setScrolledContentsLayer(layerTreeHost.layerForID(scrollingStateNode.scrolledContentsLayer()));
>             break;
>         }
>-        case FixedNode:
>-        case StickyNode:
>+        case ScrollingNodeType::Fixed:
>+        case ScrollingNodeType::Sticky:
>             break;
>         }
>     }
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
>index 0ca7e4c659fb03b162c6e16d7b5a35730acb0906..4358f79d051e80a3e56a239fbd3ca95700113008 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteScrollingTree.cpp
>@@ -112,23 +112,23 @@ void RemoteScrollingTree::scrollingTreeNodeRequestsScroll(ScrollingNodeID nodeID
> Ref<ScrollingTreeNode> RemoteScrollingTree::createScrollingTreeNode(ScrollingNodeType nodeType, ScrollingNodeID nodeID)
> {
>     switch (nodeType) {
>-    case MainFrameScrollingNode:
>-    case SubframeScrollingNode:
>+    case ScrollingNodeType::MainFrame:
>+    case ScrollingNodeType::Subframe:
> #if PLATFORM(IOS_FAMILY)
>         return ScrollingTreeFrameScrollingNodeIOS::create(*this, nodeType, nodeID);
> #else
>         return ScrollingTreeFrameScrollingNodeMac::create(*this, nodeType, nodeID);
> #endif
>-    case OverflowScrollingNode:
>+    case ScrollingNodeType::Overflow:
> #if PLATFORM(IOS_FAMILY)
>         return ScrollingTreeOverflowScrollingNodeIOS::create(*this, nodeID);
> #else
>         ASSERT_NOT_REACHED();
>         break;
> #endif
>-    case FixedNode:
>+    case ScrollingNodeType::Fixed:
>         return ScrollingTreeFixedNode::create(*this, nodeID);
>-    case StickyNode:
>+    case ScrollingNodeType::Sticky:
>         return ScrollingTreeStickyNode::create(*this, nodeID);
>     }
>     ASSERT_NOT_REACHED();
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>index e38435b3d1d397a076766526298afecd3963737a..cd8ea33388119622bdc4ffc6466c319da1e1fb59 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/RemoteScrollingCoordinatorProxyIOS.mm
>@@ -51,7 +51,7 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree&
> {
>     for (auto& currNode : stateTree.nodeMap().values()) {
>         switch (currNode->nodeType()) {
>-        case OverflowScrollingNode: {
>+        case ScrollingNodeType::Overflow: {
>             ScrollingStateOverflowScrollingNode& scrollingStateNode = downcast<ScrollingStateOverflowScrollingNode>(*currNode);
>             
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
>@@ -61,8 +61,8 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree&
>                 scrollingStateNode.setScrolledContentsLayer(layerTreeHost.layerForID(scrollingStateNode.scrolledContentsLayer()));
>             break;
>         };
>-        case MainFrameScrollingNode:
>-        case SubframeScrollingNode: {
>+        case ScrollingNodeType::MainFrame:
>+        case ScrollingNodeType::Subframe: {
>             ScrollingStateFrameScrollingNode& scrollingStateNode = downcast<ScrollingStateFrameScrollingNode>(*currNode);
>             
>             if (scrollingStateNode.hasChangedProperty(ScrollingStateNode::ScrollLayer))
>@@ -79,8 +79,8 @@ void RemoteScrollingCoordinatorProxy::connectStateNodeLayers(ScrollingStateTree&
>                 scrollingStateNode.setFooterLayer(layerTreeHost.layerForID(scrollingStateNode.footerLayer()));
>             break;
>         }
>-        case FixedNode:
>-        case StickyNode:
>+        case ScrollingNodeType::Fixed:
>+        case ScrollingNodeType::Sticky:
>             if (currNode->hasChangedProperty(ScrollingStateNode::ScrollLayer))
>                 currNode->setLayer(layerTreeHost.layerForID(currNode->layer()));
>             break;
>diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm b/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>index 3d4060f80261cd332cec0fc2eaab6e08111fc4a8..4cc7e1a87b85ac70637e15f44cc1e4f8f9219c4c 100644
>--- a/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>+++ b/Source/WebKit/UIProcess/RemoteLayerTree/ios/ScrollingTreeScrollingNodeDelegateIOS.mm
>@@ -246,7 +246,7 @@ void ScrollingTreeScrollingNodeDelegateIOS::updateChildNodesAfterScroll(const Fl
> 
>     FloatRect fixedPositionRect;
>     auto* frameNode = scrollingNode().enclosingFrameNodeIncludingSelf();
>-    if (frameNode && frameNode->nodeType() == SubframeScrollingNode)
>+    if (frameNode && frameNode->nodeType() == ScrollingNodeType::Subframe)
>         fixedPositionRect = frameNode->fixedPositionRect();
>     else
>         fixedPositionRect = scrollingTree().fixedPositionRect();

Flags:

ews-watchlist: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 193009: 358023 | 358042 | 358043 | 358044