[webkit-changes] [WebKit/WebKit] f607bb: Make Style::BuilderState 'const' in more places

Simon Fraser noreply at github.com
Wed Oct 16 08:38:47 PDT 2024 

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: f607bbdba4df616b144d16367b4f4fa3ee329a02
      https://github.com/WebKit/WebKit/commit/f607bbdba4df616b144d16367b4f4fa3ee329a02
  Author: Simon Fraser <simon.fraser at apple.com>
  Date:   2024-10-16 (Wed, 16 Oct 2024)

  Changed paths:
    M Source/WebCore/animation/ViewTimeline.cpp
    M Source/WebCore/animation/ViewTimeline.h
    M Source/WebCore/css/CSSCanvasValue.cpp
    M Source/WebCore/css/CSSCanvasValue.h
    M Source/WebCore/css/CSSCrossfadeValue.cpp
    M Source/WebCore/css/CSSCrossfadeValue.h
    M Source/WebCore/css/CSSCursorImageValue.cpp
    M Source/WebCore/css/CSSCursorImageValue.h
    M Source/WebCore/css/CSSFilterImageValue.cpp
    M Source/WebCore/css/CSSFilterImageValue.h
    M Source/WebCore/css/CSSGradientValue.cpp
    M Source/WebCore/css/CSSGradientValue.h
    M Source/WebCore/css/CSSImageSetValue.cpp
    M Source/WebCore/css/CSSImageSetValue.h
    M Source/WebCore/css/CSSImageValue.cpp
    M Source/WebCore/css/CSSImageValue.h
    M Source/WebCore/css/CSSNamedImageValue.cpp
    M Source/WebCore/css/CSSNamedImageValue.h
    M Source/WebCore/css/CSSPaintImageValue.cpp
    M Source/WebCore/css/CSSPaintImageValue.h
    M Source/WebCore/css/CSSToStyleMap.cpp
    M Source/WebCore/css/CSSToStyleMap.h
    M Source/WebCore/style/StyleBuilderConverter.h
    M Source/WebCore/style/StyleBuilderState.cpp
    M Source/WebCore/style/StyleBuilderState.h
    M Source/WebCore/style/values/StyleGradient.cpp
    M Source/WebCore/style/values/StyleGradient.h
    M Source/WebCore/style/values/StylePosition.cpp
    M Source/WebCore/style/values/StylePosition.h
    M Source/WebCore/style/values/StylePrimitiveNumericTypes+Conversions.h
    M Source/WebCore/style/values/StyleValueTypes.h

  Log Message:
  -----------
  Make Style::BuilderState 'const' in more places
https://bugs.webkit.org/show_bug.cgi?id=281553
rdar://138013855

Reviewed by Antti Koivisto.

Most of the code paths that use `Style::BuilderState` do so for cssToLengthConversionData(), which doesn't mutate
the state. So pass it around in more places as a const reference.

Many functions on CSSToStyleMap can also be 'const'. CSSToStyleMap::style() is unused, and can be removed.

* Source/WebCore/animation/ViewTimeline.cpp:
(WebCore::ViewTimeline::createFromCSSValue):
* Source/WebCore/animation/ViewTimeline.h:
* Source/WebCore/css/CSSCanvasValue.cpp:
(WebCore::CSSCanvasValue::createStyleImage const):
* Source/WebCore/css/CSSCanvasValue.h:
* Source/WebCore/css/CSSCrossfadeValue.cpp:
(WebCore::CSSCrossfadeValue::createStyleImage const):
* Source/WebCore/css/CSSCrossfadeValue.h:
* Source/WebCore/css/CSSCursorImageValue.cpp:
(WebCore::CSSCursorImageValue::createStyleImage const):
* Source/WebCore/css/CSSCursorImageValue.h:
* Source/WebCore/css/CSSFilterImageValue.cpp:
(WebCore::CSSFilterImageValue::createStyleImage const):
* Source/WebCore/css/CSSFilterImageValue.h:
* Source/WebCore/css/CSSGradientValue.cpp:
(WebCore::CSSGradientValue::createStyleImage const):
* Source/WebCore/css/CSSGradientValue.h:
* Source/WebCore/css/CSSImageSetValue.cpp:
(WebCore::CSSImageSetValue::createStyleImage const):
* Source/WebCore/css/CSSImageSetValue.h:
* Source/WebCore/css/CSSImageValue.cpp:
(WebCore::CSSImageValue::createStyleImage const):
* Source/WebCore/css/CSSImageValue.h:
* Source/WebCore/css/CSSNamedImageValue.cpp:
(WebCore::CSSNamedImageValue::createStyleImage const):
* Source/WebCore/css/CSSNamedImageValue.h:
* Source/WebCore/css/CSSPaintImageValue.cpp:
(WebCore::CSSPaintImageValue::createStyleImage const):
* Source/WebCore/css/CSSPaintImageValue.h:
* Source/WebCore/css/CSSToStyleMap.cpp:
(WebCore::CSSToStyleMap::CSSToStyleMap):
(WebCore::CSSToStyleMap::styleImage const):
(WebCore::CSSToStyleMap::mapFillImage const):
(WebCore::CSSToStyleMap::mapFillSize const):
(WebCore::CSSToStyleMap::mapFillXPosition const):
(WebCore::CSSToStyleMap::mapFillYPosition const):
(WebCore::CSSToStyleMap::mapAnimationDelay const):
(WebCore::CSSToStyleMap::mapAnimationDuration const):
(WebCore::CSSToStyleMap::mapAnimationIterationCount const):
(WebCore::CSSToStyleMap::mapAnimationName const):
(WebCore::CSSToStyleMap::mapAnimationTimeline const):
(WebCore::CSSToStyleMap::mapAnimationTimingFunction const):
(WebCore::CSSToStyleMap::mapNinePieceImage const):
(WebCore::CSSToStyleMap::mapNinePieceImageSlice const):
(WebCore::CSSToStyleMap::mapNinePieceImageWidth const):
(WebCore::CSSToStyleMap::mapNinePieceImageQuad const):
(WebCore::CSSToStyleMap::mapNinePieceImageSide const):
(WebCore::CSSToStyleMap::style const): Deleted.
(WebCore::CSSToStyleMap::styleImage): Deleted.
(WebCore::CSSToStyleMap::mapFillImage): Deleted.
(WebCore::CSSToStyleMap::mapFillSize): Deleted.
(WebCore::CSSToStyleMap::mapFillXPosition): Deleted.
(WebCore::CSSToStyleMap::mapFillYPosition): Deleted.
(WebCore::CSSToStyleMap::mapAnimationDelay): Deleted.
(WebCore::CSSToStyleMap::mapAnimationDuration): Deleted.
(WebCore::CSSToStyleMap::mapAnimationIterationCount): Deleted.
(WebCore::CSSToStyleMap::mapAnimationName): Deleted.
(WebCore::CSSToStyleMap::mapAnimationTimeline): Deleted.
(WebCore::CSSToStyleMap::mapAnimationTimingFunction): Deleted.
(WebCore::CSSToStyleMap::mapNinePieceImage): Deleted.
(WebCore::CSSToStyleMap::mapNinePieceImageSlice): Deleted.
(WebCore::CSSToStyleMap::mapNinePieceImageWidth): Deleted.
(WebCore::CSSToStyleMap::mapNinePieceImageQuad): Deleted.
(WebCore::CSSToStyleMap::mapNinePieceImageSide): Deleted.
* Source/WebCore/css/CSSToStyleMap.h:
* Source/WebCore/style/StyleBuilderConverter.h:
(WebCore::Style::BuilderConverter::convertStringOrAutoAtom):
(WebCore::Style::BuilderConverter::convertStringOrNoneAtom):
(WebCore::Style::BuilderConverter::convertComputedLength):
(WebCore::Style::BuilderConverter::convertLineWidth):
(WebCore::Style::BuilderConverter::convertToRadiusLength):
(WebCore::Style::BuilderConverter::convertRadius):
(WebCore::Style::BuilderConverter::convertPositionComponentX):
(WebCore::Style::BuilderConverter::convertPositionComponentY):
(WebCore::Style::BuilderConverter::convertPositionComponent):
(WebCore::Style::BuilderConverter::convertPosition):
(WebCore::Style::BuilderConverter::convertPositionOrAutoOrNormal):
(WebCore::Style::BuilderConverter::convertPositionOrAuto):
(WebCore::Style::BuilderConverter::convertTextDecorationLine):
(WebCore::Style::BuilderConverter::convertTextTransform):
(WebCore::Style::BuilderConverter::convertNumber):
(WebCore::Style::BuilderConverter::convertNumberOrAuto):
(WebCore::Style::BuilderConverter::convertWebkitHyphenateLimitLines):
(WebCore::Style::BuilderConverter::convertStyleImage):
(WebCore::Style::BuilderConverter::convertImageOrientation):
(WebCore::Style::BuilderConverter::convertTransform):
(WebCore::Style::BuilderConverter::convertTranslate):
(WebCore::Style::BuilderConverter::convertRotate):
(WebCore::Style::BuilderConverter::convertScale):
(WebCore::Style::BuilderConverter::convertColorScheme):
(WebCore::Style::BuilderConverter::convertString):
(WebCore::Style::BuilderConverter::convertStringOrAuto):
(WebCore::Style::BuilderConverter::convertStringOrNone):
(WebCore::Style::BuilderConverter::convertTextEmphasisPosition):
(WebCore::Style::BuilderConverter::convertTextAlign):
(WebCore::Style::BuilderConverter::convertTextAlignLast):
(WebCore::Style::BuilderConverter::convertRayPathOperation):
(WebCore::Style::BuilderConverter::convertSVGPath):
(WebCore::Style::BuilderConverter::convertPathOperation):
(WebCore::Style::BuilderConverter::convertResize):
(WebCore::Style::BuilderConverter::convertMarqueeRepetition):
(WebCore::Style::BuilderConverter::convertMarqueeSpeed):
(WebCore::Style::BuilderConverter::convertQuotes):
(WebCore::Style::BuilderConverter::convertTextUnderlinePosition):
(WebCore::Style::BuilderConverter::convertTextUnderlineOffset):
(WebCore::Style::BuilderConverter::convertTextDecorationThickness):
(WebCore::Style::BuilderConverter::convertReflection):
(WebCore::Style::BuilderConverter::convertTextEdge):
(WebCore::Style::BuilderConverter::convertInitialLetter):
(WebCore::Style::BuilderConverter::convertTextStrokeWidth):
(WebCore::Style::BuilderConverter::convertLineBoxContain):
(WebCore::Style::BuilderConverter::convertShapeValue):
(WebCore::Style::BuilderConverter::convertScrollSnapType):
(WebCore::Style::BuilderConverter::convertScrollSnapAlign):
(WebCore::Style::BuilderConverter::convertScrollSnapStop):
(WebCore::Style::BuilderConverter::convertScrollbarColor):
(WebCore::Style::BuilderConverter::convertScrollbarGutter):
(WebCore::Style::BuilderConverter::createGridTrackBreadth):
(WebCore::Style::BuilderConverter::createGridTrackSize):
(WebCore::Style::BuilderConverter::createGridTrackList):
(WebCore::Style::BuilderConverter::createGridPosition):
(WebCore::Style::BuilderConverter::createImplicitNamedGridLinesFromGridArea):
(WebCore::Style::BuilderConverter::convertGridTrackSizeList):
(WebCore::Style::BuilderConverter::convertGridTrackSize):
(WebCore::Style::BuilderConverter::convertGridTrackList):
(WebCore::Style::BuilderConverter::convertGridPosition):
(WebCore::Style::BuilderConverter::convertGridAutoFlow):
(WebCore::Style::BuilderConverter::convertContentAlignmentDataList):
(WebCore::Style::BuilderConverter::convertMasonryAutoFlow):
(WebCore::Style::zoomWithTextZoomFactor):
(WebCore::Style::BuilderConverter::cssToLengthConversionDataWithTextZoomFactor):
(WebCore::Style::BuilderConverter::convertTextLengthOrNormal):
(WebCore::Style::BuilderConverter::convertPerspective):
(WebCore::Style::BuilderConverter::convertMarqueeIncrement):
(WebCore::Style::BuilderConverter::convertFilterOperations):
(WebCore::Style::BuilderConverter::convertFontStyleFromValue):
(WebCore::Style::BuilderConverter::convertFontWeight):
(WebCore::Style::BuilderConverter::convertFontStretch):
(WebCore::Style::BuilderConverter::convertFontFeatureSettings):
(WebCore::Style::BuilderConverter::convertFontVariationSettings):
(WebCore::Style::BuilderConverter::convertFontSizeAdjust):
(WebCore::Style::BuilderConverter::convertTouchCallout):
(WebCore::Style::BuilderConverter::convertTapHighlightColor):
(WebCore::Style::BuilderConverter::convertTouchAction):
(WebCore::Style::BuilderConverter::convertOverflowScrolling):
(WebCore::Style::BuilderConverter::convertSmoothScrolling):
(WebCore::Style::BuilderConverter::convertSVGLengthValue):
(WebCore::Style::BuilderConverter::convertSVGLengthVector):
(WebCore::Style::BuilderConverter::convertStrokeDashArray):
(WebCore::Style::BuilderConverter::convertPaintOrder):
(WebCore::Style::BuilderConverter::convertOpacity):
(WebCore::Style::BuilderConverter::convertSVGURIReference):
(WebCore::Style::BuilderConverter::convertSelfOrDefaultAlignmentData):
(WebCore::Style::BuilderConverter::convertContentAlignmentData):
(WebCore::Style::BuilderConverter::convertGlyphOrientation):
(WebCore::Style::BuilderConverter::convertGlyphOrientationOrAuto):
(WebCore::Style::BuilderConverter::convertLineHeight):
(WebCore::Style::BuilderConverter::convertFontPalette):
(WebCore::Style::BuilderConverter::convertSpeakAs):
(WebCore::Style::BuilderConverter::convertHangingPunctuation):
(WebCore::Style::BuilderConverter::convertGapLength):
(WebCore::Style::BuilderConverter::convertOffsetRotate):
(WebCore::Style::BuilderConverter::convertContainerName):
(WebCore::Style::BuilderConverter::convertMarginTrim):
(WebCore::Style::BuilderConverter::convertTextSpacingTrim):
(WebCore::Style::BuilderConverter::convertTextAutospace):
(WebCore::Style::BuilderConverter::convertBlockStepSize):
(WebCore::Style::BuilderConverter::convertContain):
(WebCore::Style::BuilderConverter::convertViewTransitionClass):
(WebCore::Style::BuilderConverter::convertViewTransitionName):
(WebCore::Style::BuilderConverter::convertWillChange):
(WebCore::Style::BuilderConverter::convertScrollTimelineName):
(WebCore::Style::BuilderConverter::convertScrollTimelineAxis):
(WebCore::Style::BuilderConverter::convertViewTimelineInset):
(WebCore::Style::BuilderConverter::convertAnchorName):
(WebCore::Style::BuilderConverter::convertBlockEllipsis):
(WebCore::Style::BuilderConverter::convertMaxLines):
(WebCore::Style::BuilderConverter::convertLineClamp):
(WebCore::Style::BuilderConverter::convertTimingFunction):
(WebCore::Style::BuilderConverter::convertTimelineScope):
(WebCore::Style::BuilderConverter::convertAnimationRange):
(WebCore::Style::BuilderConverter::convertAnimationRangeStart):
(WebCore::Style::BuilderConverter::convertAnimationRangeEnd):
* Source/WebCore/style/StyleBuilderState.cpp:
(WebCore::Style::BuilderState::createStyleImage const):
(WebCore::Style::BuilderState::createFilterOperations const):
(WebCore::Style::BuilderState::createStyleImage): Deleted.
(WebCore::Style::BuilderState::createFilterOperations): Deleted.
* Source/WebCore/style/StyleBuilderState.h:
(WebCore::Style::BuilderState::styleMap const):
(WebCore::Style::BuilderState::styleMap): Deleted.
* Source/WebCore/style/values/StyleGradient.cpp:
(WebCore::Style::toStyleStopColor):
(WebCore::Style::toStyleStopPosition):
(WebCore::Style::toStyleColorStop):
(WebCore::Style::ToStyle<CSS::GradientAngularColorStop>::operator):
(WebCore::Style::ToStyle<CSS::GradientLinearColorStop>::operator):
(WebCore::Style::ToStyle<CSS::GradientDeprecatedColorStop>::operator):
* Source/WebCore/style/values/StyleGradient.h:
* Source/WebCore/style/values/StylePosition.cpp:
(WebCore::Style::ToStyle<CSS::Position>::operator):
* Source/WebCore/style/values/StylePosition.h:
* Source/WebCore/style/values/StylePrimitiveNumericTypes+Conversions.h:
(WebCore::Style::ConversionDataSpecializer::conversionData):
(WebCore::Style::ConversionDataSpecializer<CSS::LengthRaw<R>>::conversionData):
(WebCore::Style::conversionData):
(WebCore::Style::ToStyle<CSS::AnglePercentage<R>>::operator()):
(WebCore::Style::ToStyle<CSS::LengthPercentage<R>>::operator()):
(WebCore::Style::ToStyle<CSS::PrimitiveNumeric<RawType>>::operator()):
(WebCore::Style::ToStyle<CSS::None>::operator()):
* Source/WebCore/style/values/StyleValueTypes.h:
(WebCore::Style::toStyle):
(WebCore::Style::ToStyle<CSSType>::operator()):
(WebCore::Style::ToStyle<std::optional<CSSType>>::operator()):

Canonical link: https://commits.webkit.org/285269@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications

More information about the webkit-changes mailing list