Diff
Modified: trunk/Source/WebCore/ChangeLog (284533 => 284534)
--- trunk/Source/WebCore/ChangeLog 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/ChangeLog 2021-10-20 15:20:20 UTC (rev 284534)
@@ -1,3 +1,106 @@
+2021-10-20 Simon Fraser <simon.fra...@apple.com>
+
+ Make ScrollingStateTreeAsTextBehavior an enum class for use with OptionSet<>
+ https://bugs.webkit.org/show_bug.cgi?id=232002
+
+ Reviewed by Alan Bujtas.
+
+ Make ScrollingStateTreeAsTextBehavior an enum class, and replace ScrollingStateTreeAsTextBehavior
+ with OptionSet<ScrollingStateTreeAsTextBehavior>.
+
+ * page/scrolling/AsyncScrollingCoordinator.cpp:
+ (WebCore::AsyncScrollingCoordinator::scrollingStateTreeAsText const):
+ (WebCore::AsyncScrollingCoordinator::scrollingTreeAsText const):
+ * page/scrolling/AsyncScrollingCoordinator.h:
+ (WebCore::AsyncScrollingCoordinator::scrollingStateTreeAsText):
+ (WebCore::AsyncScrollingCoordinator::scrollingTreeAsText):
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::scrollingStateTreeAsText const):
+ (WebCore::ScrollingCoordinator::scrollingTreeAsText const):
+ * page/scrolling/ScrollingCoordinator.h:
+ (WebCore::ScrollingCoordinator::scrollingStateTreeAsText):
+ (WebCore::ScrollingCoordinator::scrollingTreeAsText):
+ * page/scrolling/ScrollingCoordinatorTypes.h:
+ * page/scrolling/ScrollingStateFixedNode.cpp:
+ (WebCore::ScrollingStateFixedNode::dumpProperties const):
+ * page/scrolling/ScrollingStateFixedNode.h:
+ * page/scrolling/ScrollingStateFrameHostingNode.cpp:
+ (WebCore::ScrollingStateFrameHostingNode::dumpProperties const):
+ * page/scrolling/ScrollingStateFrameHostingNode.h:
+ * page/scrolling/ScrollingStateFrameScrollingNode.cpp:
+ (WebCore::ScrollingStateFrameScrollingNode::dumpProperties const):
+ * page/scrolling/ScrollingStateFrameScrollingNode.h:
+ * page/scrolling/ScrollingStateNode.cpp:
+ (WebCore::ScrollingStateNode::dumpProperties const):
+ (WebCore::ScrollingStateNode::dump const):
+ (WebCore::ScrollingStateNode::scrollingStateTreeAsText const):
+ * page/scrolling/ScrollingStateNode.h:
+ (WebCore::ScrollingStateNode::scrollingStateTreeAsText):
+ * page/scrolling/ScrollingStateOverflowScrollProxyNode.cpp:
+ (WebCore::ScrollingStateOverflowScrollProxyNode::dumpProperties const):
+ * page/scrolling/ScrollingStateOverflowScrollProxyNode.h:
+ * page/scrolling/ScrollingStateOverflowScrollingNode.cpp:
+ (WebCore::ScrollingStateOverflowScrollingNode::dumpProperties const):
+ * page/scrolling/ScrollingStateOverflowScrollingNode.h:
+ * page/scrolling/ScrollingStatePositionedNode.cpp:
+ (WebCore::ScrollingStatePositionedNode::dumpProperties const):
+ * page/scrolling/ScrollingStatePositionedNode.h:
+ * page/scrolling/ScrollingStateScrollingNode.cpp:
+ (WebCore::ScrollingStateScrollingNode::dumpProperties const):
+ * page/scrolling/ScrollingStateScrollingNode.h:
+ * page/scrolling/ScrollingStateStickyNode.cpp:
+ (WebCore::ScrollingStateStickyNode::dumpProperties const):
+ * page/scrolling/ScrollingStateStickyNode.h:
+ * page/scrolling/ScrollingStateTree.cpp:
+ (showScrollingStateTree):
+ * page/scrolling/ScrollingTree.cpp:
+ (WebCore::ScrollingTree::commitTreeState):
+ (WebCore::ScrollingTree::scrollingTreeAsText):
+ * page/scrolling/ScrollingTree.h:
+ (WebCore::ScrollingTree::scrollingTreeAsText):
+ * page/scrolling/ScrollingTreeFrameHostingNode.cpp:
+ (WebCore::ScrollingTreeFrameHostingNode::dumpProperties const):
+ * page/scrolling/ScrollingTreeFrameHostingNode.h:
+ * page/scrolling/ScrollingTreeFrameScrollingNode.cpp:
+ (WebCore::ScrollingTreeFrameScrollingNode::dumpProperties const):
+ * page/scrolling/ScrollingTreeFrameScrollingNode.h:
+ * page/scrolling/ScrollingTreeNode.cpp:
+ (WebCore::ScrollingTreeNode::dumpProperties const):
+ (WebCore::ScrollingTreeNode::dump const):
+ * page/scrolling/ScrollingTreeNode.h:
+ * page/scrolling/ScrollingTreeOverflowScrollingNode.cpp:
+ (WebCore::ScrollingTreeOverflowScrollingNode::dumpProperties const):
+ * page/scrolling/ScrollingTreeOverflowScrollingNode.h:
+ * page/scrolling/ScrollingTreeScrollingNode.cpp:
+ (WebCore::ScrollingTreeScrollingNode::dumpProperties const):
+ * page/scrolling/ScrollingTreeScrollingNode.h:
+ * page/scrolling/cocoa/ScrollingTreeFixedNode.h:
+ * page/scrolling/cocoa/ScrollingTreeFixedNode.mm:
+ (WebCore::ScrollingTreeFixedNode::dumpProperties const):
+ * page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.h:
+ * page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.mm:
+ (WebCore::ScrollingTreeOverflowScrollProxyNode::dumpProperties const):
+ * page/scrolling/cocoa/ScrollingTreePositionedNode.h:
+ * page/scrolling/cocoa/ScrollingTreePositionedNode.mm:
+ (WebCore::ScrollingTreePositionedNode::dumpProperties const):
+ * page/scrolling/cocoa/ScrollingTreeStickyNode.h:
+ * page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
+ (WebCore::ScrollingTreeStickyNode::dumpProperties const):
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinatorMac::commitTreeStateIfNeeded):
+ * page/scrolling/nicosia/ScrollingTreeFixedNode.cpp:
+ (WebCore::ScrollingTreeFixedNode::dumpProperties const):
+ * page/scrolling/nicosia/ScrollingTreeFixedNode.h:
+ * page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.cpp:
+ (WebCore::ScrollingTreeOverflowScrollProxyNode::dumpProperties const):
+ * page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.h:
+ * page/scrolling/nicosia/ScrollingTreePositionedNode.cpp:
+ (WebCore::ScrollingTreePositionedNode::dumpProperties const):
+ * page/scrolling/nicosia/ScrollingTreePositionedNode.h:
+ * page/scrolling/nicosia/ScrollingTreeStickyNode.cpp:
+ (WebCore::ScrollingTreeStickyNode::dumpProperties const):
+ * page/scrolling/nicosia/ScrollingTreeStickyNode.h:
+
2021-10-20 Alan Bujtas <za...@apple.com>
[LFC][IFC] Sometimes "arbitrary mid work break" does not mean "any position"
Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -927,7 +927,7 @@
return 0;
}
-String AsyncScrollingCoordinator::scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior behavior) const
+String AsyncScrollingCoordinator::scrollingStateTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
if (m_scrollingStateTree->rootStateNode()) {
if (m_eventTrackingRegionsDirty)
@@ -938,7 +938,7 @@
return emptyString();
}
-String AsyncScrollingCoordinator::scrollingTreeAsText(ScrollingStateTreeAsTextBehavior behavior) const
+String AsyncScrollingCoordinator::scrollingTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
if (!m_scrollingTree)
return emptyString();
Modified: trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/AsyncScrollingCoordinator.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -82,8 +82,8 @@
RefPtr<ScrollingTree> releaseScrollingTree() { return WTFMove(m_scrollingTree); }
- WEBCORE_EXPORT String scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal) const override;
- WEBCORE_EXPORT String scrollingTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal) const override;
+ WEBCORE_EXPORT String scrollingStateTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> = { }) const override;
+ WEBCORE_EXPORT String scrollingTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> = { }) const override;
WEBCORE_EXPORT void willCommitTree() override;
void synchronizeStateFromScrollingTree();
void scheduleRenderingUpdate();
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -356,12 +356,12 @@
return uniqueScrollingNodeID++;
}
-String ScrollingCoordinator::scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior) const
+String ScrollingCoordinator::scrollingStateTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior>) const
{
return emptyString();
}
-String ScrollingCoordinator::scrollingTreeAsText(ScrollingStateTreeAsTextBehavior) const
+String ScrollingCoordinator::scrollingTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior>) const
{
return emptyString();
}
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -160,8 +160,8 @@
bool hasSynchronousScrollingReasons(ScrollingNodeID nodeID) const { return !!synchronousScrollingReasons(nodeID); }
virtual void reconcileViewportConstrainedLayerPositions(ScrollingNodeID, const LayoutRect&, ScrollingLayerPositionAction) { }
- virtual String scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal) const;
- virtual String scrollingTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal) const;
+ virtual String scrollingStateTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> = { }) const;
+ virtual String scrollingTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> = { }) const;
virtual bool isRubberBandInProgress(ScrollingNodeID) const { return false; }
virtual bool isUserScrollInProgress(ScrollingNodeID) const { return false; }
virtual bool isScrollSnapInProgress(ScrollingNodeID) const { return false; }
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorTypes.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorTypes.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorTypes.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -31,7 +31,7 @@
namespace WebCore {
-enum class SynchronousScrollingReason {
+enum class SynchronousScrollingReason : uint8_t {
// Flags for frame scrolling.
ForcedOnMainThread = 1 << 0,
HasViewportConstrainedObjectsWithoutSupportingFixedLayers = 1 << 1,
@@ -53,15 +53,16 @@
Positioned
};
-enum ScrollingStateTreeAsTextBehaviorFlags {
- ScrollingStateTreeAsTextBehaviorNormal = 0,
- ScrollingStateTreeAsTextBehaviorIncludeLayerIDs = 1 << 0,
- ScrollingStateTreeAsTextBehaviorIncludeNodeIDs = 1 << 1,
- ScrollingStateTreeAsTextBehaviorIncludeLayerPositions = 1 << 2,
- ScrollingStateTreeAsTextBehaviorDebug = ScrollingStateTreeAsTextBehaviorIncludeLayerIDs | ScrollingStateTreeAsTextBehaviorIncludeNodeIDs | ScrollingStateTreeAsTextBehaviorIncludeLayerPositions
+enum class ScrollingStateTreeAsTextBehavior : uint8_t {
+ IncludeLayerIDs = 1 << 0,
+ IncludeNodeIDs = 1 << 1,
+ IncludeLayerPositions = 1 << 2,
};
-typedef unsigned ScrollingStateTreeAsTextBehavior;
+constexpr auto debugScrollingStateTreeAsTextBehaviors = OptionSet<ScrollingStateTreeAsTextBehavior> {
+ ScrollingStateTreeAsTextBehavior::IncludeLayerIDs, ScrollingStateTreeAsTextBehavior::IncludeNodeIDs, ScrollingStateTreeAsTextBehavior::IncludeLayerPositions
+};
+
enum class ScrollingLayerPositionAction {
Set,
SetApproximate,
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -102,7 +102,7 @@
}
}
-void ScrollingStateFixedNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateFixedNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Fixed node";
ScrollingStateNode::dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFixedNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -53,7 +53,7 @@
void reconcileLayerPositionForViewportRect(const LayoutRect& viewportRect, ScrollingLayerPositionAction) final;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const final;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const final;
OptionSet<ScrollingStateNode::Property> applicableProperties() const final;
FixedPositionViewportConstraints m_constraints;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -56,7 +56,7 @@
return adoptRef(*new ScrollingStateFrameHostingNode(*this, adoptiveTree));
}
-void ScrollingStateFrameHostingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateFrameHostingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Frame hosting node";
ScrollingStateNode::dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameHostingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -40,7 +40,7 @@
virtual ~ScrollingStateFrameHostingNode();
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
private:
ScrollingStateFrameHostingNode(ScrollingStateTree&, ScrollingNodeID);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -309,13 +309,13 @@
setPropertyChanged(Property::ScrollingPerformanceTestingEnabled);
}
-void ScrollingStateFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateFrameScrollingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Frame scrolling node";
ScrollingStateScrollingNode::dumpProperties(ts, behavior);
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerIDs) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerIDs) {
ts.dumpProperty("root contents layer ID", m_rootContentsLayer.layerID());
if (m_counterScrollingLayer.layerID())
ts.dumpProperty("counter scrolling layer ID", m_counterScrollingLayer.layerID());
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateFrameScrollingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -117,7 +117,7 @@
bool wheelEventGesturesBecomeNonBlocking() const { return m_wheelEventGesturesBecomeNonBlocking; }
WEBCORE_EXPORT void setWheelEventGesturesBecomeNonBlocking(bool);
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
private:
ScrollingStateFrameScrollingNode(ScrollingStateTree&, ScrollingNodeType, ScrollingNodeID);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -172,16 +172,16 @@
setPropertyChanged(Property::Layer);
}
-void ScrollingStateNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs)
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs)
ts.dumpProperty("nodeID", scrollingNodeID());
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerIDs)
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerIDs)
ts.dumpProperty("layerID", layer().layerID());
}
-void ScrollingStateNode::dump(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateNode::dump(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "\n";
ts << indent << "(";
@@ -205,7 +205,7 @@
ts << indent << ")";
}
-String ScrollingStateNode::scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior behavior) const
+String ScrollingStateNode::scrollingStateTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
TextStream ts(TextStream::LineMode::MultipleLine, TextStream::Formatting::SVGStyleRect);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -306,7 +306,7 @@
size_t indexOfChild(ScrollingStateNode&) const;
- String scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal) const;
+ String scrollingStateTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> = { }) const;
protected:
ScrollingStateNode(const ScrollingStateNode&, ScrollingStateTree&);
@@ -315,11 +315,11 @@
void setPropertyChangedInternal(Property property) { m_changedProperties.add(property); }
void setPropertiesChangedInternal(OptionSet<Property> properties) { m_changedProperties.add(properties); }
- virtual void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
+ virtual void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const;
virtual OptionSet<Property> applicableProperties() const;
private:
- void dump(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
+ void dump(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const;
const ScrollingNodeType m_nodeType;
const ScrollingNodeID m_nodeID;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollProxyNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollProxyNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollProxyNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -76,7 +76,7 @@
setPropertyChanged(Property::OverflowScrollingNode);
}
-void ScrollingStateOverflowScrollProxyNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateOverflowScrollProxyNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Overflow scroll proxy node";
@@ -87,7 +87,7 @@
ts.dumpProperty("related overflow scrolling node scroll position", scrollPosition);
}
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs)
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs)
ts.dumpProperty("overflow scrolling node", overflowScrollingNode());
}
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollProxyNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollProxyNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollProxyNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -47,7 +47,7 @@
ScrollingStateOverflowScrollProxyNode(ScrollingStateTree&, ScrollingNodeID);
ScrollingStateOverflowScrollProxyNode(const ScrollingStateOverflowScrollProxyNode&, ScrollingStateTree&);
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const final;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const final;
OptionSet<ScrollingStateNode::Property> applicableProperties() const final;
ScrollingNodeID m_overflowScrollingNodeID { 0 };
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -55,7 +55,7 @@
return adoptRef(*new ScrollingStateOverflowScrollingNode(*this, adoptiveTree));
}
-void ScrollingStateOverflowScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateOverflowScrollingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Overflow scrolling node";
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateOverflowScrollingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -39,7 +39,7 @@
virtual ~ScrollingStateOverflowScrollingNode();
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
private:
ScrollingStateOverflowScrollingNode(ScrollingStateTree&, ScrollingNodeID);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -88,7 +88,7 @@
setPropertyChanged(Property::LayoutConstraintData);
}
-void ScrollingStatePositionedNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStatePositionedNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Positioned node";
ScrollingStateNode::dumpProperties(ts, behavior);
@@ -96,7 +96,7 @@
ts.dumpProperty("layout constraints", m_constraints);
ts.dumpProperty("related overflow nodes", m_relatedOverflowScrollingNodes.size());
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs) {
if (!m_relatedOverflowScrollingNodes.isEmpty()) {
TextStream::GroupScope scope(ts);
ts << "overflow nodes";
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStatePositionedNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -56,7 +56,7 @@
ScrollingStatePositionedNode(ScrollingStateTree&, ScrollingNodeID);
ScrollingStatePositionedNode(const ScrollingStatePositionedNode&, ScrollingStateTree&);
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const final;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const final;
OptionSet<ScrollingStateNode::Property> applicableProperties() const final;
Vector<ScrollingNodeID> m_relatedOverflowScrollingNodes;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -257,7 +257,7 @@
}
#endif
-void ScrollingStateScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateScrollingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ScrollingStateNode::dumpProperties(ts, behavior);
@@ -325,7 +325,7 @@
if (m_isMonitoringWheelEvents)
ts.dumpProperty("expects wheel event test trigger", m_isMonitoringWheelEvents);
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerIDs) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerIDs) {
if (m_scrollContainerLayer.layerID())
ts.dumpProperty("scroll container layer", m_scrollContainerLayer.layerID());
if (m_scrolledContentsLayer.layerID())
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateScrollingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -105,7 +105,7 @@
ScrollingStateScrollingNode(const ScrollingStateScrollingNode&, ScrollingStateTree&);
OptionSet<Property> applicableProperties() const override;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
private:
FloatSize m_scrollableAreaSize;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -154,7 +154,7 @@
return layerPosition - m_constraints.layerPositionAtLastLayout();
}
-void ScrollingStateStickyNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingStateStickyNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "Sticky node";
ScrollingStateNode::dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateStickyNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -55,7 +55,7 @@
void reconcileLayerPositionForViewportRect(const LayoutRect& viewportRect, ScrollingLayerPositionAction) final;
FloatSize scrollDeltaSinceLastCommit(const LayoutRect& viewportRect) const;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const final;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const final;
OptionSet<ScrollingStateNode::Property> applicableProperties() const final;
StickyPositionViewportConstraints m_constraints;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingStateTree.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -407,7 +407,7 @@
return;
}
- String output = rootNode->scrollingStateTreeAsText(WebCore::ScrollingStateTreeAsTextBehaviorDebug);
+ String output = rootNode->scrollingStateTreeAsText(WebCore::debugScrollingStateTreeAsTextBehaviors);
WTFLogAlways("%s\n", output.utf8().data());
}
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -323,7 +323,7 @@
didCommitTree();
- LOG_WITH_STREAM(ScrollingTree, stream << "committed ScrollingTree" << scrollingTreeAsText(ScrollingStateTreeAsTextBehaviorDebug));
+ LOG_WITH_STREAM(ScrollingTree, stream << "committed ScrollingTree" << scrollingTreeAsText(debugScrollingStateTreeAsTextBehaviors));
}
void ScrollingTree::updateTreeFromStateNodeRecursive(const ScrollingStateNode* stateNode, CommitTreeState& state)
@@ -734,7 +734,7 @@
return m_treeState.nominalFramesPerSecond;
}
-String ScrollingTree::scrollingTreeAsText(ScrollingStateTreeAsTextBehavior behavior)
+String ScrollingTree::scrollingTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> behavior)
{
TextStream ts(TextStream::LineMode::MultipleLine);
@@ -752,10 +752,10 @@
if (m_rootNode) {
TextStream::GroupScope scope(ts);
- m_rootNode->dump(ts, behavior | ScrollingStateTreeAsTextBehaviorIncludeLayerPositions);
+ m_rootNode->dump(ts, behavior | ScrollingStateTreeAsTextBehavior::IncludeLayerPositions);
}
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs) {
if (!m_overflowRelatedNodesMap.isEmpty()) {
TextStream::GroupScope scope(ts);
ts << "overflow related nodes";
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTree.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTree.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -207,7 +207,7 @@
HashSet<Ref<ScrollingTreeOverflowScrollProxyNode>>& activeOverflowScrollProxyNodes() { return m_activeOverflowScrollProxyNodes; }
HashSet<Ref<ScrollingTreePositionedNode>>& activePositionedNodes() { return m_activePositionedNodes; }
- WEBCORE_EXPORT String scrollingTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal);
+ WEBCORE_EXPORT String scrollingTreeAsText(OptionSet<ScrollingStateTreeAsTextBehavior> = { });
bool isMonitoringWheelEvents() const { return m_isMonitoringWheelEvents; }
bool inCommitTreeState() const { return m_inCommitTreeState; }
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -57,7 +57,7 @@
{
}
-void ScrollingTreeFrameHostingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeFrameHostingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "frame hosting node";
ScrollingTreeNode::dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameHostingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -44,7 +44,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) final;
void applyLayerPositions() final;
- WEBCORE_EXPORT void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ WEBCORE_EXPORT void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -132,7 +132,7 @@
return toFloatSize(scrollPosition) - FloatSize(0, headerHeight() + topContentInset());
}
-void ScrollingTreeFrameScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeFrameScrollingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "frame scrolling node";
ScrollingTreeScrollingNode::dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeFrameScrollingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -69,7 +69,7 @@
bool scrollPositionAndLayoutViewportMatch(const FloatPoint& position, std::optional<FloatRect> overrideLayoutViewport) override;
FloatRect layoutViewportForScrollPosition(const FloatPoint&, float scale, ScrollBehaviorForFixedElements = StickToDocumentBounds) const;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
FloatRect m_layoutViewport;
FloatPoint m_minLayoutViewportOrigin;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -84,9 +84,9 @@
return m_scrollingTree.rootNode() == this;
}
-void ScrollingTreeNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs)
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs)
ts.dumpProperty("nodeID", scrollingNodeID());
}
@@ -108,7 +108,7 @@
return downcast<ScrollingTreeScrollingNode>(node);
}
-void ScrollingTreeNode::dump(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeNode::dump(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -79,7 +79,7 @@
WEBCORE_EXPORT ScrollingTreeFrameScrollingNode* enclosingFrameNodeIncludingSelf();
WEBCORE_EXPORT ScrollingTreeScrollingNode* enclosingScrollingNodeIncludingSelf();
- WEBCORE_EXPORT void dump(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
+ WEBCORE_EXPORT void dump(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const;
protected:
ScrollingTreeNode(ScrollingTree&, ScrollingNodeType, ScrollingNodeID);
@@ -87,7 +87,7 @@
virtual void applyLayerPositions() = 0;
- WEBCORE_EXPORT virtual void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const;
+ WEBCORE_EXPORT virtual void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const;
Vector<Ref<ScrollingTreeNode>> m_children;
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -41,7 +41,7 @@
ScrollingTreeOverflowScrollingNode::~ScrollingTreeOverflowScrollingNode() = default;
-void ScrollingTreeOverflowScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeOverflowScrollingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "overflow scrolling node";
ScrollingTreeScrollingNode::dumpProperties(ts, behavior);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeOverflowScrollingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -38,7 +38,7 @@
protected:
WEBCORE_EXPORT ScrollingTreeOverflowScrollingNode(ScrollingTree&, ScrollingNodeID);
- WEBCORE_EXPORT void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const;
+ WEBCORE_EXPORT void dumpProperties(TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -325,7 +325,7 @@
scrollingTree().setNeedsApplyLayerPositionsAfterCommit();
}
-void ScrollingTreeScrollingNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeScrollingNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ScrollingTreeNode::dumpProperties(ts, behavior);
ts.dumpProperty("scrollable area size", m_scrollableAreaSize);
Modified: trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/ScrollingTreeScrollingNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -156,7 +156,7 @@
bool allowsHorizontalScrolling() const { return m_scrollableAreaParameters.allowsHorizontalScrolling; }
bool allowsVerticalScrolling() const { return m_scrollableAreaParameters.allowsVerticalScrolling; }
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
private:
FloatSize m_scrollableAreaSize;
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -49,7 +49,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) override;
void applyLayerPositions() override;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
FixedPositionViewportConstraints m_constraints;
RetainPtr<CALayer> m_layer;
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeFixedNode.mm 2021-10-20 15:20:20 UTC (rev 284534)
@@ -129,13 +129,13 @@
[m_layer _web_setLayerTopLeftPosition:layerPosition - m_constraints.alignmentOffset()];
}
-void ScrollingTreeFixedNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeFixedNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "fixed node";
ScrollingTreeNode::dumpProperties(ts, behavior);
ts.dumpProperty("fixed constraints", m_constraints);
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerPositions) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerPositions) {
FloatRect layerBounds = [m_layer bounds];
FloatPoint anchorPoint = [m_layer anchorPoint];
FloatPoint position = [m_layer position];
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -48,7 +48,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) override;
void applyLayerPositions() override;
- WEBCORE_EXPORT void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ WEBCORE_EXPORT void dumpProperties(TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
ScrollingNodeID m_overflowScrollingNodeID { 0 };
RetainPtr<CALayer> m_layer;
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.mm (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.mm 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeOverflowScrollProxyNode.mm 2021-10-20 15:20:20 UTC (rev 284534)
@@ -91,7 +91,7 @@
[m_layer _web_setLayerBoundsOrigin:scrollOffset];
}
-void ScrollingTreeOverflowScrollProxyNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeOverflowScrollProxyNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "overflow scroll proxy node";
ScrollingTreeNode::dumpProperties(ts, behavior);
@@ -101,7 +101,7 @@
ts.dumpProperty("related overflow scrolling node scroll position", scrollPosition);
}
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs)
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs)
ts.dumpProperty("overflow scrolling node", m_overflowScrollingNodeID);
}
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreePositionedNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreePositionedNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreePositionedNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -54,7 +54,7 @@
void applyLayerPositions() override;
- WEBCORE_EXPORT void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ WEBCORE_EXPORT void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
Vector<ScrollingNodeID> m_relatedOverflowScrollingNodes;
AbsolutePositionConstraints m_constraints;
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreePositionedNode.mm (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreePositionedNode.mm 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreePositionedNode.mm 2021-10-20 15:20:20 UTC (rev 284534)
@@ -93,7 +93,7 @@
[m_layer _web_setLayerTopLeftPosition:layerPosition - m_constraints.alignmentOffset()];
}
-void ScrollingTreePositionedNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreePositionedNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "positioned node";
ScrollingTreeNode::dumpProperties(ts, behavior);
@@ -101,7 +101,7 @@
ts.dumpProperty("layout constraints", m_constraints);
ts.dumpProperty("related overflow nodes", m_relatedOverflowScrollingNodes.size());
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs) {
if (!m_relatedOverflowScrollingNodes.isEmpty()) {
TextStream::GroupScope scope(ts);
ts << "overflow nodes";
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -53,7 +53,7 @@
FloatPoint computeLayerPosition() const;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
StickyPositionViewportConstraints m_constraints;
RetainPtr<CALayer> m_layer;
Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm 2021-10-20 15:20:20 UTC (rev 284534)
@@ -124,7 +124,7 @@
return layerPosition - m_constraints.layerPositionAtLastLayout();
}
-void ScrollingTreeStickyNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeStickyNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "sticky node";
@@ -131,7 +131,7 @@
ScrollingTreeNode::dumpProperties(ts, behavior);
ts.dumpProperty("sticky constraints", m_constraints);
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerPositions) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerPositions) {
FloatRect layerBounds = [m_layer bounds];
FloatPoint anchorPoint = [m_layer anchorPoint];
FloatPoint position = [m_layer position];
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2021-10-20 15:20:20 UTC (rev 284534)
@@ -114,7 +114,7 @@
if (!scrollingStateTree()->hasChangedProperties())
return;
- LOG_WITH_STREAM(ScrollingTree, stream << scrollingStateTreeAsText(ScrollingStateTreeAsTextBehaviorDebug));
+ LOG_WITH_STREAM(ScrollingTree, stream << scrollingStateTreeAsText(debugScrollingStateTreeAsTextBehaviors));
auto stateTree = scrollingStateTree()->commit(LayerRepresentation::PlatformLayerRepresentation);
scrollingTree()->commitTreeState(WTFMove(stateTree));
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -108,13 +108,13 @@
});
}
-void ScrollingTreeFixedNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeFixedNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "fixed node";
ScrollingTreeNode::dumpProperties(ts, behavior);
ts.dumpProperty("fixed constraints", m_constraints);
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerPositions) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerPositions) {
FloatPoint layerTopLeft;
ASSERT(m_layer);
m_layer->accessCommitted(
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeFixedNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -51,7 +51,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) override;
void applyLayerPositions() override;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
FixedPositionViewportConstraints m_constraints;
RefPtr<Nicosia::CompositionLayer> m_layer;
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -92,7 +92,7 @@
});
}
-void ScrollingTreeOverflowScrollProxyNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeOverflowScrollProxyNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "overflow scroll proxy node";
ScrollingTreeNode::dumpProperties(ts, behavior);
@@ -102,7 +102,7 @@
ts.dumpProperty("related overflow scrolling node scroll position", scrollPosition);
}
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs)
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs)
ts.dumpProperty("overflow scrolling node", m_overflowScrollingNodeID);
}
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeOverflowScrollProxyNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -51,7 +51,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) override;
void applyLayerPositions() override;
- WEBCORE_EXPORT void dumpProperties(TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ WEBCORE_EXPORT void dumpProperties(TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
ScrollingNodeID m_overflowScrollingNodeID { 0 };
RefPtr<Nicosia::CompositionLayer> m_layer;
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreePositionedNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreePositionedNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreePositionedNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -98,7 +98,7 @@
});
}
-void ScrollingTreePositionedNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreePositionedNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "positioned node";
ScrollingTreeNode::dumpProperties(ts, behavior);
@@ -106,7 +106,7 @@
ts.dumpProperty("layout constraints", m_constraints);
ts.dumpProperty("related overflow nodes", m_relatedOverflowScrollingNodes.size());
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeNodeIDs) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeNodeIDs) {
if (!m_relatedOverflowScrollingNodes.isEmpty()) {
TextStream::GroupScope scope(ts);
ts << "overflow nodes";
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreePositionedNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreePositionedNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreePositionedNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -53,7 +53,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) override;
void applyLayerPositions() override;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
Vector<ScrollingNodeID> m_relatedOverflowScrollingNodes;
AbsolutePositionConstraints m_constraints;
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp 2021-10-20 15:20:20 UTC (rev 284534)
@@ -89,7 +89,7 @@
});
}
-void ScrollingTreeStickyNode::dumpProperties(TextStream& ts, ScrollingStateTreeAsTextBehavior behavior) const
+void ScrollingTreeStickyNode::dumpProperties(TextStream& ts, OptionSet<ScrollingStateTreeAsTextBehavior> behavior) const
{
ts << "sticky node";
@@ -96,7 +96,7 @@
ScrollingTreeNode::dumpProperties(ts, behavior);
ts.dumpProperty("sticky constraints", m_constraints);
- if (behavior & ScrollingStateTreeAsTextBehaviorIncludeLayerPositions) {
+ if (behavior & ScrollingStateTreeAsTextBehavior::IncludeLayerPositions) {
FloatPoint layerTopLeft;
ASSERT(m_layer);
m_layer->accessCommitted(
Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.h (284533 => 284534)
--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.h 2021-10-20 15:04:26 UTC (rev 284533)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.h 2021-10-20 15:20:20 UTC (rev 284534)
@@ -51,7 +51,7 @@
void commitStateBeforeChildren(const ScrollingStateNode&) override;
void applyLayerPositions() override;
- void dumpProperties(WTF::TextStream&, ScrollingStateTreeAsTextBehavior) const override;
+ void dumpProperties(WTF::TextStream&, OptionSet<ScrollingStateTreeAsTextBehavior>) const override;
FloatPoint computeLayerPosition() const;
FloatSize scrollDeltaSinceLastCommit() const;
