Changeset 272805 in webkit for trunk/Source/WebCore/css/BasicShapeFunctions.cpp

Timestamp:

Feb 12, 2021, 1:31:41 PM (4 years ago)

Author:

[email protected]

Message:

enum LengthType -> enum class LengthType
​https://bugs.webkit.org/show_bug.cgi?id=221834

Reviewed by Sam Weinig and Simon Fraser.

iPhoneOS14.2.sdk/usr/include/MacTypes.h:193 has:

typedef SInt32 Fixed;

but we have:

enum LengthType {

... Fixed ...

}

This leads to: error: reference to 'Fixed' is ambiguous

Unfortunately, this error occurs in
/System/Library/Frameworks/CoreText.framework/Headers/SFNTLayoutTypes.h,
which means we can't modify the error site to qualify the name. Therefore,
the best solution is to turn enum LengthType into enum class LengthType.
This is in accordance with WebKit's style guide.

No new tests because there is no behavior change.

• animation/CSSPropertyAnimation.cpp:

(WebCore::blendFunc):

• css/BasicShapeFunctions.cpp:

(WebCore::convertToLengthSize):
(WebCore::convertToCenterCoordinate):

• css/CSSBasicShapes.cpp:

(WebCore::buildSerializablePositionOffset):

• css/CSSCalculationValue.cpp:

(WebCore::CSSCalcPrimitiveValueNode::createCalcExpression const):
(WebCore::createCSS):

• css/CSSPrimitiveValue.cpp:

(WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
(WebCore::CSSPrimitiveValue::init):
(WebCore::CSSPrimitiveValue::computeLength const):

• css/CSSPrimitiveValueMappings.h:

(WebCore::CSSPrimitiveValue::convertToLength const):

• css/CSSToStyleMap.cpp:

(WebCore::CSSToStyleMap::mapNinePieceImageSlice):
(WebCore::CSSToStyleMap::mapNinePieceImageQuad):

• css/LengthFunctions.cpp:

(WebCore::valueForLength):
(WebCore::floatValueForLength):

• css/LengthFunctions.h:

(WebCore::minimumValueForLength):

• css/TransformFunctions.cpp:

(WebCore::convertToFloatLength):
(WebCore::transformsForValue):
(WebCore::translateForValue):

• display/css/DisplayFillLayerImageGeometry.cpp:

(WebCore::Display::calculateImageIntrinsicDimensions):

• dom/Document.cpp:

(WebCore::Document::updateLayoutIfDimensionsOutOfDate):

• html/HTMLInputElement.cpp:

(WebCore::HTMLInputElement::createInnerTextStyle):

• html/shadow/DateTimeNumericFieldElement.cpp:

(WebCore::DateTimeNumericFieldElement::adjustMinWidth const):

• html/shadow/DateTimeSymbolicFieldElement.cpp:

(WebCore::DateTimeSymbolicFieldElement::adjustMinWidth const):

• html/shadow/TextControlInnerElements.cpp:

(WebCore::TextControlInnerElement::resolveCustomStyle):

• layout/layouttree/LayoutTreeBuilder.cpp:

(WebCore::Layout::TreeBuilder::buildLayoutTree):
(WebCore::Layout::TreeBuilder::createLayoutBox):

• page/FrameView.cpp:

(WebCore::FrameView::performFixedWidthAutoSize):

• page/IntersectionObserver.cpp:

(WebCore::parseRootMargin):
(WebCore::IntersectionObserver::rootMargin const):

• platform/Length.cpp:

(WebCore::parseLength):
(WebCore::Length::Length):
(WebCore::convertTo100PercentMinusLength):
(WebCore::blend):
(WebCore::operator<<):

• platform/Length.h:

(WebCore::Length::Length):
(WebCore::Length::operator=):
(WebCore::Length::setValue):
(WebCore::Length::isAuto const):
(WebCore::Length::isFixed const):
(WebCore::Length::isMaxContent const):
(WebCore::Length::isMinContent const):
(WebCore::Length::isPercent const):
(WebCore::Length::isRelative const):
(WebCore::Length::isUndefined const):
(WebCore::Length::isCalculated const):
(WebCore::Length::isLegacyIntrinsic const):
(WebCore::Length::isIntrinsic const):
(WebCore::Length::isFillAvailable const):
(WebCore::Length::isFitContent const):
(WebCore::Length::isMinIntrinsic const):

• platform/LengthBox.h:

(WebCore::LengthBox::LengthBox):

• platform/Theme.cpp:

(WebCore::Theme::minimumControlSize const):

• platform/graphics/Image.cpp:

(WebCore::Image::computeIntrinsicDimensions):

• platform/graphics/transforms/PerspectiveTransformOperation.cpp:

(WebCore::PerspectiveTransformOperation::blend):

• platform/graphics/transforms/TranslateTransformOperation.cpp:

(WebCore::TranslateTransformOperation::blend):

• platform/graphics/transforms/TranslateTransformOperation.h:
• platform/mac/ThemeMac.mm:

(WebCore::sizeFromNSControlSize):
(WebCore::ThemeMac::minimumControlSize const):

• rendering/AutoTableLayout.cpp:

(WebCore::AutoTableLayout::recalcColumn):
(WebCore::AutoTableLayout::calcEffectiveLogicalWidth):
(WebCore::AutoTableLayout::layout):

• rendering/FixedTableLayout.cpp:

(WebCore::FixedTableLayout::calcWidthArray):

• rendering/GridTrackSizingAlgorithm.cpp:

(WebCore::GridTrackSizingAlgorithm::calculateGridTrackSize const):

• rendering/RenderBlockFlow.cpp:

(WebCore::isNonBlocksOrNonFixedHeightListItems):
(WebCore::getBPMWidth):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::constrainLogicalWidthInFragmentByMinMax const):
(WebCore::RenderBox::constrainLogicalHeightByMinMax const):
(WebCore::RenderBox::adjustBorderBoxLogicalWidthForBoxSizing const):
(WebCore::RenderBox::adjustContentBoxLogicalWidthForBoxSizing const):
(WebCore::RenderBox::computeLogicalWidthInFragment const):
(WebCore::RenderBox::computeIntrinsicLogicalWidthUsing const):
(WebCore::RenderBox::sizesLogicalWidthToFitContent const):
(WebCore::RenderBox::computeInlineDirectionMargins const):
(WebCore::RenderBox::computeLogicalHeight const):
(WebCore::RenderBox::computeReplacedLogicalWidthUsing const):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing const):
(WebCore::computeInlineStaticDistance):
(WebCore::RenderBox::computePositionedLogicalWidth const):
(WebCore::RenderBox::computePositionedLogicalWidthUsing const):
(WebCore::computeBlockStaticDistance):
(WebCore::RenderBox::computePositionedLogicalHeightUsing const):
(WebCore::RenderBox::computePositionedLogicalWidthReplaced const):
(WebCore::RenderBox::computePositionedLogicalHeightReplaced const):
(WebCore::RenderBox::percentageLogicalHeightIsResolvable const):

• rendering/RenderButton.cpp:

(WebCore::RenderButton::updateAnonymousChildStyle const):

• rendering/RenderDeprecatedFlexibleBox.cpp:

(WebCore::RenderDeprecatedFlexibleBox::allowedChildFlex):

• rendering/RenderElement.cpp:

(WebCore::includeNonFixedHeight):

• rendering/RenderFlexibleBox.cpp:

(WebCore::RenderFlexibleBox::computeMainAxisExtentForChild):
(WebCore::RenderFlexibleBox::adjustChildSizeForMinAndMax):
(WebCore::RenderFlexibleBox::mainSizeForPercentageResolution):

• rendering/RenderFullScreen.cpp:

(WebCore::createFullScreenStyle):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::layoutShadowContent):

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::calculateClipRects const):

• rendering/RenderLayerBacking.cpp:

(WebCore::hasNonZeroTransformOrigin):

• rendering/RenderListMarker.cpp:

(WebCore::RenderListMarker::updateMargins):

• rendering/RenderMenuList.cpp:

(WebCore::RenderMenuList::adjustInnerStyle):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::logicalWidthFromColumns const):

• rendering/RenderTableSection.cpp:

(WebCore::updateLogicalHeightForCell):

• rendering/RenderTextControlMultiLine.cpp:

(WebCore::RenderTextControlMultiLine::layoutExcludedChildren):

• rendering/RenderTextControlSingleLine.cpp:

(WebCore::resetOverriddenHeight):
(WebCore::RenderTextControlSingleLine::layout):

• rendering/RenderThemeCocoa.mm:

(WebCore::RenderThemeCocoa::adjustApplePayButtonStyle const):

• rendering/RenderThemeMac.mm:

(WebCore::RenderThemeMac::setSizeFromFont const):
(WebCore::RenderThemeMac::adjustListButtonStyle const):
(WebCore::RenderThemeMac::adjustMenuListStyle const):
(WebCore::RenderThemeMac::adjustMenuListButtonStyle const):
(WebCore::RenderThemeMac::adjustSearchFieldStyle const):
(WebCore::RenderThemeMac::adjustSearchFieldCancelButtonStyle const):
(WebCore::RenderThemeMac::adjustSearchFieldDecorationPartStyle const):
(WebCore::RenderThemeMac::adjustSearchFieldResultsDecorationPartStyle const):
(WebCore::RenderThemeMac::adjustSearchFieldResultsButtonStyle const):
(WebCore::RenderThemeMac::adjustSliderThumbSize const):

• rendering/TextAutoSizing.cpp:

(WebCore::TextAutoSizingValue::adjustTextNodeSizes):

• rendering/style/BasicShapes.cpp:

(WebCore::BasicShapeCenterCoordinate::updateComputedLength):

• rendering/style/BasicShapes.h:

(WebCore::BasicShapeRadius::BasicShapeRadius):

• rendering/style/BorderData.h:

(WebCore::BorderData::BorderData):

• rendering/style/FillLayer.h:

(WebCore::FillLayer::initialFillXPosition):
(WebCore::FillLayer::initialFillYPosition):

• rendering/style/GridTrackSize.h:

(WebCore::GridTrackSize::GridTrackSize):

• rendering/style/NinePieceImage.h:
• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::setPageScaleTransform):
(WebCore::RenderStyle::setWordSpacing):

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::resetMargin):
(WebCore::RenderStyle::initialShapeMargin):
(WebCore::RenderStyle::initialBorderRadius):
(WebCore::RenderStyle::initialObjectPosition):
(WebCore::RenderStyle::initialWordSpacing):
(WebCore::RenderStyle::initialMaxSize):
(WebCore::RenderStyle::initialMargin):
(WebCore::RenderStyle::initialPadding):
(WebCore::RenderStyle::initialTextIndent):
(WebCore::RenderStyle::initialZeroLength):
(WebCore::RenderStyle::initialOneLength):
(WebCore::RenderStyle::initialLineHeight):
(WebCore::RenderStyle::initialFlexBasis):
(WebCore::RenderStyle::initialMarqueeIncrement):
(WebCore::RenderStyle::initialTransformOriginX):
(WebCore::RenderStyle::initialTransformOriginY):
(WebCore::RenderStyle::initialPerspectiveOriginX):
(WebCore::RenderStyle::initialPerspectiveOriginY):
(WebCore::RenderStyle::initialSpecifiedLineHeight):
(WebCore::RenderStyle::initialScrollMargin):
(WebCore::RenderStyle::initialScrollPadding):
(WebCore::RenderStyle::initialGridAutoColumns):
(WebCore::RenderStyle::initialGridAutoRows):
(WebCore::RenderStyle::setBorderRadius):

• rendering/style/StyleGeneratedImage.cpp:

(WebCore::StyleGeneratedImage::computeIntrinsicDimensions):

• rendering/style/StyleRareNonInheritedData.h:
• rendering/style/StyleReflection.h:

(WebCore::StyleReflection::StyleReflection):

• rendering/style/StyleSurroundData.cpp:

(WebCore::StyleSurroundData::StyleSurroundData):

• rendering/updating/RenderTreeBuilderFullScreen.cpp:

(WebCore::RenderTreeBuilder::FullScreen::createPlaceholder):

• style/StyleAdjuster.cpp:

(WebCore::Style::addIntrinsicMargins):
(WebCore::Style::Adjuster::adjust const):
(WebCore::Style::Adjuster::adjustForTextAutosizing):

• style/StyleBuilderConverter.h:

(WebCore::Style::BuilderConverter::convertLength):
(WebCore::Style::BuilderConverter::convertLengthOrAuto):
(WebCore::Style::BuilderConverter::convertLengthSizing):
(WebCore::Style::BuilderConverter::convertLengthMaxSizing):
(WebCore::Style::BuilderConverter::convertToRadiusLength):
(WebCore::Style::BuilderConverter::convertRadius):
(WebCore::Style::BuilderConverter::convertTo100PercentMinusLength):
(WebCore::Style::BuilderConverter::convertPositionComponent):
(WebCore::Style::BuilderConverter::createGridTrackBreadth):
(WebCore::Style::BuilderConverter::convertWordSpacing):
(WebCore::Style::BuilderConverter::convertLineHeight):

• style/StyleBuilderCustom.h:

(WebCore::Style::ApplyPropertyBorderImageModifier::applyInitialValue):

• style/StyleBuilderState.cpp:

(WebCore::Style::BuilderState::createFilterOperations):

• style/StyleResolveForDocument.cpp:

(WebCore::Style::resolveForDocument):

• style/StyleResolveForFontRaw.cpp:

(WebCore::Style::resolveForFontRaw):

• svg/SVGSVGElement.cpp:

(WebCore::SVGSVGElement::intrinsicWidth const):
(WebCore::SVGSVGElement::intrinsicHeight const):

File:

• trunk/Source/WebCore/css/BasicShapeFunctions.cpp (modified) (3 diffs)

trunk/Source/WebCore/css/BasicShapeFunctions.cpp

@@ -145 +145 @@
 {
     if (!value)
-        return { { 0, Fixed }, { 0, Fixed } };
+        return { { 0, LengthType::Fixed }, { 0, LengthType::Fixed } };
 
     auto& pair = *value->pairValue();
@@ -154 +154 @@
 {
     CSSValueID keyword = CSSValueTop;
-    Length offset { 0, Fixed };
+    Length offset { 0, LengthType::Fixed };
     if (!value)
         keyword = CSSValueCenter;
@@ -177 +177 @@
     case CSSValueCenter:
         direction = BasicShapeCenterCoordinate::TopLeft;
-        offset = Length(50, Percent);
+        offset = Length(50, LengthType::Percent);
         break;
     default: