Changeset 281239 in webkit for trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

Timestamp:

Aug 19, 2021, 8:51:31 AM (4 years ago)

Author:

Simon Fraser

Message:

Use an OptionSet<MapCoordinatesMode> in place of MapCoordinatesFlags
​https://bugs.webkit.org/show_bug.cgi?id=229170

Reviewed by Antti Koivisto.

Replace MapCoordinatesFlags with OptionSet<MapCoordinatesMode>. No behavior
change.

• html/HTMLAnchorElement.cpp:

(WebCore::appendServerMapMousePosition):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::mapLocalToContainer const):
(WebCore::RenderBox::mapAbsoluteToLocalPoint const):

• rendering/RenderBox.h:
• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::mapAbsoluteToLocalPoint const):

• rendering/RenderBoxModelObject.h:
• rendering/RenderFragmentedFlow.cpp:

(WebCore::RenderFragmentedFlow::mapLocalToContainer const):

• rendering/RenderFragmentedFlow.h:
• rendering/RenderGeometryMap.cpp:

(WebCore::RenderGeometryMap::RenderGeometryMap):
(WebCore::RenderGeometryMap::pushMappingsToAncestor):

• rendering/RenderGeometryMap.h:

(WebCore::RenderGeometryMap::mapCoordinatesFlags const):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::mapLocalToContainer const):

• rendering/RenderInline.h:
• rendering/RenderMultiColumnFlow.cpp:

(WebCore::RenderMultiColumnFlow::mapAbsoluteToLocalPoint const):

• rendering/RenderMultiColumnFlow.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::absoluteBoundingBoxRect const):
(WebCore::RenderObject::localToAbsolute const):
(WebCore::RenderObject::absoluteToLocal const):
(WebCore::RenderObject::absoluteToLocalQuad const):
(WebCore::RenderObject::mapLocalToContainer const):
(WebCore::RenderObject::mapAbsoluteToLocalPoint const):
(WebCore::RenderObject::localToContainerQuad const):
(WebCore::RenderObject::localToContainerPoint const):

• rendering/RenderObject.h:

(WebCore::RenderObject::localToAbsolute):
(WebCore::RenderObject::absoluteToLocal):
(WebCore::RenderObject::localToAbsoluteQuad const):

• rendering/RenderObjectEnums.h:
• rendering/RenderTheme.cpp:

(WebCore::RenderTheme::volumeSliderOffsetFromMuteButton const):

• rendering/RenderView.cpp:

(WebCore::RenderView::mapLocalToContainer const):
(WebCore::RenderView::mapAbsoluteToLocalPoint const):

• rendering/RenderView.h:
• rendering/svg/RenderSVGForeignObject.cpp:

(WebCore::RenderSVGForeignObject::mapLocalToContainer const):

• rendering/svg/RenderSVGForeignObject.h:
• rendering/svg/RenderSVGInline.cpp:

(WebCore::RenderSVGInline::mapLocalToContainer const):

• rendering/svg/RenderSVGInline.h:
• rendering/svg/RenderSVGModelObject.cpp:

(WebCore::RenderSVGModelObject::mapLocalToContainer const):

• rendering/svg/RenderSVGModelObject.h:
• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::mapLocalToContainer const):

• rendering/svg/RenderSVGRoot.h:
• rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::mapLocalToContainer const):

• rendering/svg/RenderSVGText.h:
• rendering/svg/SVGRenderSupport.cpp:

(WebCore::SVGRenderSupport::mapLocalToContainer):

File:

• trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderMultiColumnFlow.cpp

@@ -283 +283 @@
 }
     
-void RenderMultiColumnFlow::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
+void RenderMultiColumnFlow::mapAbsoluteToLocalPoint(OptionSet<MapCoordinatesMode> mode, TransformState& transformState) const
 {
     // First get the transform state's point into the block flow thread's physical coordinate space.
@@ -310 +310 @@
     // the best we could do), then we can map from the fragment into the flow thread.
     LayoutSize translationOffset = physicalTranslationFromFragmentToFlow(candidateColumnSet, candidatePoint) + candidateContainerOffset;
-    bool preserve3D = mode & UseTransforms && (parent()->style().preserves3D() || style().preserves3D());
-    if (mode & UseTransforms && shouldUseTransformFromContainer(parent())) {
+    bool preserve3D = mode.contains(UseTransforms) && (parent()->style().preserves3D() || style().preserves3D());
+    if (mode.contains(UseTransforms) && shouldUseTransformFromContainer(parent())) {
         TransformationMatrix t;
         getTransformFromContainer(parent(), translationOffset, t);