Changeset 251841 in webkit


Ignore:
Timestamp:
Oct 31, 2019 7:28:27 AM (4 years ago)
Author:
Antti Koivisto
Message:

Rename StyleBuilder to Style::BuilderGenerated
https://bugs.webkit.org/show_bug.cgi?id=203673

Reviewed by Antoine Quint.

Also rename the related StykeBuilderCustom and StyleBuilderConverter classes
and move them to the Style namespace and directory.

  • Sources.txt:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSFontFace.cpp:

(WebCore::calculateWeightRange):
(WebCore::calculateStretchRange):
(WebCore::calculateItalicRange):

  • css/CSSFontFaceSet.cpp:

(WebCore::computeFontSelectionRequest):

  • css/CSSToStyleMap.cpp:

(WebCore::CSSToStyleMap::mapFillXPosition):
(WebCore::CSSToStyleMap::mapFillYPosition):

  • css/StyleBuilder.h: Removed.
  • css/makeprop.pl:

(getScopeForFunction):
(generateInitialValueSetter):
(generateInheritValueSetter):
(generateValueSetter):

  • css/parser/CSSPropertyParser.cpp:

(WebCore::CSSPropertyParser::parseTypedCustomPropertyValue):

  • style/PropertyCascade.cpp:

(WebCore::Style::PropertyCascade::applyProperty):

  • style/StyleBuilderConverter.h: Renamed from Source/WebCore/css/StyleBuilderConverter.h.

(WebCore::Style::BuilderConverter::convertLength):
(WebCore::Style::BuilderConverter::convertLengthOrAuto):
(WebCore::Style::BuilderConverter::convertLengthSizing):
(WebCore::Style::BuilderConverter::convertLengthMaxSizing):
(WebCore::Style::BuilderConverter::convertTabSize):
(WebCore::Style::BuilderConverter::convertComputedLength):
(WebCore::Style::BuilderConverter::convertLineWidth):
(WebCore::Style::BuilderConverter::convertSpacing):
(WebCore::Style::BuilderConverter::convertToRadiusLength):
(WebCore::Style::BuilderConverter::convertRadius):
(WebCore::Style::BuilderConverter::convertTo100PercentMinusLength):
(WebCore::Style::BuilderConverter::convertPositionComponentX):
(WebCore::Style::BuilderConverter::convertPositionComponentY):
(WebCore::Style::BuilderConverter::convertPositionComponent):
(WebCore::Style::BuilderConverter::convertObjectPosition):
(WebCore::Style::BuilderConverter::convertTextDecoration):
(WebCore::Style::BuilderConverter::convertNumber):
(WebCore::Style::BuilderConverter::convertNumberOrAuto):
(WebCore::Style::BuilderConverter::convertWebkitHyphenateLimitLines):
(WebCore::Style::BuilderConverter::convertBorderImage):
(WebCore::Style::BuilderConverter::convertBorderMask):
(WebCore::Style::BuilderConverter::convertStyleImage):
(WebCore::Style::BuilderConverter::convertTransform):
(WebCore::Style::BuilderConverter::updateColorScheme):
(WebCore::Style::BuilderConverter::convertColorScheme):
(WebCore::Style::BuilderConverter::convertString):
(WebCore::Style::BuilderConverter::convertStringOrAuto):
(WebCore::Style::BuilderConverter::convertStringOrNone):
(WebCore::Style::BuilderConverter::valueToEmphasisPosition):
(WebCore::Style::BuilderConverter::convertTextEmphasisPosition):
(WebCore::Style::BuilderConverter::convertTextAlign):
(WebCore::Style::BuilderConverter::convertClipPath):
(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::convertInitialLetter):
(WebCore::Style::BuilderConverter::convertTextStrokeWidth):
(WebCore::Style::BuilderConverter::convertLineBoxContain):
(WebCore::Style::BuilderConverter::valueToDecorationSkip):
(WebCore::Style::BuilderConverter::convertTextDecorationSkip):
(WebCore::Style::BuilderConverter::convertShapeValue):
(WebCore::Style::BuilderConverter::convertScrollSnapType):
(WebCore::Style::BuilderConverter::convertScrollSnapAlign):
(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::convertGridPosition):
(WebCore::Style::BuilderConverter::convertGridAutoFlow):
(WebCore::Style::BuilderConverter::csstoLengthConversionDataWithTextZoomFactor):
(WebCore::Style::BuilderConverter::convertWordSpacing):
(WebCore::Style::BuilderConverter::convertPerspective):
(WebCore::Style::BuilderConverter::convertMarqueeIncrement):
(WebCore::Style::BuilderConverter::convertFilterOperations):
(WebCore::Style::BuilderConverter::convertFontFeatureSettings):
(WebCore::Style::BuilderConverter::convertFontWeightFromValue):
(WebCore::Style::BuilderConverter::convertFontStretchFromValue):
(WebCore::Style::BuilderConverter::convertFontStyleFromValue):
(WebCore::Style::BuilderConverter::convertFontWeight):
(WebCore::Style::BuilderConverter::convertFontStretch):
(WebCore::Style::BuilderConverter::convertFontVariationSettings):
(WebCore::Style::BuilderConverter::convertTouchCallout):
(WebCore::Style::BuilderConverter::convertTapHighlightColor):
(WebCore::Style::BuilderConverter::convertTouchAction):
(WebCore::Style::BuilderConverter::convertOverflowScrolling):
(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::convertSVGColor):
(WebCore::Style::BuilderConverter::convertSelfOrDefaultAlignmentData):
(WebCore::Style::BuilderConverter::convertContentAlignmentData):
(WebCore::Style::BuilderConverter::convertGlyphOrientation):
(WebCore::Style::BuilderConverter::convertGlyphOrientationOrAuto):
(WebCore::Style::BuilderConverter::convertLineHeight):
(WebCore::Style::BuilderConverter::convertFontSynthesis):
(WebCore::Style::BuilderConverter::convertSpeakAs):
(WebCore::Style::BuilderConverter::convertHangingPunctuation):
(WebCore::Style::BuilderConverter::convertGapLength):

  • style/StyleBuilderCustom.h: Renamed from Source/WebCore/css/StyleBuilderCustom.h.

(WebCore::Style::BuilderCustom::applyInitialWebkitMaskImage):
(WebCore::Style::BuilderCustom::applyInheritWebkitMaskImage):
(WebCore::Style::BuilderCustom::applyInitialFontFeatureSettings):
(WebCore::Style::BuilderCustom::applyInheritFontFeatureSettings):
(WebCore::Style::BuilderCustom::applyInitialFontVariationSettings):
(WebCore::Style::BuilderCustom::applyInheritFontVariationSettings):
(WebCore::Style::BuilderCustom::applyValueDirection):
(WebCore::Style::BuilderCustom::applyInitialTextAlign):
(WebCore::Style::BuilderCustom::applyValueTextAlign):
(WebCore::Style::BuilderCustom::resetEffectiveZoom):
(WebCore::Style::BuilderCustom::applyInitialZoom):
(WebCore::Style::BuilderCustom::applyInheritZoom):
(WebCore::Style::BuilderCustom::applyValueZoom):
(WebCore::Style::BuilderCustom::mmLength):
(WebCore::Style::BuilderCustom::inchLength):
(WebCore::Style::BuilderCustom::getPageSizeFromName):
(WebCore::Style::BuilderCustom::applyValueVerticalAlign):
(WebCore::Style::BuilderCustom::applyInheritImageResolution):
(WebCore::Style::BuilderCustom::applyInitialImageResolution):
(WebCore::Style::BuilderCustom::applyValueImageResolution):
(WebCore::Style::BuilderCustom::applyInheritSize):
(WebCore::Style::BuilderCustom::applyInitialSize):
(WebCore::Style::BuilderCustom::applyValueSize):
(WebCore::Style::BuilderCustom::applyInheritTextIndent):
(WebCore::Style::BuilderCustom::applyInitialTextIndent):
(WebCore::Style::BuilderCustom::applyValueTextIndent):
(WebCore::Style::ApplyPropertyBorderImageModifier::applyInheritValue):
(WebCore::Style::ApplyPropertyBorderImageModifier::applyInitialValue):
(WebCore::Style::ApplyPropertyBorderImageModifier::applyValue):
(WebCore::Style::BuilderCustom::applyInheritLineHeight):
(WebCore::Style::BuilderCustom::applyInitialLineHeight):
(WebCore::Style::BuilderCustom::applyValueLineHeight):
(WebCore::Style::BuilderCustom::applyInheritOutlineStyle):
(WebCore::Style::BuilderCustom::applyInitialOutlineStyle):
(WebCore::Style::BuilderCustom::applyValueOutlineStyle):
(WebCore::Style::BuilderCustom::applyInitialClip):
(WebCore::Style::BuilderCustom::applyInheritClip):
(WebCore::Style::BuilderCustom::applyValueClip):
(WebCore::Style::BuilderCustom::applyValueWebkitLocale):
(WebCore::Style::BuilderCustom::applyValueWritingMode):
(WebCore::Style::BuilderCustom::applyValueWebkitTextOrientation):
(WebCore::Style::BuilderCustom::applyValueWebkitTextSizeAdjust):
(WebCore::Style::BuilderCustom::applyValueWebkitTextZoom):
(WebCore::Style::BuilderCustom::applyValueColorScheme):
(WebCore::Style::BuilderCustom::applyTextOrBoxShadowValue):
(WebCore::Style::BuilderCustom::applyInitialTextShadow):
(WebCore::Style::BuilderCustom::applyInheritTextShadow):
(WebCore::Style::BuilderCustom::applyValueTextShadow):
(WebCore::Style::BuilderCustom::applyInitialBoxShadow):
(WebCore::Style::BuilderCustom::applyInheritBoxShadow):
(WebCore::Style::BuilderCustom::applyValueBoxShadow):
(WebCore::Style::BuilderCustom::applyInitialWebkitBoxShadow):
(WebCore::Style::BuilderCustom::applyInheritWebkitBoxShadow):
(WebCore::Style::BuilderCustom::applyValueWebkitBoxShadow):
(WebCore::Style::BuilderCustom::applyInitialFontFamily):
(WebCore::Style::BuilderCustom::applyInheritFontFamily):
(WebCore::Style::BuilderCustom::applyValueFontFamily):
(WebCore::Style::BuilderCustom::isValidDisplayValue):
(WebCore::Style::BuilderCustom::applyInheritDisplay):
(WebCore::Style::BuilderCustom::applyValueDisplay):
(WebCore::Style::BuilderCustom::applyValueBaselineShift):
(WebCore::Style::BuilderCustom::applyInitialWebkitAspectRatio):
(WebCore::Style::BuilderCustom::applyInheritWebkitAspectRatio):
(WebCore::Style::BuilderCustom::applyValueWebkitAspectRatio):
(WebCore::Style::BuilderCustom::applyInitialWebkitTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyInheritWebkitTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyValueWebkitTextEmphasisStyle):
(WebCore::Style::BuilderCustom::applyInheritCounter):
(WebCore::Style::BuilderCustom::applyValueCounter):
(WebCore::Style::BuilderCustom::applyInitialCounterIncrement):
(WebCore::Style::BuilderCustom::applyInheritCounterIncrement):
(WebCore::Style::BuilderCustom::applyValueCounterIncrement):
(WebCore::Style::BuilderCustom::applyInitialCounterReset):
(WebCore::Style::BuilderCustom::applyInheritCounterReset):
(WebCore::Style::BuilderCustom::applyValueCounterReset):
(WebCore::Style::BuilderCustom::applyInitialCursor):
(WebCore::Style::BuilderCustom::applyInheritCursor):
(WebCore::Style::BuilderCustom::applyValueCursor):
(WebCore::Style::BuilderCustom::applyInitialFill):
(WebCore::Style::BuilderCustom::applyInheritFill):
(WebCore::Style::BuilderCustom::applyValueFill):
(WebCore::Style::BuilderCustom::applyInitialStroke):
(WebCore::Style::BuilderCustom::applyInheritStroke):
(WebCore::Style::BuilderCustom::applyValueStroke):
(WebCore::Style::BuilderCustom::applyInitialContent):
(WebCore::Style::BuilderCustom::applyInheritContent):
(WebCore::Style::BuilderCustom::applyValueContent):
(WebCore::Style::BuilderCustom::applyInheritFontVariantLigatures):
(WebCore::Style::BuilderCustom::applyInitialFontVariantLigatures):
(WebCore::Style::BuilderCustom::applyValueFontVariantLigatures):
(WebCore::Style::BuilderCustom::applyInheritFontVariantNumeric):
(WebCore::Style::BuilderCustom::applyInitialFontVariantNumeric):
(WebCore::Style::BuilderCustom::applyValueFontVariantNumeric):
(WebCore::Style::BuilderCustom::applyInheritFontVariantEastAsian):
(WebCore::Style::BuilderCustom::applyInitialFontVariantEastAsian):
(WebCore::Style::BuilderCustom::applyValueFontVariantEastAsian):
(WebCore::Style::BuilderCustom::applyInitialFontSize):
(WebCore::Style::BuilderCustom::applyInheritFontSize):
(WebCore::Style::BuilderCustom::largerFontSize):
(WebCore::Style::BuilderCustom::smallerFontSize):
(WebCore::Style::BuilderCustom::determineRubyTextSizeMultiplier):
(WebCore::Style::BuilderCustom::applyInitialFontStyle):
(WebCore::Style::BuilderCustom::applyInheritFontStyle):
(WebCore::Style::BuilderCustom::applyValueFontStyle):
(WebCore::Style::BuilderCustom::applyValueFontSize):
(WebCore::Style::BuilderCustom::applyInitialGridTemplateAreas):
(WebCore::Style::BuilderCustom::applyInheritGridTemplateAreas):
(WebCore::Style::BuilderCustom::applyValueGridTemplateAreas):
(WebCore::Style::BuilderCustom::applyInitialGridTemplateColumns):
(WebCore::Style::BuilderCustom::applyInheritGridTemplateColumns):
(WebCore::Style::BuilderCustom::applyValueGridTemplateColumns):
(WebCore::Style::BuilderCustom::applyInitialGridTemplateRows):
(WebCore::Style::BuilderCustom::applyInheritGridTemplateRows):
(WebCore::Style::BuilderCustom::applyValueGridTemplateRows):
(WebCore::Style::BuilderCustom::applyValueAlt):
(WebCore::Style::BuilderCustom::applyValueWillChange):
(WebCore::Style::BuilderCustom::applyValueStrokeWidth):
(WebCore::Style::BuilderCustom::applyValueStrokeColor):
(WebCore::Style::BuilderCustom::applyInitialCustomProperty):
(WebCore::Style::BuilderCustom::applyInheritCustomProperty):
(WebCore::Style::BuilderCustom::applyValueCustomProperty):

  • style/StyleBuilderGenerated.h: Added.
Location:
trunk/Source/WebCore
Files:
1 added
1 deleted
11 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r251318 r251841  
    17241724# Generate CSS property names
    17251725add_custom_command(
    1726     OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CSSProperties.json ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilder.cpp ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.h ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.cpp
     1726    OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/CSSProperties.json ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.h ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.gperf ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilderGenerated.cpp ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.h ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.cpp
    17271727    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
    17281728    DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
     
    17321732    VERBATIM)
    17331733list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp)
    1734 list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilder.cpp)
     1734list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilderGenerated.cpp)
    17351735list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.cpp)
    17361736ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
  • trunk/Source/WebCore/ChangeLog

    r251840 r251841  
     12019-10-31  Antti Koivisto  <antti@apple.com>
     2
     3        Rename StyleBuilder to Style::BuilderGenerated
     4        https://bugs.webkit.org/show_bug.cgi?id=203673
     5
     6        Reviewed by Antoine Quint.
     7
     8        Also rename the related StykeBuilderCustom and StyleBuilderConverter classes
     9        and move them to the Style namespace and directory.
     10
     11        * Sources.txt:
     12        * WebCore.xcodeproj/project.pbxproj:
     13        * css/CSSFontFace.cpp:
     14        (WebCore::calculateWeightRange):
     15        (WebCore::calculateStretchRange):
     16        (WebCore::calculateItalicRange):
     17        * css/CSSFontFaceSet.cpp:
     18        (WebCore::computeFontSelectionRequest):
     19        * css/CSSToStyleMap.cpp:
     20        (WebCore::CSSToStyleMap::mapFillXPosition):
     21        (WebCore::CSSToStyleMap::mapFillYPosition):
     22        * css/StyleBuilder.h: Removed.
     23        * css/makeprop.pl:
     24        (getScopeForFunction):
     25        (generateInitialValueSetter):
     26        (generateInheritValueSetter):
     27        (generateValueSetter):
     28        * css/parser/CSSPropertyParser.cpp:
     29        (WebCore::CSSPropertyParser::parseTypedCustomPropertyValue):
     30        * style/PropertyCascade.cpp:
     31        (WebCore::Style::PropertyCascade::applyProperty):
     32        * style/StyleBuilderConverter.h: Renamed from Source/WebCore/css/StyleBuilderConverter.h.
     33        (WebCore::Style::BuilderConverter::convertLength):
     34        (WebCore::Style::BuilderConverter::convertLengthOrAuto):
     35        (WebCore::Style::BuilderConverter::convertLengthSizing):
     36        (WebCore::Style::BuilderConverter::convertLengthMaxSizing):
     37        (WebCore::Style::BuilderConverter::convertTabSize):
     38        (WebCore::Style::BuilderConverter::convertComputedLength):
     39        (WebCore::Style::BuilderConverter::convertLineWidth):
     40        (WebCore::Style::BuilderConverter::convertSpacing):
     41        (WebCore::Style::BuilderConverter::convertToRadiusLength):
     42        (WebCore::Style::BuilderConverter::convertRadius):
     43        (WebCore::Style::BuilderConverter::convertTo100PercentMinusLength):
     44        (WebCore::Style::BuilderConverter::convertPositionComponentX):
     45        (WebCore::Style::BuilderConverter::convertPositionComponentY):
     46        (WebCore::Style::BuilderConverter::convertPositionComponent):
     47        (WebCore::Style::BuilderConverter::convertObjectPosition):
     48        (WebCore::Style::BuilderConverter::convertTextDecoration):
     49        (WebCore::Style::BuilderConverter::convertNumber):
     50        (WebCore::Style::BuilderConverter::convertNumberOrAuto):
     51        (WebCore::Style::BuilderConverter::convertWebkitHyphenateLimitLines):
     52        (WebCore::Style::BuilderConverter::convertBorderImage):
     53        (WebCore::Style::BuilderConverter::convertBorderMask):
     54        (WebCore::Style::BuilderConverter::convertStyleImage):
     55        (WebCore::Style::BuilderConverter::convertTransform):
     56        (WebCore::Style::BuilderConverter::updateColorScheme):
     57        (WebCore::Style::BuilderConverter::convertColorScheme):
     58        (WebCore::Style::BuilderConverter::convertString):
     59        (WebCore::Style::BuilderConverter::convertStringOrAuto):
     60        (WebCore::Style::BuilderConverter::convertStringOrNone):
     61        (WebCore::Style::BuilderConverter::valueToEmphasisPosition):
     62        (WebCore::Style::BuilderConverter::convertTextEmphasisPosition):
     63        (WebCore::Style::BuilderConverter::convertTextAlign):
     64        (WebCore::Style::BuilderConverter::convertClipPath):
     65        (WebCore::Style::BuilderConverter::convertResize):
     66        (WebCore::Style::BuilderConverter::convertMarqueeRepetition):
     67        (WebCore::Style::BuilderConverter::convertMarqueeSpeed):
     68        (WebCore::Style::BuilderConverter::convertQuotes):
     69        (WebCore::Style::BuilderConverter::convertTextUnderlinePosition):
     70        (WebCore::Style::BuilderConverter::convertTextUnderlineOffset):
     71        (WebCore::Style::BuilderConverter::convertTextDecorationThickness):
     72        (WebCore::Style::BuilderConverter::convertReflection):
     73        (WebCore::Style::BuilderConverter::convertInitialLetter):
     74        (WebCore::Style::BuilderConverter::convertTextStrokeWidth):
     75        (WebCore::Style::BuilderConverter::convertLineBoxContain):
     76        (WebCore::Style::BuilderConverter::valueToDecorationSkip):
     77        (WebCore::Style::BuilderConverter::convertTextDecorationSkip):
     78        (WebCore::Style::BuilderConverter::convertShapeValue):
     79        (WebCore::Style::BuilderConverter::convertScrollSnapType):
     80        (WebCore::Style::BuilderConverter::convertScrollSnapAlign):
     81        (WebCore::Style::BuilderConverter::createGridTrackBreadth):
     82        (WebCore::Style::BuilderConverter::createGridTrackSize):
     83        (WebCore::Style::BuilderConverter::createGridTrackList):
     84        (WebCore::Style::BuilderConverter::createGridPosition):
     85        (WebCore::Style::BuilderConverter::createImplicitNamedGridLinesFromGridArea):
     86        (WebCore::Style::BuilderConverter::convertGridTrackSizeList):
     87        (WebCore::Style::BuilderConverter::convertGridTrackSize):
     88        (WebCore::Style::BuilderConverter::convertGridPosition):
     89        (WebCore::Style::BuilderConverter::convertGridAutoFlow):
     90        (WebCore::Style::BuilderConverter::csstoLengthConversionDataWithTextZoomFactor):
     91        (WebCore::Style::BuilderConverter::convertWordSpacing):
     92        (WebCore::Style::BuilderConverter::convertPerspective):
     93        (WebCore::Style::BuilderConverter::convertMarqueeIncrement):
     94        (WebCore::Style::BuilderConverter::convertFilterOperations):
     95        (WebCore::Style::BuilderConverter::convertFontFeatureSettings):
     96        (WebCore::Style::BuilderConverter::convertFontWeightFromValue):
     97        (WebCore::Style::BuilderConverter::convertFontStretchFromValue):
     98        (WebCore::Style::BuilderConverter::convertFontStyleFromValue):
     99        (WebCore::Style::BuilderConverter::convertFontWeight):
     100        (WebCore::Style::BuilderConverter::convertFontStretch):
     101        (WebCore::Style::BuilderConverter::convertFontVariationSettings):
     102        (WebCore::Style::BuilderConverter::convertTouchCallout):
     103        (WebCore::Style::BuilderConverter::convertTapHighlightColor):
     104        (WebCore::Style::BuilderConverter::convertTouchAction):
     105        (WebCore::Style::BuilderConverter::convertOverflowScrolling):
     106        (WebCore::Style::BuilderConverter::convertSVGLengthValue):
     107        (WebCore::Style::BuilderConverter::convertSVGLengthVector):
     108        (WebCore::Style::BuilderConverter::convertStrokeDashArray):
     109        (WebCore::Style::BuilderConverter::convertPaintOrder):
     110        (WebCore::Style::BuilderConverter::convertOpacity):
     111        (WebCore::Style::BuilderConverter::convertSVGURIReference):
     112        (WebCore::Style::BuilderConverter::convertSVGColor):
     113        (WebCore::Style::BuilderConverter::convertSelfOrDefaultAlignmentData):
     114        (WebCore::Style::BuilderConverter::convertContentAlignmentData):
     115        (WebCore::Style::BuilderConverter::convertGlyphOrientation):
     116        (WebCore::Style::BuilderConverter::convertGlyphOrientationOrAuto):
     117        (WebCore::Style::BuilderConverter::convertLineHeight):
     118        (WebCore::Style::BuilderConverter::convertFontSynthesis):
     119        (WebCore::Style::BuilderConverter::convertSpeakAs):
     120        (WebCore::Style::BuilderConverter::convertHangingPunctuation):
     121        (WebCore::Style::BuilderConverter::convertGapLength):
     122        * style/StyleBuilderCustom.h: Renamed from Source/WebCore/css/StyleBuilderCustom.h.
     123        (WebCore::Style::BuilderCustom::applyInitialWebkitMaskImage):
     124        (WebCore::Style::BuilderCustom::applyInheritWebkitMaskImage):
     125        (WebCore::Style::BuilderCustom::applyInitialFontFeatureSettings):
     126        (WebCore::Style::BuilderCustom::applyInheritFontFeatureSettings):
     127        (WebCore::Style::BuilderCustom::applyInitialFontVariationSettings):
     128        (WebCore::Style::BuilderCustom::applyInheritFontVariationSettings):
     129        (WebCore::Style::BuilderCustom::applyValueDirection):
     130        (WebCore::Style::BuilderCustom::applyInitialTextAlign):
     131        (WebCore::Style::BuilderCustom::applyValueTextAlign):
     132        (WebCore::Style::BuilderCustom::resetEffectiveZoom):
     133        (WebCore::Style::BuilderCustom::applyInitialZoom):
     134        (WebCore::Style::BuilderCustom::applyInheritZoom):
     135        (WebCore::Style::BuilderCustom::applyValueZoom):
     136        (WebCore::Style::BuilderCustom::mmLength):
     137        (WebCore::Style::BuilderCustom::inchLength):
     138        (WebCore::Style::BuilderCustom::getPageSizeFromName):
     139        (WebCore::Style::BuilderCustom::applyValueVerticalAlign):
     140        (WebCore::Style::BuilderCustom::applyInheritImageResolution):
     141        (WebCore::Style::BuilderCustom::applyInitialImageResolution):
     142        (WebCore::Style::BuilderCustom::applyValueImageResolution):
     143        (WebCore::Style::BuilderCustom::applyInheritSize):
     144        (WebCore::Style::BuilderCustom::applyInitialSize):
     145        (WebCore::Style::BuilderCustom::applyValueSize):
     146        (WebCore::Style::BuilderCustom::applyInheritTextIndent):
     147        (WebCore::Style::BuilderCustom::applyInitialTextIndent):
     148        (WebCore::Style::BuilderCustom::applyValueTextIndent):
     149        (WebCore::Style::ApplyPropertyBorderImageModifier::applyInheritValue):
     150        (WebCore::Style::ApplyPropertyBorderImageModifier::applyInitialValue):
     151        (WebCore::Style::ApplyPropertyBorderImageModifier::applyValue):
     152        (WebCore::Style::BuilderCustom::applyInheritLineHeight):
     153        (WebCore::Style::BuilderCustom::applyInitialLineHeight):
     154        (WebCore::Style::BuilderCustom::applyValueLineHeight):
     155        (WebCore::Style::BuilderCustom::applyInheritOutlineStyle):
     156        (WebCore::Style::BuilderCustom::applyInitialOutlineStyle):
     157        (WebCore::Style::BuilderCustom::applyValueOutlineStyle):
     158        (WebCore::Style::BuilderCustom::applyInitialClip):
     159        (WebCore::Style::BuilderCustom::applyInheritClip):
     160        (WebCore::Style::BuilderCustom::applyValueClip):
     161        (WebCore::Style::BuilderCustom::applyValueWebkitLocale):
     162        (WebCore::Style::BuilderCustom::applyValueWritingMode):
     163        (WebCore::Style::BuilderCustom::applyValueWebkitTextOrientation):
     164        (WebCore::Style::BuilderCustom::applyValueWebkitTextSizeAdjust):
     165        (WebCore::Style::BuilderCustom::applyValueWebkitTextZoom):
     166        (WebCore::Style::BuilderCustom::applyValueColorScheme):
     167        (WebCore::Style::BuilderCustom::applyTextOrBoxShadowValue):
     168        (WebCore::Style::BuilderCustom::applyInitialTextShadow):
     169        (WebCore::Style::BuilderCustom::applyInheritTextShadow):
     170        (WebCore::Style::BuilderCustom::applyValueTextShadow):
     171        (WebCore::Style::BuilderCustom::applyInitialBoxShadow):
     172        (WebCore::Style::BuilderCustom::applyInheritBoxShadow):
     173        (WebCore::Style::BuilderCustom::applyValueBoxShadow):
     174        (WebCore::Style::BuilderCustom::applyInitialWebkitBoxShadow):
     175        (WebCore::Style::BuilderCustom::applyInheritWebkitBoxShadow):
     176        (WebCore::Style::BuilderCustom::applyValueWebkitBoxShadow):
     177        (WebCore::Style::BuilderCustom::applyInitialFontFamily):
     178        (WebCore::Style::BuilderCustom::applyInheritFontFamily):
     179        (WebCore::Style::BuilderCustom::applyValueFontFamily):
     180        (WebCore::Style::BuilderCustom::isValidDisplayValue):
     181        (WebCore::Style::BuilderCustom::applyInheritDisplay):
     182        (WebCore::Style::BuilderCustom::applyValueDisplay):
     183        (WebCore::Style::BuilderCustom::applyValueBaselineShift):
     184        (WebCore::Style::BuilderCustom::applyInitialWebkitAspectRatio):
     185        (WebCore::Style::BuilderCustom::applyInheritWebkitAspectRatio):
     186        (WebCore::Style::BuilderCustom::applyValueWebkitAspectRatio):
     187        (WebCore::Style::BuilderCustom::applyInitialWebkitTextEmphasisStyle):
     188        (WebCore::Style::BuilderCustom::applyInheritWebkitTextEmphasisStyle):
     189        (WebCore::Style::BuilderCustom::applyValueWebkitTextEmphasisStyle):
     190        (WebCore::Style::BuilderCustom::applyInheritCounter):
     191        (WebCore::Style::BuilderCustom::applyValueCounter):
     192        (WebCore::Style::BuilderCustom::applyInitialCounterIncrement):
     193        (WebCore::Style::BuilderCustom::applyInheritCounterIncrement):
     194        (WebCore::Style::BuilderCustom::applyValueCounterIncrement):
     195        (WebCore::Style::BuilderCustom::applyInitialCounterReset):
     196        (WebCore::Style::BuilderCustom::applyInheritCounterReset):
     197        (WebCore::Style::BuilderCustom::applyValueCounterReset):
     198        (WebCore::Style::BuilderCustom::applyInitialCursor):
     199        (WebCore::Style::BuilderCustom::applyInheritCursor):
     200        (WebCore::Style::BuilderCustom::applyValueCursor):
     201        (WebCore::Style::BuilderCustom::applyInitialFill):
     202        (WebCore::Style::BuilderCustom::applyInheritFill):
     203        (WebCore::Style::BuilderCustom::applyValueFill):
     204        (WebCore::Style::BuilderCustom::applyInitialStroke):
     205        (WebCore::Style::BuilderCustom::applyInheritStroke):
     206        (WebCore::Style::BuilderCustom::applyValueStroke):
     207        (WebCore::Style::BuilderCustom::applyInitialContent):
     208        (WebCore::Style::BuilderCustom::applyInheritContent):
     209        (WebCore::Style::BuilderCustom::applyValueContent):
     210        (WebCore::Style::BuilderCustom::applyInheritFontVariantLigatures):
     211        (WebCore::Style::BuilderCustom::applyInitialFontVariantLigatures):
     212        (WebCore::Style::BuilderCustom::applyValueFontVariantLigatures):
     213        (WebCore::Style::BuilderCustom::applyInheritFontVariantNumeric):
     214        (WebCore::Style::BuilderCustom::applyInitialFontVariantNumeric):
     215        (WebCore::Style::BuilderCustom::applyValueFontVariantNumeric):
     216        (WebCore::Style::BuilderCustom::applyInheritFontVariantEastAsian):
     217        (WebCore::Style::BuilderCustom::applyInitialFontVariantEastAsian):
     218        (WebCore::Style::BuilderCustom::applyValueFontVariantEastAsian):
     219        (WebCore::Style::BuilderCustom::applyInitialFontSize):
     220        (WebCore::Style::BuilderCustom::applyInheritFontSize):
     221        (WebCore::Style::BuilderCustom::largerFontSize):
     222        (WebCore::Style::BuilderCustom::smallerFontSize):
     223        (WebCore::Style::BuilderCustom::determineRubyTextSizeMultiplier):
     224        (WebCore::Style::BuilderCustom::applyInitialFontStyle):
     225        (WebCore::Style::BuilderCustom::applyInheritFontStyle):
     226        (WebCore::Style::BuilderCustom::applyValueFontStyle):
     227        (WebCore::Style::BuilderCustom::applyValueFontSize):
     228        (WebCore::Style::BuilderCustom::applyInitialGridTemplateAreas):
     229        (WebCore::Style::BuilderCustom::applyInheritGridTemplateAreas):
     230        (WebCore::Style::BuilderCustom::applyValueGridTemplateAreas):
     231        (WebCore::Style::BuilderCustom::applyInitialGridTemplateColumns):
     232        (WebCore::Style::BuilderCustom::applyInheritGridTemplateColumns):
     233        (WebCore::Style::BuilderCustom::applyValueGridTemplateColumns):
     234        (WebCore::Style::BuilderCustom::applyInitialGridTemplateRows):
     235        (WebCore::Style::BuilderCustom::applyInheritGridTemplateRows):
     236        (WebCore::Style::BuilderCustom::applyValueGridTemplateRows):
     237        (WebCore::Style::BuilderCustom::applyValueAlt):
     238        (WebCore::Style::BuilderCustom::applyValueWillChange):
     239        (WebCore::Style::BuilderCustom::applyValueStrokeWidth):
     240        (WebCore::Style::BuilderCustom::applyValueStrokeColor):
     241        (WebCore::Style::BuilderCustom::applyInitialCustomProperty):
     242        (WebCore::Style::BuilderCustom::applyInheritCustomProperty):
     243        (WebCore::Style::BuilderCustom::applyValueCustomProperty):
     244        * style/StyleBuilderGenerated.h: Added.
     245
    12462019-10-31  Antoine Quint  <graouts@apple.com>
    2247
  • trunk/Source/WebCore/DerivedSources.make

    r251737 r251841  
    12901290    SelectorPseudoClassAndCompatibilityElementMap.cpp \
    12911291    SelectorPseudoElementTypeMap.cpp \
    1292     StyleBuilder.cpp \
     1292    StyleBuilderGenerated.cpp \
    12931293    StylePropertyShorthandFunctions.cpp \
    12941294    StylePropertyShorthandFunctions.h \
     
    13391339    CSSPropertyNames.cpp \
    13401340    CSSPropertyNames.h \
    1341     StyleBuilder.cpp \
     1341    StyleBuilderGenerated.cpp \
    13421342    StylePropertyShorthandFunctions.cpp \
    13431343    StylePropertyShorthandFunctions.h \
  • trunk/Source/WebCore/Sources.txt

    r251796 r251841  
    26032603PlugInsResourcesData.cpp
    26042604SVGElementFactory.cpp
    2605 StyleBuilder.cpp
     2605StyleBuilderGenerated.cpp
    26062606StylePropertyShorthandFunctions.cpp
    26072607UserAgentStyleSheetsData.cpp
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r251834 r251841  
    24172417                837D46271FA2A8CE0054E1FA /* ServiceWorkerClientIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 837D46251FA2A8C50054E1FA /* ServiceWorkerClientIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
    24182418                837FB3451F9EA06D00D0FC31 /* ExtendableMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 837FB3401F9EA06600D0FC31 /* ExtendableMessageEvent.h */; };
    2419                 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */; };
    24202419                838867351D13BA5F003697D0 /* RenderObjectEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 838867341D13BA59003697D0 /* RenderObjectEnums.h */; settings = {ATTRIBUTES = (Private, ); }; };
    24212420                838CA6BD1FC0DFE9005D9FA5 /* ServiceWorkerJobDataIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 838CA6BB1FC0DFDD005D9FA5 /* ServiceWorkerJobDataIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    48444843                E4ABABF32368B95900FA4345 /* StyleBuilderState.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABF22368B95800FA4345 /* StyleBuilderState.h */; };
    48454844                E4ABABF52368C6EF00FA4345 /* CascadeLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABF42368C6EF00FA4345 /* CascadeLevel.h */; };
     4845                E4ABAC04236AE95900FA4345 /* StyleBuilderGenerated.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABAC02236AE95800FA4345 /* StyleBuilderGenerated.h */; };
    48464846                E4AE7C1617D1BB950009FB31 /* ElementIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AE7C1517D1BB950009FB31 /* ElementIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
    48474847                E4AE7C1A17D232350009FB31 /* ElementAncestorIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AE7C1917D232350009FB31 /* ElementAncestorIterator.h */; settings = {ATTRIBUTES = (Private, ); }; };
     
    1017810178                837FB3421F9EA06700D0FC31 /* ExtendableMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendableMessageEvent.cpp; sourceTree = "<group>"; };
    1017910179                837FB3431F9EA06800D0FC31 /* ExtendableMessageEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ExtendableMessageEvent.idl; sourceTree = "<group>"; };
    10180                 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilder.h; sourceTree = "<group>"; };
    10181                 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleBuilder.cpp; path = DerivedSources/WebCore/StyleBuilder.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
     10180                8386A96E19F61E4F00E1EC4A /* StyleBuilderGenerated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleBuilderGenerated.cpp; path = DerivedSources/WebCore/StyleBuilderGenerated.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
    1018210181                838867341D13BA59003697D0 /* RenderObjectEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectEnums.h; sourceTree = "<group>"; };
    1018310182                838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextCustom.cpp; sourceTree = "<group>"; };
     
    1518115180                E4ABABF22368B95800FA4345 /* StyleBuilderState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilderState.h; sourceTree = "<group>"; };
    1518215181                E4ABABF42368C6EF00FA4345 /* CascadeLevel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CascadeLevel.h; sourceTree = "<group>"; };
     15182                E4ABAC02236AE95800FA4345 /* StyleBuilderGenerated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilderGenerated.h; sourceTree = "<group>"; };
    1518315183                E4AE7C1517D1BB950009FB31 /* ElementIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementIterator.h; sourceTree = "<group>"; };
    1518415184                E4AE7C1917D232350009FB31 /* ElementAncestorIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementAncestorIterator.h; sourceTree = "<group>"; };
     
    2015820158                                9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */,
    2015920159                                9B03D8061BB3110D00B764C9 /* StreamInternalsBuiltins.h */,
    20160                                 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */,
     20160                                8386A96E19F61E4F00E1EC4A /* StyleBuilderGenerated.cpp */,
    2016120161                                83C05A581A686212007E5DEA /* StylePropertyShorthandFunctions.cpp */,
    2016220162                                83C05A591A686212007E5DEA /* StylePropertyShorthandFunctions.h */,
     
    2695926959                                E4ABABE52361A34200FA4345 /* PropertyCascade.cpp */,
    2696026960                                E4ABABE22361A32900FA4345 /* PropertyCascade.h */,
     26961                                83B9687919F8AB83004EF7AF /* StyleBuilderConverter.h */,
     26962                                835D363619FF6193004C93AB /* StyleBuilderCustom.h */,
     26963                                E4ABAC02236AE95800FA4345 /* StyleBuilderGenerated.h */,
    2696126964                                E4ABABF02368B91800FA4345 /* StyleBuilderState.cpp */,
    2696226965                                E4ABABF22368B95800FA4345 /* StyleBuilderState.h */,
     
    2737127374                                26AA0F9A18D2973D00419381 /* SelectorPseudoElementTypeMap.in */,
    2737227375                                43107BE118CC19DE00CC18E8 /* SelectorPseudoTypeMap.h */,
    27373                                 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */,
    27374                                 83B9687919F8AB83004EF7AF /* StyleBuilderConverter.h */,
    27375                                 835D363619FF6193004C93AB /* StyleBuilderCustom.h */,
    2737627376                                941827881D8B242200492764 /* StyleColor.cpp */,
    2737727377                                941827891D8B242200492764 /* StyleColor.h */,
     
    3214332143                                BC5EB6A30E81DC4F00B25965 /* StyleBackgroundData.h in Headers */,
    3214432144                                BC5EB67B0E81D3BE00B25965 /* StyleBoxData.h in Headers */,
    32145                                 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */,
    3214632145                                83B9687B19F8AB83004EF7AF /* StyleBuilderConverter.h in Headers */,
    3214732146                                835D363719FF6193004C93AB /* StyleBuilderCustom.h in Headers */,
     
    3234932348                                B2227AA30D00BF220071B782 /* SVGScriptElement.h in Headers */,
    3235032349                                B2227AA60D00BF220071B782 /* SVGSetElement.h in Headers */,
     32350                                E4ABAC04236AE95900FA4345 /* StyleBuilderGenerated.h in Headers */,
    3235132351                                E4AFD0100DAF335500F5F55C /* SVGSMILElement.h in Headers */,
    3235232352                                B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */,
  • trunk/Source/WebCore/css/CSSFontFace.cpp

    r251413 r251841  
    139139        auto& value0 = downcast<CSSPrimitiveValue>(*valueList.item(0));
    140140        auto& value1 = downcast<CSSPrimitiveValue>(*valueList.item(1));
    141         auto result0 = StyleBuilderConverter::convertFontWeightFromValue(value0);
    142         auto result1 = StyleBuilderConverter::convertFontWeightFromValue(value1);
     141        auto result0 = Style::BuilderConverter::convertFontWeightFromValue(value0);
     142        auto result1 = Style::BuilderConverter::convertFontWeightFromValue(value1);
    143143        return { result0, result1 };
    144144    }
     
    146146    ASSERT(is<CSSPrimitiveValue>(value));
    147147    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
    148     FontSelectionValue result = StyleBuilderConverter::convertFontWeightFromValue(primitiveValue);
     148    FontSelectionValue result = Style::BuilderConverter::convertFontWeightFromValue(primitiveValue);
    149149    return { result, result };
    150150}
     
    177177        auto& value0 = downcast<CSSPrimitiveValue>(*valueList.item(0));
    178178        auto& value1 = downcast<CSSPrimitiveValue>(*valueList.item(1));
    179         auto result0 = StyleBuilderConverter::convertFontStretchFromValue(value0);
    180         auto result1 = StyleBuilderConverter::convertFontStretchFromValue(value1);
     179        auto result0 = Style::BuilderConverter::convertFontStretchFromValue(value0);
     180        auto result1 = Style::BuilderConverter::convertFontStretchFromValue(value1);
    181181        return { result0, result1 };
    182182    }
     
    184184    ASSERT(is<CSSPrimitiveValue>(value));
    185185    const auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
    186     FontSelectionValue result = StyleBuilderConverter::convertFontStretchFromValue(primitiveValue);
     186    FontSelectionValue result = Style::BuilderConverter::convertFontStretchFromValue(primitiveValue);
    187187    return { result, result };
    188188}
     
    207207{
    208208    if (value.isFontStyleValue()) {
    209         auto result = StyleBuilderConverter::convertFontStyleFromValue(value);
     209        auto result = Style::BuilderConverter::convertFontStyleFromValue(value);
    210210        return { result.valueOr(normalItalicValue()), result.valueOr(normalItalicValue()) };
    211211    }
  • trunk/Source/WebCore/css/CSSFontFaceSet.cpp

    r248846 r251841  
    315315        styleValue = CSSFontStyleValue::create(CSSValuePool::singleton().createIdentifierValue(CSSValueNormal));
    316316
    317     auto weightSelectionValue = StyleBuilderConverter::convertFontWeightFromValue(*weightValue);
    318     auto stretchSelectionValue = StyleBuilderConverter::convertFontStretchFromValue(*stretchValue);
    319     auto styleSelectionValue = StyleBuilderConverter::convertFontStyleFromValue(*styleValue);
     317    auto weightSelectionValue = Style::BuilderConverter::convertFontWeightFromValue(*weightValue);
     318    auto stretchSelectionValue = Style::BuilderConverter::convertFontStretchFromValue(*stretchValue);
     319    auto styleSelectionValue = Style::BuilderConverter::convertFontStyleFromValue(*styleValue);
    320320
    321321    return { weightSelectionValue, stretchSelectionValue, styleSelectionValue };
  • trunk/Source/WebCore/css/CSSToStyleMap.cpp

    r251796 r251841  
    232232    if (pair) {
    233233        ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPositionX || propertyID == CSSPropertyWebkitMaskPositionX);
    234         length = StyleBuilderConverter::convertLength(m_builderState, *pair->second());
     234        length = Style::BuilderConverter::convertLength(m_builderState, *pair->second());
    235235    } else
    236         length = StyleBuilderConverter::convertPositionComponentX(m_builderState, value);
     236        length = Style::BuilderConverter::convertPositionComponentX(m_builderState, value);
    237237
    238238    layer.setXPosition(length);
     
    256256    if (pair) {
    257257        ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPositionY || propertyID == CSSPropertyWebkitMaskPositionY);
    258         length = StyleBuilderConverter::convertLength(m_builderState, *pair->second());
     258        length = Style::BuilderConverter::convertLength(m_builderState, *pair->second());
    259259    } else
    260         length = StyleBuilderConverter::convertPositionComponentY(m_builderState, value);
     260        length = Style::BuilderConverter::convertPositionComponentY(m_builderState, value);
    261261   
    262262    layer.setYPosition(length);
  • trunk/Source/WebCore/css/makeprop.pl

    r251796 r251841  
    6767my %propertiesWithStyleBuilderOptions;
    6868my %styleBuilderOptions = (
    69     "animatable" => 1, # Defined in Source/WebCore/css/StyleBuilderConverter.h
     69    "animatable" => 1, # Defined in Source/WebCore/style/StyleBuilderConverter.h
    7070    "auto-functions" => 1,
    7171    "conditional-converter" => 1,
     
    555555
    556556#
    557 # StyleBuilder.cpp generator.
     557# StyleBuilderGenerated.cpp generator.
    558558#
    559559
     
    562562  my $builderFunction = shift;
    563563
    564   return $propertiesWithStyleBuilderOptions{$name}{"custom"}{$builderFunction} ? "StyleBuilderCustom" : "StyleBuilderFunctions";
     564  return $propertiesWithStyleBuilderOptions{$name}{"custom"}{$builderFunction} ? "BuilderCustom" : "BuilderFunctions";
    565565}
    566566
     
    914914  my $isSVG = exists $propertiesWithStyleBuilderOptions{$name}{"svg"};
    915915  my $setterContent = "";
    916   $setterContent .= $indent . "static void applyInitial" . $nameToId{$name} . "(Style::BuilderState& builderState)\n";
     916  $setterContent .= $indent . "static void applyInitial" . $nameToId{$name} . "(BuilderState& builderState)\n";
    917917  $setterContent .= $indent . "{\n";
    918918  my $style = "builderState.style()";
     
    944944
    945945  my $setterContent = "";
    946   $setterContent .= $indent . "static void applyInherit" . $nameToId{$name} . "(Style::BuilderState& builderState)\n";
     946  $setterContent .= $indent . "static void applyInherit" . $nameToId{$name} . "(BuilderState& builderState)\n";
    947947  $setterContent .= $indent . "{\n";
    948948  my $isSVG = exists $propertiesWithStyleBuilderOptions{$name}{"svg"};
     
    991991
    992992  my $setterContent = "";
    993   $setterContent .= $indent . "static void applyValue" . $nameToId{$name} . "(Style::BuilderState& builderState, CSSValue& value)\n";
     993  $setterContent .= $indent . "static void applyValue" . $nameToId{$name} . "(BuilderState& builderState, CSSValue& value)\n";
    994994  $setterContent .= $indent . "{\n";
    995995  my $convertedValue;
    996996  if (exists($propertiesWithStyleBuilderOptions{$name}{"converter"})) {
    997     $convertedValue = "StyleBuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"converter"} . "(builderState, value)";
     997    $convertedValue = "BuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"converter"} . "(builderState, value)";
    998998  } elsif (exists($propertiesWithStyleBuilderOptions{$name}{"conditional-converter"})) {
    999     $setterContent .= $indent . "    auto convertedValue = StyleBuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"conditional-converter"} . "(builderState, value);\n";
     999    $setterContent .= $indent . "    auto convertedValue = BuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"conditional-converter"} . "(builderState, value);\n";
    10001000    $convertedValue = "WTFMove(convertedValue.value())";
    10011001  } else {
     
    10431043}
    10441044
    1045 open STYLEBUILDER, ">StyleBuilder.cpp" || die "Could not open StyleBuilder.cpp for writing";
     1045open STYLEBUILDER, ">StyleBuilderGenerated.cpp" || die "Could not open StyleBuilderGenerated.cpp for writing";
    10461046print STYLEBUILDER << "EOF";
    10471047/* This file is automatically generated from $inputFile by makeprop, do not edit */
    10481048
    10491049#include "config.h"
    1050 #include "StyleBuilder.h"
     1050#include "StyleBuilderGenerated.h"
    10511051
    10521052#include "CSSPrimitiveValueMappings.h"
     
    10591059
    10601060namespace WebCore {
    1061 
    1062 class StyleBuilderFunctions {
     1061namespace Style {
     1062
     1063class BuilderFunctions {
    10631064public:
    10641065EOF
     
    10841085};
    10851086
    1086 void StyleBuilder::applyProperty(CSSPropertyID property, Style::BuilderState& builderState, CSSValue& value, bool isInitial, bool isInherit, const CSSRegisteredCustomProperty* registered)
     1087void BuilderGenerated::applyProperty(CSSPropertyID property, BuilderState& builderState, CSSValue& value, bool isInitial, bool isInherit, const CSSRegisteredCustomProperty* registered)
    10871088{
    10881089    switch (property) {
     
    10921093        auto& customProperty = downcast<CSSCustomPropertyValue>(value);
    10931094        if (isInitial)
    1094             StyleBuilderCustom::applyInitialCustomProperty(builderState, registered, customProperty.name());
     1095            BuilderCustom::applyInitialCustomProperty(builderState, registered, customProperty.name());
    10951096        else if (isInherit)
    1096             StyleBuilderCustom::applyInheritCustomProperty(builderState, registered, customProperty.name());
     1097            BuilderCustom::applyInheritCustomProperty(builderState, registered, customProperty.name());
    10971098        else
    1098             StyleBuilderCustom::applyValueCustomProperty(builderState, registered, customProperty);
     1099            BuilderCustom::applyValueCustomProperty(builderState, registered, customProperty);
    10991100        break;
    11001101    }
     
    11211122}
    11221123
     1124} // namespace Style
    11231125} // namespace WebCore
    11241126EOF
  • trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

    r251796 r251841  
    43014301        auto primitiveVal = consumeWidthOrHeight(m_range, m_context);
    43024302        if (primitiveVal && primitiveVal->isPrimitiveValue() && downcast<CSSPrimitiveValue>(*primitiveVal).isLength()) {
    4303             auto length = StyleBuilderConverter::convertLength(builderState, *primitiveVal);
     4303            auto length = Style::BuilderConverter::convertLength(builderState, *primitiveVal);
    43044304            if (!length.isCalculated() && !length.isUndefined())
    43054305                return CSSCustomPropertyValue::createSyntaxLength(name, WTFMove(length));
  • trunk/Source/WebCore/style/PropertyCascade.cpp

    r251796 r251841  
    3131#include "CSSValuePool.h"
    3232#include "PaintWorkletGlobalScope.h"
    33 #include "StyleBuilder.h"
     33#include "StyleBuilderGenerated.h"
    3434#include "StylePropertyShorthand.h"
    3535#include "StyleResolver.h"
     
    625625#endif
    626626
    627     // Use the generated StyleBuilder.
    628     StyleBuilder::applyProperty(id, builderState, valueToApply.get(), isInitial, isInherit, customPropertyRegistered);
     627    BuilderGenerated::applyProperty(id, builderState, valueToApply.get(), isInitial, isInherit, customPropertyRegistered);
    629628}
    630629
  • trunk/Source/WebCore/style/StyleBuilderConverter.h

    r251840 r251841  
    6060
    6161namespace WebCore {
     62namespace Style {
    6263
    6364// Note that we assume the CSS parser only allows valid CSSValue types.
    64 class StyleBuilderConverter {
     65class BuilderConverter {
    6566public:
    66     static Length convertLength(const Style::BuilderState&, const CSSValue&);
    67     static Length convertLengthOrAuto(const Style::BuilderState&, const CSSValue&);
    68     static Length convertLengthSizing(const Style::BuilderState&, const CSSValue&);
    69     static Length convertLengthMaxSizing(const Style::BuilderState&, const CSSValue&);
    70     static TabSize convertTabSize(const Style::BuilderState&, const CSSValue&);
    71     template<typename T> static T convertComputedLength(Style::BuilderState&, const CSSValue&);
    72     template<typename T> static T convertLineWidth(Style::BuilderState&, const CSSValue&);
    73     static float convertSpacing(Style::BuilderState&, const CSSValue&);
    74     static LengthSize convertRadius(Style::BuilderState&, const CSSValue&);
    75     static LengthPoint convertObjectPosition(Style::BuilderState&, const CSSValue&);
    76     static OptionSet<TextDecoration> convertTextDecoration(Style::BuilderState&, const CSSValue&);
    77     template<typename T> static T convertNumber(Style::BuilderState&, const CSSValue&);
    78     template<typename T> static T convertNumberOrAuto(Style::BuilderState&, const CSSValue&);
    79     static short convertWebkitHyphenateLimitLines(Style::BuilderState&, const CSSValue&);
    80     template<CSSPropertyID> static NinePieceImage convertBorderImage(Style::BuilderState&, CSSValue&);
    81     template<CSSPropertyID> static NinePieceImage convertBorderMask(Style::BuilderState&, CSSValue&);
    82     template<CSSPropertyID> static RefPtr<StyleImage> convertStyleImage(Style::BuilderState&, CSSValue&);
    83     static TransformOperations convertTransform(Style::BuilderState&, const CSSValue&);
     67    static Length convertLength(const BuilderState&, const CSSValue&);
     68    static Length convertLengthOrAuto(const BuilderState&, const CSSValue&);
     69    static Length convertLengthSizing(const BuilderState&, const CSSValue&);
     70    static Length convertLengthMaxSizing(const BuilderState&, const CSSValue&);
     71    static TabSize convertTabSize(const BuilderState&, const CSSValue&);
     72    template<typename T> static T convertComputedLength(BuilderState&, const CSSValue&);
     73    template<typename T> static T convertLineWidth(BuilderState&, const CSSValue&);
     74    static float convertSpacing(BuilderState&, const CSSValue&);
     75    static LengthSize convertRadius(BuilderState&, const CSSValue&);
     76    static LengthPoint convertObjectPosition(BuilderState&, const CSSValue&);
     77    static OptionSet<TextDecoration> convertTextDecoration(BuilderState&, const CSSValue&);
     78    template<typename T> static T convertNumber(BuilderState&, const CSSValue&);
     79    template<typename T> static T convertNumberOrAuto(BuilderState&, const CSSValue&);
     80    static short convertWebkitHyphenateLimitLines(BuilderState&, const CSSValue&);
     81    template<CSSPropertyID> static NinePieceImage convertBorderImage(BuilderState&, CSSValue&);
     82    template<CSSPropertyID> static NinePieceImage convertBorderMask(BuilderState&, CSSValue&);
     83    template<CSSPropertyID> static RefPtr<StyleImage> convertStyleImage(BuilderState&, CSSValue&);
     84    static TransformOperations convertTransform(BuilderState&, const CSSValue&);
    8485#if ENABLE(DARK_MODE_CSS)
    85     static StyleColorScheme convertColorScheme(Style::BuilderState&, const CSSValue&);
     86    static StyleColorScheme convertColorScheme(BuilderState&, const CSSValue&);
    8687#endif
    87     static String convertString(Style::BuilderState&, const CSSValue&);
    88     static String convertStringOrAuto(Style::BuilderState&, const CSSValue&);
    89     static String convertStringOrNone(Style::BuilderState&, const CSSValue&);
    90     static OptionSet<TextEmphasisPosition> convertTextEmphasisPosition(Style::BuilderState&, const CSSValue&);
    91     static TextAlignMode convertTextAlign(Style::BuilderState&, const CSSValue&);
    92     static RefPtr<ClipPathOperation> convertClipPath(Style::BuilderState&, const CSSValue&);
    93     static Resize convertResize(Style::BuilderState&, const CSSValue&);
    94     static int convertMarqueeRepetition(Style::BuilderState&, const CSSValue&);
    95     static int convertMarqueeSpeed(Style::BuilderState&, const CSSValue&);
    96     static Ref<QuotesData> convertQuotes(Style::BuilderState&, const CSSValue&);
    97     static TextUnderlinePosition convertTextUnderlinePosition(Style::BuilderState&, const CSSValue&);
    98     static TextUnderlineOffset convertTextUnderlineOffset(Style::BuilderState&, const CSSValue&);
    99     static TextDecorationThickness convertTextDecorationThickness(Style::BuilderState&, const CSSValue&);
    100     static RefPtr<StyleReflection> convertReflection(Style::BuilderState&, const CSSValue&);
    101     static IntSize convertInitialLetter(Style::BuilderState&, const CSSValue&);
    102     static float convertTextStrokeWidth(Style::BuilderState&, const CSSValue&);
    103     static OptionSet<LineBoxContain> convertLineBoxContain(Style::BuilderState&, const CSSValue&);
    104     static OptionSet<TextDecorationSkip> convertTextDecorationSkip(Style::BuilderState&, const CSSValue&);
    105     static RefPtr<ShapeValue> convertShapeValue(Style::BuilderState&, CSSValue&);
     88    static String convertString(BuilderState&, const CSSValue&);
     89    static String convertStringOrAuto(BuilderState&, const CSSValue&);
     90    static String convertStringOrNone(BuilderState&, const CSSValue&);
     91    static OptionSet<TextEmphasisPosition> convertTextEmphasisPosition(BuilderState&, const CSSValue&);
     92    static TextAlignMode convertTextAlign(BuilderState&, const CSSValue&);
     93    static RefPtr<ClipPathOperation> convertClipPath(BuilderState&, const CSSValue&);
     94    static Resize convertResize(BuilderState&, const CSSValue&);
     95    static int convertMarqueeRepetition(BuilderState&, const CSSValue&);
     96    static int convertMarqueeSpeed(BuilderState&, const CSSValue&);
     97    static Ref<QuotesData> convertQuotes(BuilderState&, const CSSValue&);
     98    static TextUnderlinePosition convertTextUnderlinePosition(BuilderState&, const CSSValue&);
     99    static TextUnderlineOffset convertTextUnderlineOffset(BuilderState&, const CSSValue&);
     100    static TextDecorationThickness convertTextDecorationThickness(BuilderState&, const CSSValue&);
     101    static RefPtr<StyleReflection> convertReflection(BuilderState&, const CSSValue&);
     102    static IntSize convertInitialLetter(BuilderState&, const CSSValue&);
     103    static float convertTextStrokeWidth(BuilderState&, const CSSValue&);
     104    static OptionSet<LineBoxContain> convertLineBoxContain(BuilderState&, const CSSValue&);
     105    static OptionSet<TextDecorationSkip> convertTextDecorationSkip(BuilderState&, const CSSValue&);
     106    static RefPtr<ShapeValue> convertShapeValue(BuilderState&, CSSValue&);
    106107#if ENABLE(CSS_SCROLL_SNAP)
    107     static ScrollSnapType convertScrollSnapType(Style::BuilderState&, const CSSValue&);
    108     static ScrollSnapAlign convertScrollSnapAlign(Style::BuilderState&, const CSSValue&);
     108    static ScrollSnapType convertScrollSnapType(BuilderState&, const CSSValue&);
     109    static ScrollSnapAlign convertScrollSnapAlign(BuilderState&, const CSSValue&);
    109110#endif
    110     static GridTrackSize convertGridTrackSize(Style::BuilderState&, const CSSValue&);
    111     static Vector<GridTrackSize> convertGridTrackSizeList(Style::BuilderState&, const CSSValue&);
    112     static Optional<GridPosition> convertGridPosition(Style::BuilderState&, const CSSValue&);
    113     static GridAutoFlow convertGridAutoFlow(Style::BuilderState&, const CSSValue&);
    114     static Optional<Length> convertWordSpacing(Style::BuilderState&, const CSSValue&);
    115     static Optional<float> convertPerspective(Style::BuilderState&, const CSSValue&);
    116     static Optional<Length> convertMarqueeIncrement(Style::BuilderState&, const CSSValue&);
    117     static Optional<FilterOperations> convertFilterOperations(Style::BuilderState&, const CSSValue&);
     111    static GridTrackSize convertGridTrackSize(BuilderState&, const CSSValue&);
     112    static Vector<GridTrackSize> convertGridTrackSizeList(BuilderState&, const CSSValue&);
     113    static Optional<GridPosition> convertGridPosition(BuilderState&, const CSSValue&);
     114    static GridAutoFlow convertGridAutoFlow(BuilderState&, const CSSValue&);
     115    static Optional<Length> convertWordSpacing(BuilderState&, const CSSValue&);
     116    static Optional<float> convertPerspective(BuilderState&, const CSSValue&);
     117    static Optional<Length> convertMarqueeIncrement(BuilderState&, const CSSValue&);
     118    static Optional<FilterOperations> convertFilterOperations(BuilderState&, const CSSValue&);
    118119#if PLATFORM(IOS_FAMILY)
    119     static bool convertTouchCallout(Style::BuilderState&, const CSSValue&);
     120    static bool convertTouchCallout(BuilderState&, const CSSValue&);
    120121#endif
    121122#if ENABLE(TOUCH_EVENTS)
    122     static Color convertTapHighlightColor(Style::BuilderState&, const CSSValue&);
     123    static Color convertTapHighlightColor(BuilderState&, const CSSValue&);
    123124#endif
    124125#if ENABLE(POINTER_EVENTS)
    125     static OptionSet<TouchAction> convertTouchAction(Style::BuilderState&, const CSSValue&);
     126    static OptionSet<TouchAction> convertTouchAction(BuilderState&, const CSSValue&);
    126127#endif
    127128#if ENABLE(OVERFLOW_SCROLLING_TOUCH)
    128     static bool convertOverflowScrolling(Style::BuilderState&, const CSSValue&);
     129    static bool convertOverflowScrolling(BuilderState&, const CSSValue&);
    129130#endif
    130     static FontFeatureSettings convertFontFeatureSettings(Style::BuilderState&, const CSSValue&);
     131    static FontFeatureSettings convertFontFeatureSettings(BuilderState&, const CSSValue&);
    131132    static FontSelectionValue convertFontWeightFromValue(const CSSValue&);
    132133    static FontSelectionValue convertFontStretchFromValue(const CSSValue&);
    133134    static Optional<FontSelectionValue> convertFontStyleFromValue(const CSSValue&);
    134     static FontSelectionValue convertFontWeight(Style::BuilderState&, const CSSValue&);
    135     static FontSelectionValue convertFontStretch(Style::BuilderState&, const CSSValue&);
    136     static FontSelectionValue convertFontStyle(Style::BuilderState&, const CSSValue&);
     135    static FontSelectionValue convertFontWeight(BuilderState&, const CSSValue&);
     136    static FontSelectionValue convertFontStretch(BuilderState&, const CSSValue&);
     137    static FontSelectionValue convertFontStyle(BuilderState&, const CSSValue&);
    137138#if ENABLE(VARIATION_FONTS)
    138     static FontVariationSettings convertFontVariationSettings(Style::BuilderState&, const CSSValue&);
     139    static FontVariationSettings convertFontVariationSettings(BuilderState&, const CSSValue&);
    139140#endif
    140     static SVGLengthValue convertSVGLengthValue(Style::BuilderState&, const CSSValue&);
    141     static Vector<SVGLengthValue> convertSVGLengthVector(Style::BuilderState&, const CSSValue&);
    142     static Vector<SVGLengthValue> convertStrokeDashArray(Style::BuilderState&, const CSSValue&);
    143     static PaintOrder convertPaintOrder(Style::BuilderState&, const CSSValue&);
    144     static float convertOpacity(Style::BuilderState&, const CSSValue&);
    145     static String convertSVGURIReference(Style::BuilderState&, const CSSValue&);
    146     static Color convertSVGColor(Style::BuilderState&, const CSSValue&);
    147     static StyleSelfAlignmentData convertSelfOrDefaultAlignmentData(Style::BuilderState&, const CSSValue&);
    148     static StyleContentAlignmentData convertContentAlignmentData(Style::BuilderState&, const CSSValue&);
    149     static GlyphOrientation convertGlyphOrientation(Style::BuilderState&, const CSSValue&);
    150     static GlyphOrientation convertGlyphOrientationOrAuto(Style::BuilderState&, const CSSValue&);
    151     static Optional<Length> convertLineHeight(Style::BuilderState&, const CSSValue&, float multiplier = 1.f);
    152     static FontSynthesis convertFontSynthesis(Style::BuilderState&, const CSSValue&);
     141    static SVGLengthValue convertSVGLengthValue(BuilderState&, const CSSValue&);
     142    static Vector<SVGLengthValue> convertSVGLengthVector(BuilderState&, const CSSValue&);
     143    static Vector<SVGLengthValue> convertStrokeDashArray(BuilderState&, const CSSValue&);
     144    static PaintOrder convertPaintOrder(BuilderState&, const CSSValue&);
     145    static float convertOpacity(BuilderState&, const CSSValue&);
     146    static String convertSVGURIReference(BuilderState&, const CSSValue&);
     147    static Color convertSVGColor(BuilderState&, const CSSValue&);
     148    static StyleSelfAlignmentData convertSelfOrDefaultAlignmentData(BuilderState&, const CSSValue&);
     149    static StyleContentAlignmentData convertContentAlignmentData(BuilderState&, const CSSValue&);
     150    static GlyphOrientation convertGlyphOrientation(BuilderState&, const CSSValue&);
     151    static GlyphOrientation convertGlyphOrientationOrAuto(BuilderState&, const CSSValue&);
     152    static Optional<Length> convertLineHeight(BuilderState&, const CSSValue&, float multiplier = 1.f);
     153    static FontSynthesis convertFontSynthesis(BuilderState&, const CSSValue&);
    153154   
    154     static BreakBetween convertPageBreakBetween(Style::BuilderState&, const CSSValue&);
    155     static BreakInside convertPageBreakInside(Style::BuilderState&, const CSSValue&);
    156     static BreakBetween convertColumnBreakBetween(Style::BuilderState&, const CSSValue&);
    157     static BreakInside convertColumnBreakInside(Style::BuilderState&, const CSSValue&);
    158 
    159     static OptionSet<HangingPunctuation> convertHangingPunctuation(Style::BuilderState&, const CSSValue&);
    160 
    161     static OptionSet<SpeakAs> convertSpeakAs(Style::BuilderState&, const CSSValue&);
    162 
    163     static Length convertPositionComponentX(Style::BuilderState&, const CSSValue&);
    164     static Length convertPositionComponentY(Style::BuilderState&, const CSSValue&);
    165 
    166     static GapLength convertGapLength(Style::BuilderState&, const CSSValue&);
     155    static BreakBetween convertPageBreakBetween(BuilderState&, const CSSValue&);
     156    static BreakInside convertPageBreakInside(BuilderState&, const CSSValue&);
     157    static BreakBetween convertColumnBreakBetween(BuilderState&, const CSSValue&);
     158    static BreakInside convertColumnBreakInside(BuilderState&, const CSSValue&);
     159
     160    static OptionSet<HangingPunctuation> convertHangingPunctuation(BuilderState&, const CSSValue&);
     161
     162    static OptionSet<SpeakAs> convertSpeakAs(BuilderState&, const CSSValue&);
     163
     164    static Length convertPositionComponentX(BuilderState&, const CSSValue&);
     165    static Length convertPositionComponentY(BuilderState&, const CSSValue&);
     166
     167    static GapLength convertGapLength(BuilderState&, const CSSValue&);
    167168   
    168169private:
    169     friend class StyleBuilderCustom;
     170    friend class BuilderCustom;
    170171
    171172    static Length convertToRadiusLength(CSSToLengthConversionData&, const CSSPrimitiveValue&);
     
    173174    static OptionSet<TextDecorationSkip> valueToDecorationSkip(const CSSPrimitiveValue&);
    174175#if ENABLE(CSS_SCROLL_SNAP)
    175     static Length parseSnapCoordinate(Style::BuilderState&, const CSSValue&);
     176    static Length parseSnapCoordinate(BuilderState&, const CSSValue&);
    176177#endif
    177178
     
    181182
    182183    static Length convertTo100PercentMinusLength(const Length&);
    183     template<CSSValueID, CSSValueID> static Length convertPositionComponent(Style::BuilderState&, const CSSPrimitiveValue&);
    184 
    185     static GridLength createGridTrackBreadth(const CSSPrimitiveValue&, Style::BuilderState&);
    186     static GridTrackSize createGridTrackSize(const CSSValue&, Style::BuilderState&);
     184    template<CSSValueID, CSSValueID> static Length convertPositionComponent(BuilderState&, const CSSPrimitiveValue&);
     185
     186    static GridLength createGridTrackBreadth(const CSSPrimitiveValue&, BuilderState&);
     187    static GridTrackSize createGridTrackSize(const CSSValue&, BuilderState&);
    187188    struct TracksData;
    188     static bool createGridTrackList(const CSSValue&, TracksData&, Style::BuilderState&);
     189    static bool createGridTrackList(const CSSValue&, TracksData&, BuilderState&);
    189190    static bool createGridPosition(const CSSValue&, GridPosition&);
    190191    static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap&, NamedGridLinesMap&, GridTrackSizingDirection);
    191     static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(Style::BuilderState&);
     192    static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(BuilderState&);
    192193};
    193194
    194 inline Length StyleBuilderConverter::convertLength(const Style::BuilderState& builderState, const CSSValue& value)
     195inline Length BuilderConverter::convertLength(const BuilderState& builderState, const CSSValue& value)
    195196{
    196197    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    215216}
    216217
    217 inline Length StyleBuilderConverter::convertLengthOrAuto(const Style::BuilderState& builderState, const CSSValue& value)
     218inline Length BuilderConverter::convertLengthOrAuto(const BuilderState& builderState, const CSSValue& value)
    218219{
    219220    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto)
     
    222223}
    223224
    224 inline Length StyleBuilderConverter::convertLengthSizing(const Style::BuilderState& builderState, const CSSValue& value)
     225inline Length BuilderConverter::convertLengthSizing(const BuilderState& builderState, const CSSValue& value)
    225226{
    226227    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    251252}
    252253
    253 inline Length StyleBuilderConverter::convertLengthMaxSizing(const Style::BuilderState& builderState, const CSSValue& value)
     254inline Length BuilderConverter::convertLengthMaxSizing(const BuilderState& builderState, const CSSValue& value)
    254255{
    255256    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone)
     
    258259}
    259260
    260 inline TabSize StyleBuilderConverter::convertTabSize(const Style::BuilderState& builderState, const CSSValue& value)
     261inline TabSize BuilderConverter::convertTabSize(const BuilderState& builderState, const CSSValue& value)
    261262{
    262263    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    267268
    268269template<typename T>
    269 inline T StyleBuilderConverter::convertComputedLength(Style::BuilderState& builderState, const CSSValue& value)
     270inline T BuilderConverter::convertComputedLength(BuilderState& builderState, const CSSValue& value)
    270271{
    271272    return downcast<CSSPrimitiveValue>(value).computeLength<T>(builderState.cssToLengthConversionData());
     
    273274
    274275template<typename T>
    275 inline T StyleBuilderConverter::convertLineWidth(Style::BuilderState& builderState, const CSSValue& value)
     276inline T BuilderConverter::convertLineWidth(BuilderState& builderState, const CSSValue& value)
    276277{
    277278    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    303304}
    304305
    305 inline float StyleBuilderConverter::convertSpacing(Style::BuilderState& builderState, const CSSValue& value)
     306inline float BuilderConverter::convertSpacing(BuilderState& builderState, const CSSValue& value)
    306307{
    307308    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    315316}
    316317
    317 inline Length StyleBuilderConverter::convertToRadiusLength(CSSToLengthConversionData& conversionData, const CSSPrimitiveValue& value)
     318inline Length BuilderConverter::convertToRadiusLength(CSSToLengthConversionData& conversionData, const CSSPrimitiveValue& value)
    318319{
    319320    if (value.isPercentage())
     
    324325}
    325326
    326 inline LengthSize StyleBuilderConverter::convertRadius(Style::BuilderState& builderState, const CSSValue& value)
     327inline LengthSize BuilderConverter::convertRadius(BuilderState& builderState, const CSSValue& value)
    327328{
    328329    auto* pair = downcast<CSSPrimitiveValue>(value).pairValue();
     
    341342}
    342343
    343 inline Length StyleBuilderConverter::convertTo100PercentMinusLength(const Length& length)
     344inline Length BuilderConverter::convertTo100PercentMinusLength(const Length& length)
    344345{
    345346    if (length.isPercent())
     
    355356}
    356357
    357 inline Length StyleBuilderConverter::convertPositionComponentX(Style::BuilderState& builderState, const CSSValue& value)
     358inline Length BuilderConverter::convertPositionComponentX(BuilderState& builderState, const CSSValue& value)
    358359{
    359360    return convertPositionComponent<CSSValueLeft, CSSValueRight>(builderState, downcast<CSSPrimitiveValue>(value));
    360361}
    361362
    362 inline Length StyleBuilderConverter::convertPositionComponentY(Style::BuilderState& builderState, const CSSValue& value)
     363inline Length BuilderConverter::convertPositionComponentY(BuilderState& builderState, const CSSValue& value)
    363364{
    364365    return convertPositionComponent<CSSValueTop, CSSValueBottom>(builderState, downcast<CSSPrimitiveValue>(value));
     
    366367
    367368template<CSSValueID cssValueFor0, CSSValueID cssValueFor100>
    368 inline Length StyleBuilderConverter::convertPositionComponent(Style::BuilderState& builderState, const CSSPrimitiveValue& value)
     369inline Length BuilderConverter::convertPositionComponent(BuilderState& builderState, const CSSPrimitiveValue& value)
    369370{
    370371    Length length;
     
    401402}
    402403
    403 inline LengthPoint StyleBuilderConverter::convertObjectPosition(Style::BuilderState& builderState, const CSSValue& value)
     404inline LengthPoint BuilderConverter::convertObjectPosition(BuilderState& builderState, const CSSValue& value)
    404405{
    405406    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    414415}
    415416
    416 inline OptionSet<TextDecoration> StyleBuilderConverter::convertTextDecoration(Style::BuilderState&, const CSSValue& value)
     417inline OptionSet<TextDecoration> BuilderConverter::convertTextDecoration(BuilderState&, const CSSValue& value)
    417418{
    418419    auto result = RenderStyle::initialTextDecoration();
     
    425426
    426427template<typename T>
    427 inline T StyleBuilderConverter::convertNumber(Style::BuilderState&, const CSSValue& value)
     428inline T BuilderConverter::convertNumber(BuilderState&, const CSSValue& value)
    428429{
    429430    return downcast<CSSPrimitiveValue>(value).value<T>(CSSPrimitiveValue::CSS_NUMBER);
     
    431432
    432433template<typename T>
    433 inline T StyleBuilderConverter::convertNumberOrAuto(Style::BuilderState& builderState, const CSSValue& value)
     434inline T BuilderConverter::convertNumberOrAuto(BuilderState& builderState, const CSSValue& value)
    434435{
    435436    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto)
     
    438439}
    439440
    440 inline short StyleBuilderConverter::convertWebkitHyphenateLimitLines(Style::BuilderState&, const CSSValue& value)
     441inline short BuilderConverter::convertWebkitHyphenateLimitLines(BuilderState&, const CSSValue& value)
    441442{
    442443    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    447448
    448449template<CSSPropertyID property>
    449 inline NinePieceImage StyleBuilderConverter::convertBorderImage(Style::BuilderState& builderState, CSSValue& value)
     450inline NinePieceImage BuilderConverter::convertBorderImage(BuilderState& builderState, CSSValue& value)
    450451{
    451452    NinePieceImage image;
     
    455456
    456457template<CSSPropertyID property>
    457 inline NinePieceImage StyleBuilderConverter::convertBorderMask(Style::BuilderState& builderState, CSSValue& value)
     458inline NinePieceImage BuilderConverter::convertBorderMask(BuilderState& builderState, CSSValue& value)
    458459{
    459460    NinePieceImage image(NinePieceImage::Type::Mask);
     
    463464
    464465template<CSSPropertyID>
    465 inline RefPtr<StyleImage> StyleBuilderConverter::convertStyleImage(Style::BuilderState& builderState, CSSValue& value)
     466inline RefPtr<StyleImage> BuilderConverter::convertStyleImage(BuilderState& builderState, CSSValue& value)
    466467{
    467468    return builderState.createStyleImage(value);
    468469}
    469470
    470 inline TransformOperations StyleBuilderConverter::convertTransform(Style::BuilderState& builderState, const CSSValue& value)
     471inline TransformOperations BuilderConverter::convertTransform(BuilderState& builderState, const CSSValue& value)
    471472{
    472473    TransformOperations operations;
     
    476477
    477478#if ENABLE(DARK_MODE_CSS)
    478 inline void StyleBuilderConverter::updateColorScheme(const CSSPrimitiveValue& primitiveValue, StyleColorScheme& colorScheme)
     479inline void BuilderConverter::updateColorScheme(const CSSPrimitiveValue& primitiveValue, StyleColorScheme& colorScheme)
    479480{
    480481    ASSERT(primitiveValue.isValueID());
     
    499500}
    500501
    501 inline StyleColorScheme StyleBuilderConverter::convertColorScheme(Style::BuilderState&, const CSSValue& value)
     502inline StyleColorScheme BuilderConverter::convertColorScheme(BuilderState&, const CSSValue& value)
    502503{
    503504    StyleColorScheme colorScheme;
     
    517518#endif
    518519
    519 inline String StyleBuilderConverter::convertString(Style::BuilderState&, const CSSValue& value)
     520inline String BuilderConverter::convertString(BuilderState&, const CSSValue& value)
    520521{
    521522    return downcast<CSSPrimitiveValue>(value).stringValue();
    522523}
    523524
    524 inline String StyleBuilderConverter::convertStringOrAuto(Style::BuilderState& builderState, const CSSValue& value)
     525inline String BuilderConverter::convertStringOrAuto(BuilderState& builderState, const CSSValue& value)
    525526{
    526527    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto)
     
    529530}
    530531
    531 inline String StyleBuilderConverter::convertStringOrNone(Style::BuilderState& builderState, const CSSValue& value)
     532inline String BuilderConverter::convertStringOrNone(BuilderState& builderState, const CSSValue& value)
    532533{
    533534    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone)
     
    536537}
    537538
    538 inline OptionSet<TextEmphasisPosition> StyleBuilderConverter::valueToEmphasisPosition(const CSSPrimitiveValue& primitiveValue)
     539inline OptionSet<TextEmphasisPosition> BuilderConverter::valueToEmphasisPosition(const CSSPrimitiveValue& primitiveValue)
    539540{
    540541    ASSERT(primitiveValue.isValueID());
     
    557558}
    558559
    559 inline OptionSet<TextEmphasisPosition> StyleBuilderConverter::convertTextEmphasisPosition(Style::BuilderState&, const CSSValue& value)
     560inline OptionSet<TextEmphasisPosition> BuilderConverter::convertTextEmphasisPosition(BuilderState&, const CSSValue& value)
    560561{
    561562    if (is<CSSPrimitiveValue>(value))
     
    568569}
    569570
    570 inline TextAlignMode StyleBuilderConverter::convertTextAlign(Style::BuilderState& builderState, const CSSValue& value)
     571inline TextAlignMode BuilderConverter::convertTextAlign(BuilderState& builderState, const CSSValue& value)
    571572{
    572573    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    584585}
    585586
    586 inline RefPtr<ClipPathOperation> StyleBuilderConverter::convertClipPath(Style::BuilderState& builderState, const CSSValue& value)
     587inline RefPtr<ClipPathOperation> BuilderConverter::convertClipPath(BuilderState& builderState, const CSSValue& value)
    587588{
    588589    if (is<CSSPrimitiveValue>(value)) {
     
    628629}
    629630
    630 inline Resize StyleBuilderConverter::convertResize(Style::BuilderState& builderState, const CSSValue& value)
     631inline Resize BuilderConverter::convertResize(BuilderState& builderState, const CSSValue& value)
    631632{
    632633    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    641642}
    642643
    643 inline int StyleBuilderConverter::convertMarqueeRepetition(Style::BuilderState&, const CSSValue& value)
     644inline int BuilderConverter::convertMarqueeRepetition(BuilderState&, const CSSValue& value)
    644645{
    645646    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    651652}
    652653
    653 inline int StyleBuilderConverter::convertMarqueeSpeed(Style::BuilderState&, const CSSValue& value)
     654inline int BuilderConverter::convertMarqueeSpeed(BuilderState&, const CSSValue& value)
    654655{
    655656    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    680681}
    681682
    682 inline Ref<QuotesData> StyleBuilderConverter::convertQuotes(Style::BuilderState&, const CSSValue& value)
     683inline Ref<QuotesData> BuilderConverter::convertQuotes(BuilderState&, const CSSValue& value)
    683684{
    684685    if (is<CSSPrimitiveValue>(value)) {
     
    703704}
    704705
    705 inline TextUnderlinePosition StyleBuilderConverter::convertTextUnderlinePosition(Style::BuilderState&, const CSSValue& value)
     706inline TextUnderlinePosition BuilderConverter::convertTextUnderlinePosition(BuilderState&, const CSSValue& value)
    706707{
    707708    ASSERT(is<CSSPrimitiveValue>(value));
     
    709710}
    710711
    711 inline TextUnderlineOffset StyleBuilderConverter::convertTextUnderlineOffset(Style::BuilderState& builderState, const CSSValue& value)
     712inline TextUnderlineOffset BuilderConverter::convertTextUnderlineOffset(BuilderState& builderState, const CSSValue& value)
    712713{
    713714    ASSERT(is<CSSPrimitiveValue>(value));
     
    723724}
    724725
    725 inline TextDecorationThickness StyleBuilderConverter::convertTextDecorationThickness(Style::BuilderState& builderState, const CSSValue& value)
     726inline TextDecorationThickness BuilderConverter::convertTextDecorationThickness(BuilderState& builderState, const CSSValue& value)
    726727{
    727728    ASSERT(is<CSSPrimitiveValue>(value));
     
    739740}
    740741
    741 inline RefPtr<StyleReflection> StyleBuilderConverter::convertReflection(Style::BuilderState& builderState, const CSSValue& value)
     742inline RefPtr<StyleReflection> BuilderConverter::convertReflection(BuilderState& builderState, const CSSValue& value)
    742743{
    743744    if (is<CSSPrimitiveValue>(value)) {
     
    759760}
    760761
    761 inline IntSize StyleBuilderConverter::convertInitialLetter(Style::BuilderState&, const CSSValue& value)
     762inline IntSize BuilderConverter::convertInitialLetter(BuilderState&, const CSSValue& value)
    762763{
    763764    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    774775}
    775776
    776 inline float StyleBuilderConverter::convertTextStrokeWidth(Style::BuilderState& builderState, const CSSValue& value)
     777inline float BuilderConverter::convertTextStrokeWidth(BuilderState& builderState, const CSSValue& value)
    777778{
    778779    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    804805}
    805806
    806 inline OptionSet<LineBoxContain> StyleBuilderConverter::convertLineBoxContain(Style::BuilderState&, const CSSValue& value)
     807inline OptionSet<LineBoxContain> BuilderConverter::convertLineBoxContain(BuilderState&, const CSSValue& value)
    807808{
    808809    if (is<CSSPrimitiveValue>(value)) {
     
    814815}
    815816
    816 inline OptionSet<TextDecorationSkip> StyleBuilderConverter::valueToDecorationSkip(const CSSPrimitiveValue& primitiveValue)
     817inline OptionSet<TextDecorationSkip> BuilderConverter::valueToDecorationSkip(const CSSPrimitiveValue& primitiveValue)
    817818{
    818819    ASSERT(primitiveValue.isValueID());
     
    835836}
    836837
    837 inline OptionSet<TextDecorationSkip> StyleBuilderConverter::convertTextDecorationSkip(Style::BuilderState&, const CSSValue& value)
     838inline OptionSet<TextDecorationSkip> BuilderConverter::convertTextDecorationSkip(BuilderState&, const CSSValue& value)
    838839{
    839840    if (is<CSSPrimitiveValue>(value))
     
    851852}
    852853
    853 inline RefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(Style::BuilderState& builderState, CSSValue& value)
     854inline RefPtr<ShapeValue> BuilderConverter::convertShapeValue(BuilderState& builderState, CSSValue& value)
    854855{
    855856    if (is<CSSPrimitiveValue>(value)) {
     
    890891#if ENABLE(CSS_SCROLL_SNAP)
    891892
    892 inline ScrollSnapType StyleBuilderConverter::convertScrollSnapType(Style::BuilderState&, const CSSValue& value)
     893inline ScrollSnapType BuilderConverter::convertScrollSnapType(BuilderState&, const CSSValue& value)
    893894{
    894895    ScrollSnapType type;
     
    915916}
    916917
    917 inline ScrollSnapAlign StyleBuilderConverter::convertScrollSnapAlign(Style::BuilderState&, const CSSValue& value)
     918inline ScrollSnapAlign BuilderConverter::convertScrollSnapAlign(BuilderState&, const CSSValue& value)
    918919{
    919920    auto& values = downcast<CSSValueList>(value);
     
    929930#endif
    930931
    931 inline GridLength StyleBuilderConverter::createGridTrackBreadth(const CSSPrimitiveValue& primitiveValue, Style::BuilderState& builderState)
     932inline GridLength BuilderConverter::createGridTrackBreadth(const CSSPrimitiveValue& primitiveValue, BuilderState& builderState)
    932933{
    933934    if (primitiveValue.valueID() == CSSValueMinContent || primitiveValue.valueID() == CSSValueWebkitMinContent)
     
    944945}
    945946
    946 inline GridTrackSize StyleBuilderConverter::createGridTrackSize(const CSSValue& value, Style::BuilderState& builderState)
     947inline GridTrackSize BuilderConverter::createGridTrackSize(const CSSValue& value, BuilderState& builderState)
    947948{
    948949    if (is<CSSPrimitiveValue>(value))
     
    955956        return GridTrackSize(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(0)), builderState), FitContentTrackSizing);
    956957
    957     ASSERT_WITH_SECURITY_IMPLICATION(function.length() == 2);
     958    RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(function.length() == 2);
    958959    GridLength minTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(0)), builderState));
    959960    GridLength maxTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(1)), builderState));
     
    974975}
    975976
    976 struct StyleBuilderConverter::TracksData {
     977struct BuilderConverter::TracksData {
    977978    WTF_MAKE_NONCOPYABLE(TracksData); WTF_MAKE_FAST_ALLOCATED;
    978979public:
     
    989990};
    990991
    991 inline bool StyleBuilderConverter::createGridTrackList(const CSSValue& value, TracksData& tracksData, Style::BuilderState& builderState)
     992inline bool BuilderConverter::createGridTrackList(const CSSValue& value, TracksData& tracksData, BuilderState& builderState)
    992993{
    993994    // Handle 'none'.
     
    10451046}
    10461047
    1047 inline bool StyleBuilderConverter::createGridPosition(const CSSValue& value, GridPosition& position)
     1048inline bool BuilderConverter::createGridPosition(const CSSValue& value, GridPosition& position)
    10481049{
    10491050    // We accept the specification's grammar:
     
    10951096}
    10961097
    1097 inline void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction)
     1098inline void BuilderConverter::createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction)
    10981099{
    10991100    for (auto& area : namedGridAreas) {
     
    11121113}
    11131114
    1114 inline Vector<GridTrackSize> StyleBuilderConverter::convertGridTrackSizeList(Style::BuilderState& builderState, const CSSValue& value)
     1115inline Vector<GridTrackSize> BuilderConverter::convertGridTrackSizeList(BuilderState& builderState, const CSSValue& value)
    11151116{
    11161117    ASSERT(value.isValueList());
     
    11271128}
    11281129
    1129 inline GridTrackSize StyleBuilderConverter::convertGridTrackSize(Style::BuilderState& builderState, const CSSValue& value)
     1130inline GridTrackSize BuilderConverter::convertGridTrackSize(BuilderState& builderState, const CSSValue& value)
    11301131{
    11311132    return createGridTrackSize(value, builderState);
    11321133}
    11331134
    1134 inline Optional<GridPosition> StyleBuilderConverter::convertGridPosition(Style::BuilderState&, const CSSValue& value)
     1135inline Optional<GridPosition> BuilderConverter::convertGridPosition(BuilderState&, const CSSValue& value)
    11351136{
    11361137    GridPosition gridPosition;
     
    11401141}
    11411142
    1142 inline GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(Style::BuilderState&, const CSSValue& value)
     1143inline GridAutoFlow BuilderConverter::convertGridAutoFlow(BuilderState&, const CSSValue& value)
    11431144{
    11441145    auto& list = downcast<CSSValueList>(value);
     
    11781179}
    11791180
    1180 inline CSSToLengthConversionData StyleBuilderConverter::csstoLengthConversionDataWithTextZoomFactor(Style::BuilderState& builderState)
     1181inline CSSToLengthConversionData BuilderConverter::csstoLengthConversionDataWithTextZoomFactor(BuilderState& builderState)
    11811182{
    11821183    if (auto* frame = builderState.document().frame()) {
     
    11871188}
    11881189
    1189 inline Optional<Length> StyleBuilderConverter::convertWordSpacing(Style::BuilderState& builderState, const CSSValue& value)
     1190inline Optional<Length> BuilderConverter::convertWordSpacing(BuilderState& builderState, const CSSValue& value)
    11901191{
    11911192    Optional<Length> wordSpacing;
     
    12031204}
    12041205
    1205 inline Optional<float> StyleBuilderConverter::convertPerspective(Style::BuilderState& builderState, const CSSValue& value)
     1206inline Optional<float> BuilderConverter::convertPerspective(BuilderState& builderState, const CSSValue& value)
    12061207{
    12071208    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    12201221}
    12211222
    1222 inline Optional<Length> StyleBuilderConverter::convertMarqueeIncrement(Style::BuilderState& builderState, const CSSValue& value)
     1223inline Optional<Length> BuilderConverter::convertMarqueeIncrement(BuilderState& builderState, const CSSValue& value)
    12231224{
    12241225    Optional<Length> marqueeLength;
     
    12461247}
    12471248
    1248 inline Optional<FilterOperations> StyleBuilderConverter::convertFilterOperations(Style::BuilderState& builderState, const CSSValue& value)
     1249inline Optional<FilterOperations> BuilderConverter::convertFilterOperations(BuilderState& builderState, const CSSValue& value)
    12491250{
    12501251    FilterOperations operations;
     
    12541255}
    12551256
    1256 inline FontFeatureSettings StyleBuilderConverter::convertFontFeatureSettings(Style::BuilderState&, const CSSValue& value)
     1257inline FontFeatureSettings BuilderConverter::convertFontFeatureSettings(BuilderState&, const CSSValue& value)
    12571258{
    12581259    if (is<CSSPrimitiveValue>(value)) {
     
    12691270}
    12701271
    1271 inline FontSelectionValue StyleBuilderConverter::convertFontWeightFromValue(const CSSValue& value)
     1272inline FontSelectionValue BuilderConverter::convertFontWeightFromValue(const CSSValue& value)
    12721273{
    12731274    ASSERT(is<CSSPrimitiveValue>(value));
     
    12921293}
    12931294
    1294 inline FontSelectionValue StyleBuilderConverter::convertFontStretchFromValue(const CSSValue& value)
     1295inline FontSelectionValue BuilderConverter::convertFontStretchFromValue(const CSSValue& value)
    12951296{
    12961297    ASSERT(is<CSSPrimitiveValue>(value));
     
    13081309
    13091310// The input value needs to parsed and valid, this function returns WTF::nullopt if the input was "normal".
    1310 inline Optional<FontSelectionValue> StyleBuilderConverter::convertFontStyleFromValue(const CSSValue& value)
     1311inline Optional<FontSelectionValue> BuilderConverter::convertFontStyleFromValue(const CSSValue& value)
    13111312{
    13121313    ASSERT(is<CSSFontStyleValue>(value));
     
    13241325}
    13251326
    1326 inline FontSelectionValue StyleBuilderConverter::convertFontWeight(Style::BuilderState& builderState, const CSSValue& value)
     1327inline FontSelectionValue BuilderConverter::convertFontWeight(BuilderState& builderState, const CSSValue& value)
    13271328{
    13281329    ASSERT(is<CSSPrimitiveValue>(value));
     
    13381339}
    13391340
    1340 inline FontSelectionValue StyleBuilderConverter::convertFontStretch(Style::BuilderState&, const CSSValue& value)
     1341inline FontSelectionValue BuilderConverter::convertFontStretch(BuilderState&, const CSSValue& value)
    13411342{
    13421343    return convertFontStretchFromValue(value);
     
    13441345
    13451346#if ENABLE(VARIATION_FONTS)
    1346 inline FontVariationSettings StyleBuilderConverter::convertFontVariationSettings(Style::BuilderState&, const CSSValue& value)
     1347inline FontVariationSettings BuilderConverter::convertFontVariationSettings(BuilderState&, const CSSValue& value)
    13471348{
    13481349    if (is<CSSPrimitiveValue>(value)) {
     
    13611362
    13621363#if PLATFORM(IOS_FAMILY)
    1363 inline bool StyleBuilderConverter::convertTouchCallout(Style::BuilderState&, const CSSValue& value)
     1364inline bool BuilderConverter::convertTouchCallout(BuilderState&, const CSSValue& value)
    13641365{
    13651366    return !equalLettersIgnoringASCIICase(downcast<CSSPrimitiveValue>(value).stringValue(), "none");
     
    13681369
    13691370#if ENABLE(TOUCH_EVENTS)
    1370 inline Color StyleBuilderConverter::convertTapHighlightColor(Style::BuilderState& builderState, const CSSValue& value)
     1371inline Color BuilderConverter::convertTapHighlightColor(BuilderState& builderState, const CSSValue& value)
    13711372{
    13721373    return builderState.colorFromPrimitiveValue(downcast<CSSPrimitiveValue>(value));
     
    13751376
    13761377#if ENABLE(POINTER_EVENTS)
    1377 inline OptionSet<TouchAction> StyleBuilderConverter::convertTouchAction(Style::BuilderState&, const CSSValue& value)
     1378inline OptionSet<TouchAction> BuilderConverter::convertTouchAction(BuilderState&, const CSSValue& value)
    13781379{
    13791380    if (is<CSSPrimitiveValue>(value))
     
    13971398
    13981399#if ENABLE(OVERFLOW_SCROLLING_TOUCH)
    1399 inline bool StyleBuilderConverter::convertOverflowScrolling(Style::BuilderState&, const CSSValue& value)
     1400inline bool BuilderConverter::convertOverflowScrolling(BuilderState&, const CSSValue& value)
    14001401{
    14011402    return downcast<CSSPrimitiveValue>(value).valueID() == CSSValueTouch;
     
    14031404#endif
    14041405
    1405 inline SVGLengthValue StyleBuilderConverter::convertSVGLengthValue(Style::BuilderState&, const CSSValue& value)
     1406inline SVGLengthValue BuilderConverter::convertSVGLengthValue(BuilderState&, const CSSValue& value)
    14061407{
    14071408    return SVGLengthValue::fromCSSPrimitiveValue(downcast<CSSPrimitiveValue>(value));
    14081409}
    14091410
    1410 inline Vector<SVGLengthValue> StyleBuilderConverter::convertSVGLengthVector(Style::BuilderState& builderState, const CSSValue& value)
     1411inline Vector<SVGLengthValue> BuilderConverter::convertSVGLengthVector(BuilderState& builderState, const CSSValue& value)
    14111412{
    14121413    auto& valueList = downcast<CSSValueList>(value);
     
    14201421}
    14211422
    1422 inline Vector<SVGLengthValue> StyleBuilderConverter::convertStrokeDashArray(Style::BuilderState& builderState, const CSSValue& value)
     1423inline Vector<SVGLengthValue> BuilderConverter::convertStrokeDashArray(BuilderState& builderState, const CSSValue& value)
    14231424{
    14241425    if (is<CSSPrimitiveValue>(value)) {
     
    14301431}
    14311432
    1432 inline PaintOrder StyleBuilderConverter::convertPaintOrder(Style::BuilderState&, const CSSValue& value)
     1433inline PaintOrder BuilderConverter::convertPaintOrder(BuilderState&, const CSSValue& value)
    14331434{
    14341435    if (is<CSSPrimitiveValue>(value)) {
     
    14511452}
    14521453
    1453 inline float StyleBuilderConverter::convertOpacity(Style::BuilderState&, const CSSValue& value)
     1454inline float BuilderConverter::convertOpacity(BuilderState&, const CSSValue& value)
    14541455{
    14551456    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    14601461}
    14611462
    1462 inline String StyleBuilderConverter::convertSVGURIReference(Style::BuilderState& builderState, const CSSValue& value)
     1463inline String BuilderConverter::convertSVGURIReference(BuilderState& builderState, const CSSValue& value)
    14631464{
    14641465    String s;
     
    14701471}
    14711472
    1472 inline Color StyleBuilderConverter::convertSVGColor(Style::BuilderState& builderState, const CSSValue& value)
     1473inline Color BuilderConverter::convertSVGColor(BuilderState& builderState, const CSSValue& value)
    14731474{
    14741475    return builderState.colorFromPrimitiveValue(downcast<CSSPrimitiveValue>(value));
    14751476}
    14761477
    1477 inline StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(Style::BuilderState&, const CSSValue& value)
     1478inline StyleSelfAlignmentData BuilderConverter::convertSelfOrDefaultAlignmentData(BuilderState&, const CSSValue& value)
    14781479{
    14791480    StyleSelfAlignmentData alignmentData = RenderStyle::initialSelfAlignment();
     
    14831484            alignmentData.setPositionType(ItemPositionType::Legacy);
    14841485            alignmentData.setPosition(*pairValue->second());
    1485         } else if (pairValue->first()->valueID() == CSSValueFirst) {
     1486        } else if (pairValue->first()->valueID() == CSSValueFirst)
    14861487            alignmentData.setPosition(ItemPosition::Baseline);
    1487         } else if (pairValue->first()->valueID() == CSSValueLast) {
     1488        else if (pairValue->first()->valueID() == CSSValueLast)
    14881489            alignmentData.setPosition(ItemPosition::LastBaseline);
    1489         } else {
     1490        else {
    14901491            alignmentData.setOverflow(*pairValue->first());
    14911492            alignmentData.setPosition(*pairValue->second());
     
    14961497}
    14971498
    1498 inline StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(Style::BuilderState&, const CSSValue& value)
     1499inline StyleContentAlignmentData BuilderConverter::convertContentAlignmentData(BuilderState&, const CSSValue& value)
    14991500{
    15001501    StyleContentAlignmentData alignmentData = RenderStyle::initialContentAlignment();
     
    15111512}
    15121513
    1513 inline GlyphOrientation StyleBuilderConverter::convertGlyphOrientation(Style::BuilderState&, const CSSValue& value)
     1514inline GlyphOrientation BuilderConverter::convertGlyphOrientation(BuilderState&, const CSSValue& value)
    15141515{
    15151516    float angle = fabsf(fmodf(downcast<CSSPrimitiveValue>(value).floatValue(), 360.0f));
     
    15231524}
    15241525
    1525 inline GlyphOrientation StyleBuilderConverter::convertGlyphOrientationOrAuto(Style::BuilderState& builderState, const CSSValue& value)
     1526inline GlyphOrientation BuilderConverter::convertGlyphOrientationOrAuto(BuilderState& builderState, const CSSValue& value)
    15261527{
    15271528    if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto)
     
    15301531}
    15311532
    1532 inline Optional<Length> StyleBuilderConverter::convertLineHeight(Style::BuilderState& builderState, const CSSValue& value, float multiplier)
     1533inline Optional<Length> BuilderConverter::convertLineHeight(BuilderState& builderState, const CSSValue& value, float multiplier)
    15331534{
    15341535    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    15371538
    15381539    if (primitiveValue.isLength()) {
    1539         Length length = primitiveValue.computeLength<Length>(StyleBuilderConverter::csstoLengthConversionDataWithTextZoomFactor(builderState));
     1540        Length length = primitiveValue.computeLength<Length>(BuilderConverter::csstoLengthConversionDataWithTextZoomFactor(builderState));
    15401541        if (multiplier != 1.f)
    15411542            length = Length(length.value() * multiplier, Fixed);
     
    15611562}
    15621563
    1563 inline FontSynthesis StyleBuilderConverter::convertFontSynthesis(Style::BuilderState&, const CSSValue& value)
     1564inline FontSynthesis BuilderConverter::convertFontSynthesis(BuilderState&, const CSSValue& value)
    15641565{
    15651566    if (is<CSSPrimitiveValue>(value)) {
     
    15901591}
    15911592   
    1592 inline OptionSet<SpeakAs> StyleBuilderConverter::convertSpeakAs(Style::BuilderState&, const CSSValue& value)
     1593inline OptionSet<SpeakAs> BuilderConverter::convertSpeakAs(BuilderState&, const CSSValue& value)
    15931594{
    15941595    auto result = RenderStyle::initialSpeakAs();
     
    16001601}
    16011602
    1602 inline OptionSet<HangingPunctuation> StyleBuilderConverter::convertHangingPunctuation(Style::BuilderState&, const CSSValue& value)
     1603inline OptionSet<HangingPunctuation> BuilderConverter::convertHangingPunctuation(BuilderState&, const CSSValue& value)
    16031604{
    16041605    auto result = RenderStyle::initialHangingPunctuation();
     
    16101611}
    16111612
    1612 inline GapLength StyleBuilderConverter::convertGapLength(Style::BuilderState& builderState, const CSSValue& value)
     1613inline GapLength BuilderConverter::convertGapLength(BuilderState& builderState, const CSSValue& value)
    16131614{
    16141615    return (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNormal) ? GapLength() : GapLength(convertLength(builderState, value));
    16151616}
    16161617
    1617 } // namespace WebCore
     1618}
     1619}
  • trunk/Source/WebCore/style/StyleBuilderCustom.h

    r251840 r251841  
    5353
    5454namespace WebCore {
     55namespace Style {
    5556
    5657#define DECLARE_PROPERTY_CUSTOM_HANDLERS(property) \
    57     static void applyInherit##property(Style::BuilderState&); \
    58     static void applyInitial##property(Style::BuilderState&); \
    59     static void applyValue##property(Style::BuilderState&, CSSValue&)
     58    static void applyInherit##property(BuilderState&); \
     59    static void applyInitial##property(BuilderState&); \
     60    static void applyValue##property(BuilderState&, CSSValue&)
    6061
    6162template<typename T> inline T forwardInheritedValue(T&& value) { return std::forward<T>(value); }
     
    6667
    6768// Note that we assume the CSS parser only allows valid CSSValue types.
    68 class StyleBuilderCustom {
     69class BuilderCustom {
    6970public:
    7071    // Custom handling of inherit, initial and value setting.
     
    110111
    111112    // Custom handling of initial + inherit value setting only.
    112     static void applyInitialWebkitMaskImage(Style::BuilderState&) { }
    113     static void applyInheritWebkitMaskImage(Style::BuilderState&) { }
    114     static void applyInitialFontFeatureSettings(Style::BuilderState&) { }
    115     static void applyInheritFontFeatureSettings(Style::BuilderState&) { }
     113    static void applyInitialWebkitMaskImage(BuilderState&) { }
     114    static void applyInheritWebkitMaskImage(BuilderState&) { }
     115    static void applyInitialFontFeatureSettings(BuilderState&) { }
     116    static void applyInheritFontFeatureSettings(BuilderState&) { }
    116117#if ENABLE(VARIATION_FONTS)
    117     static void applyInitialFontVariationSettings(Style::BuilderState&) { }
    118     static void applyInheritFontVariationSettings(Style::BuilderState&) { }
     118    static void applyInitialFontVariationSettings(BuilderState&) { }
     119    static void applyInheritFontVariationSettings(BuilderState&) { }
    119120#endif
    120121
    121122    // Custom handling of inherit + value setting only.
    122     static void applyInheritDisplay(Style::BuilderState&);
    123     static void applyValueDisplay(Style::BuilderState&, CSSValue&);
     123    static void applyInheritDisplay(BuilderState&);
     124    static void applyValueDisplay(BuilderState&, CSSValue&);
    124125
    125126    // Custom handling of value setting only.
    126     static void applyValueBaselineShift(Style::BuilderState&, CSSValue&);
    127     static void applyValueDirection(Style::BuilderState&, CSSValue&);
    128     static void applyValueVerticalAlign(Style::BuilderState&, CSSValue&);
    129     static void applyInitialTextAlign(Style::BuilderState&);
    130     static void applyValueTextAlign(Style::BuilderState&, CSSValue&);
    131     static void applyValueWebkitLocale(Style::BuilderState&, CSSValue&);
    132     static void applyValueWebkitTextOrientation(Style::BuilderState&, CSSValue&);
     127    static void applyValueBaselineShift(BuilderState&, CSSValue&);
     128    static void applyValueDirection(BuilderState&, CSSValue&);
     129    static void applyValueVerticalAlign(BuilderState&, CSSValue&);
     130    static void applyInitialTextAlign(BuilderState&);
     131    static void applyValueTextAlign(BuilderState&, CSSValue&);
     132    static void applyValueWebkitLocale(BuilderState&, CSSValue&);
     133    static void applyValueWebkitTextOrientation(BuilderState&, CSSValue&);
    133134#if ENABLE(TEXT_AUTOSIZING)
    134     static void applyValueWebkitTextSizeAdjust(Style::BuilderState&, CSSValue&);
     135    static void applyValueWebkitTextSizeAdjust(BuilderState&, CSSValue&);
    135136#endif
    136     static void applyValueWebkitTextZoom(Style::BuilderState&, CSSValue&);
    137     static void applyValueWritingMode(Style::BuilderState&, CSSValue&);
    138     static void applyValueAlt(Style::BuilderState&, CSSValue&);
    139     static void applyValueWillChange(Style::BuilderState&, CSSValue&);
     137    static void applyValueWebkitTextZoom(BuilderState&, CSSValue&);
     138    static void applyValueWritingMode(BuilderState&, CSSValue&);
     139    static void applyValueAlt(BuilderState&, CSSValue&);
     140    static void applyValueWillChange(BuilderState&, CSSValue&);
    140141
    141142#if ENABLE(DARK_MODE_CSS)
    142     static void applyValueColorScheme(Style::BuilderState&, CSSValue&);
     143    static void applyValueColorScheme(BuilderState&, CSSValue&);
    143144#endif
    144145
    145     static void applyValueStrokeWidth(Style::BuilderState&, CSSValue&);
    146     static void applyValueStrokeColor(Style::BuilderState&, CSSValue&);
    147 
    148     static void applyInitialCustomProperty(Style::BuilderState&, const CSSRegisteredCustomProperty*, const AtomString& name);
    149     static void applyInheritCustomProperty(Style::BuilderState&, const CSSRegisteredCustomProperty*, const AtomString& name);
    150     static void applyValueCustomProperty(Style::BuilderState&, const CSSRegisteredCustomProperty*, CSSCustomPropertyValue&);
     146    static void applyValueStrokeWidth(BuilderState&, CSSValue&);
     147    static void applyValueStrokeColor(BuilderState&, CSSValue&);
     148
     149    static void applyInitialCustomProperty(BuilderState&, const CSSRegisteredCustomProperty*, const AtomString& name);
     150    static void applyInheritCustomProperty(BuilderState&, const CSSRegisteredCustomProperty*, const AtomString& name);
     151    static void applyValueCustomProperty(BuilderState&, const CSSRegisteredCustomProperty*, CSSCustomPropertyValue&);
    151152
    152153private:
    153     static void resetEffectiveZoom(Style::BuilderState&);
     154    static void resetEffectiveZoom(BuilderState&);
    154155
    155156    static Length mmLength(double mm);
     
    158159
    159160    template <CSSPropertyID id>
    160     static void applyTextOrBoxShadowValue(Style::BuilderState&, CSSValue&);
    161     static bool isValidDisplayValue(Style::BuilderState&, DisplayType);
     161    static void applyTextOrBoxShadowValue(BuilderState&, CSSValue&);
     162    static bool isValidDisplayValue(BuilderState&, DisplayType);
    162163
    163164    enum CounterBehavior {Increment = 0, Reset};
    164165    template <CounterBehavior counterBehavior>
    165     static void applyInheritCounter(Style::BuilderState&);
     166    static void applyInheritCounter(BuilderState&);
    166167    template <CounterBehavior counterBehavior>
    167     static void applyValueCounter(Style::BuilderState&, CSSValue&);
     168    static void applyValueCounter(BuilderState&, CSSValue&);
    168169
    169170    static float largerFontSize(float size);
    170171    static float smallerFontSize(float size);
    171     static float determineRubyTextSizeMultiplier(Style::BuilderState&);
     172    static float determineRubyTextSizeMultiplier(BuilderState&);
    172173};
    173174
    174 inline void StyleBuilderCustom::applyValueDirection(Style::BuilderState& builderState, CSSValue& value)
     175inline void BuilderCustom::applyValueDirection(BuilderState& builderState, CSSValue& value)
    175176{
    176177    builderState.style().setDirection(downcast<CSSPrimitiveValue>(value));
     
    178179}
    179180
    180 inline void StyleBuilderCustom::applyInitialTextAlign(Style::BuilderState& builderState)
     181inline void BuilderCustom::applyInitialTextAlign(BuilderState& builderState)
    181182{
    182183    builderState.style().setTextAlign(RenderStyle::initialTextAlign());
     
    184185}
    185186
    186 inline void StyleBuilderCustom::applyValueTextAlign(Style::BuilderState& builderState, CSSValue& value)
    187 {
    188     builderState.style().setTextAlign(StyleBuilderConverter::convertTextAlign(builderState, value));
     187inline void BuilderCustom::applyValueTextAlign(BuilderState& builderState, CSSValue& value)
     188{
     189    builderState.style().setTextAlign(BuilderConverter::convertTextAlign(builderState, value));
    189190    builderState.style().setHasExplicitlySetTextAlign(true);
    190191}
    191192
    192 inline void StyleBuilderCustom::resetEffectiveZoom(Style::BuilderState& builderState)
     193inline void BuilderCustom::resetEffectiveZoom(BuilderState& builderState)
    193194{
    194195    // Reset the zoom in effect. This allows the setZoom method to accurately compute a new zoom in effect.
     
    196197}
    197198
    198 inline void StyleBuilderCustom::applyInitialZoom(Style::BuilderState& builderState)
     199inline void BuilderCustom::applyInitialZoom(BuilderState& builderState)
    199200{
    200201    resetEffectiveZoom(builderState);
     
    202203}
    203204
    204 inline void StyleBuilderCustom::applyInheritZoom(Style::BuilderState& builderState)
     205inline void BuilderCustom::applyInheritZoom(BuilderState& builderState)
    205206{
    206207    resetEffectiveZoom(builderState);
     
    208209}
    209210
    210 inline void StyleBuilderCustom::applyValueZoom(Style::BuilderState& builderState, CSSValue& value)
     211inline void BuilderCustom::applyValueZoom(BuilderState& builderState, CSSValue& value)
    211212{
    212213    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    232233    }
    233234}
    234 inline Length StyleBuilderCustom::mmLength(double mm)
     235inline Length BuilderCustom::mmLength(double mm)
    235236{
    236237    Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM));
    237238    return value.get().computeLength<Length>(CSSToLengthConversionData());
    238239}
    239 inline Length StyleBuilderCustom::inchLength(double inch)
     240inline Length BuilderCustom::inchLength(double inch)
    240241{
    241242    Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(inch, CSSPrimitiveValue::CSS_IN));
    242243    return value.get().computeLength<Length>(CSSToLengthConversionData());
    243244}
    244 bool StyleBuilderCustom::getPageSizeFromName(CSSPrimitiveValue* pageSizeName, CSSPrimitiveValue* pageOrientation, Length& width, Length& height)
     245bool BuilderCustom::getPageSizeFromName(CSSPrimitiveValue* pageSizeName, CSSPrimitiveValue* pageOrientation, Length& width, Length& height)
    245246{
    246247    static NeverDestroyed<Length> a5Width(mmLength(148));
     
    316317}
    317318
    318 inline void StyleBuilderCustom::applyValueVerticalAlign(Style::BuilderState& builderState, CSSValue& value)
     319inline void BuilderCustom::applyValueVerticalAlign(BuilderState& builderState, CSSValue& value)
    319320{
    320321    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    327328#if ENABLE(CSS_IMAGE_RESOLUTION)
    328329
    329 inline void StyleBuilderCustom::applyInheritImageResolution(Style::BuilderState& builderState)
     330inline void BuilderCustom::applyInheritImageResolution(BuilderState& builderState)
    330331{
    331332    builderState.style().setImageResolutionSource(builderState.parentStyle().imageResolutionSource());
     
    334335}
    335336
    336 inline void StyleBuilderCustom::applyInitialImageResolution(Style::BuilderState& builderState)
     337inline void BuilderCustom::applyInitialImageResolution(BuilderState& builderState)
    337338{
    338339    builderState.style().setImageResolutionSource(RenderStyle::initialImageResolutionSource());
     
    341342}
    342343
    343 inline void StyleBuilderCustom::applyValueImageResolution(Style::BuilderState& builderState, CSSValue& value)
     344inline void BuilderCustom::applyValueImageResolution(BuilderState& builderState, CSSValue& value)
    344345{
    345346    ImageResolutionSource source = RenderStyle::initialImageResolutionSource();
     
    362363#endif // ENABLE(CSS_IMAGE_RESOLUTION)
    363364
    364 inline void StyleBuilderCustom::applyInheritSize(Style::BuilderState&) { }
    365 
    366 inline void StyleBuilderCustom::applyInitialSize(Style::BuilderState&) { }
    367 
    368 inline void StyleBuilderCustom::applyValueSize(Style::BuilderState& builderState, CSSValue& value)
     365inline void BuilderCustom::applyInheritSize(BuilderState&) { }
     366
     367inline void BuilderCustom::applyInitialSize(BuilderState&) { }
     368
     369inline void BuilderCustom::applyValueSize(BuilderState& builderState, CSSValue& value)
    369370{
    370371    builderState.style().resetPageSizeType();
     
    442443}
    443444
    444 inline void StyleBuilderCustom::applyInheritTextIndent(Style::BuilderState& builderState)
     445inline void BuilderCustom::applyInheritTextIndent(BuilderState& builderState)
    445446{
    446447    builderState.style().setTextIndent(Length { builderState.parentStyle().textIndent() });
     
    451452}
    452453
    453 inline void StyleBuilderCustom::applyInitialTextIndent(Style::BuilderState& builderState)
     454inline void BuilderCustom::applyInitialTextIndent(BuilderState& builderState)
    454455{
    455456    builderState.style().setTextIndent(RenderStyle::initialTextIndent());
     
    460461}
    461462
    462 inline void StyleBuilderCustom::applyValueTextIndent(Style::BuilderState& builderState, CSSValue& value)
     463inline void BuilderCustom::applyValueTextIndent(BuilderState& builderState, CSSValue& value)
    463464{
    464465    Length lengthOrPercentageValue;
     
    494495class ApplyPropertyBorderImageModifier {
    495496public:
    496     static void applyInheritValue(Style::BuilderState& builderState)
     497    static void applyInheritValue(BuilderState& builderState)
    497498    {
    498499        NinePieceImage image(getValue(builderState.style()));
     
    514515    }
    515516
    516     static void applyInitialValue(Style::BuilderState& builderState)
     517    static void applyInitialValue(BuilderState& builderState)
    517518    {
    518519        NinePieceImage image(getValue(builderState.style()));
     
    542543    }
    543544
    544     static void applyValue(Style::BuilderState& builderState, CSSValue& value)
     545    static void applyValue(BuilderState& builderState, CSSValue& value)
    545546    {
    546547        NinePieceImage image(getValue(builderState.style()));
     
    575576
    576577#define DEFINE_BORDER_IMAGE_MODIFIER_HANDLER(type, modifier) \
    577 inline void StyleBuilderCustom::applyInherit##type##modifier(Style::BuilderState& builderState) \
     578inline void BuilderCustom::applyInherit##type##modifier(BuilderState& builderState) \
    578579{ \
    579580    ApplyPropertyBorderImageModifier<type, modifier>::applyInheritValue(builderState); \
    580581} \
    581 inline void StyleBuilderCustom::applyInitial##type##modifier(Style::BuilderState& builderState) \
     582inline void BuilderCustom::applyInitial##type##modifier(BuilderState& builderState) \
    582583{ \
    583584    ApplyPropertyBorderImageModifier<type, modifier>::applyInitialValue(builderState); \
    584585} \
    585 inline void StyleBuilderCustom::applyValue##type##modifier(Style::BuilderState& builderState, CSSValue& value) \
     586inline void BuilderCustom::applyValue##type##modifier(BuilderState& builderState, CSSValue& value) \
    586587{ \
    587588    ApplyPropertyBorderImageModifier<type, modifier>::applyValue(builderState, value); \
     
    599600#if ENABLE(TEXT_AUTOSIZING)
    600601
    601 inline void StyleBuilderCustom::applyInheritLineHeight(Style::BuilderState& builderState)
     602inline void BuilderCustom::applyInheritLineHeight(BuilderState& builderState)
    602603{
    603604    builderState.style().setLineHeight(Length { builderState.parentStyle().lineHeight() });
     
    605606}
    606607
    607 inline void StyleBuilderCustom::applyInitialLineHeight(Style::BuilderState& builderState)
     608inline void BuilderCustom::applyInitialLineHeight(BuilderState& builderState)
    608609{
    609610    builderState.style().setLineHeight(RenderStyle::initialLineHeight());
     
    655656}
    656657
    657 inline void StyleBuilderCustom::applyValueLineHeight(Style::BuilderState& builderState, CSSValue& value)
    658 {
    659     Optional<Length> lineHeight = StyleBuilderConverter::convertLineHeight(builderState, value, 1);
     658inline void BuilderCustom::applyValueLineHeight(BuilderState& builderState, CSSValue& value)
     659{
     660    Optional<Length> lineHeight = BuilderConverter::convertLineHeight(builderState, value, 1);
    660661    if (!lineHeight)
    661662        return;
     
    670671            computedLineHeight = lineHeight.value();
    671672        else
    672             computedLineHeight = StyleBuilderConverter::convertLineHeight(builderState, value, multiplier).value();
     673            computedLineHeight = BuilderConverter::convertLineHeight(builderState, value, multiplier).value();
    673674    }
    674675
     
    679680#endif
    680681
    681 inline void StyleBuilderCustom::applyInheritOutlineStyle(Style::BuilderState& builderState)
     682inline void BuilderCustom::applyInheritOutlineStyle(BuilderState& builderState)
    682683{
    683684    builderState.style().setOutlineStyleIsAuto(builderState.parentStyle().outlineStyleIsAuto());
     
    685686}
    686687
    687 inline void StyleBuilderCustom::applyInitialOutlineStyle(Style::BuilderState& builderState)
     688inline void BuilderCustom::applyInitialOutlineStyle(BuilderState& builderState)
    688689{
    689690    builderState.style().setOutlineStyleIsAuto(RenderStyle::initialOutlineStyleIsAuto());
     
    691692}
    692693
    693 inline void StyleBuilderCustom::applyValueOutlineStyle(Style::BuilderState& builderState, CSSValue& value)
     694inline void BuilderCustom::applyValueOutlineStyle(BuilderState& builderState, CSSValue& value)
    694695{
    695696    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    699700}
    700701
    701 inline void StyleBuilderCustom::applyInitialClip(Style::BuilderState& builderState)
     702inline void BuilderCustom::applyInitialClip(BuilderState& builderState)
    702703{
    703704    builderState.style().setClip(Length(), Length(), Length(), Length());
     
    705706}
    706707
    707 inline void StyleBuilderCustom::applyInheritClip(Style::BuilderState& builderState)
     708inline void BuilderCustom::applyInheritClip(BuilderState& builderState)
    708709{
    709710    auto& parentStyle = builderState.parentStyle();
     
    715716}
    716717
    717 inline void StyleBuilderCustom::applyValueClip(Style::BuilderState& builderState, CSSValue& value)
     718inline void BuilderCustom::applyValueClip(BuilderState& builderState, CSSValue& value)
    718719{
    719720    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    732733}
    733734
    734 inline void StyleBuilderCustom::applyValueWebkitLocale(Style::BuilderState& builderState, CSSValue& value)
     735inline void BuilderCustom::applyValueWebkitLocale(BuilderState& builderState, CSSValue& value)
    735736{
    736737    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    744745}
    745746
    746 inline void StyleBuilderCustom::applyValueWritingMode(Style::BuilderState& builderState, CSSValue& value)
     747inline void BuilderCustom::applyValueWritingMode(BuilderState& builderState, CSSValue& value)
    747748{
    748749    builderState.setWritingMode(downcast<CSSPrimitiveValue>(value));
     
    750751}
    751752
    752 inline void StyleBuilderCustom::applyValueWebkitTextOrientation(Style::BuilderState& builderState, CSSValue& value)
     753inline void BuilderCustom::applyValueWebkitTextOrientation(BuilderState& builderState, CSSValue& value)
    753754{
    754755    builderState.setTextOrientation(downcast<CSSPrimitiveValue>(value));
     
    756757
    757758#if ENABLE(TEXT_AUTOSIZING)
    758 inline void StyleBuilderCustom::applyValueWebkitTextSizeAdjust(Style::BuilderState& builderState, CSSValue& value)
     759inline void BuilderCustom::applyValueWebkitTextSizeAdjust(BuilderState& builderState, CSSValue& value)
    759760{
    760761    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    770771#endif
    771772
    772 inline void StyleBuilderCustom::applyValueWebkitTextZoom(Style::BuilderState& builderState, CSSValue& value)
     773inline void BuilderCustom::applyValueWebkitTextZoom(BuilderState& builderState, CSSValue& value)
    773774{
    774775    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    781782
    782783#if ENABLE(DARK_MODE_CSS)
    783 inline void StyleBuilderCustom::applyValueColorScheme(Style::BuilderState& builderState, CSSValue& value)
    784 {
    785     builderState.style().setColorScheme(StyleBuilderConverter::convertColorScheme(builderState, value));
     784inline void BuilderCustom::applyValueColorScheme(BuilderState& builderState, CSSValue& value)
     785{
     786    builderState.style().setColorScheme(BuilderConverter::convertColorScheme(builderState, value));
    786787    builderState.style().setHasExplicitlySetColorScheme(true);
    787788}
     
    789790
    790791template<CSSPropertyID property>
    791 inline void StyleBuilderCustom::applyTextOrBoxShadowValue(Style::BuilderState& builderState, CSSValue& value)
     792inline void BuilderCustom::applyTextOrBoxShadowValue(BuilderState& builderState, CSSValue& value)
    792793{
    793794    if (is<CSSPrimitiveValue>(value)) {
     
    823824}
    824825
    825 inline void StyleBuilderCustom::applyInitialTextShadow(Style::BuilderState& builderState)
     826inline void BuilderCustom::applyInitialTextShadow(BuilderState& builderState)
    826827{
    827828    builderState.style().setTextShadow(nullptr);
    828829}
    829830
    830 inline void StyleBuilderCustom::applyInheritTextShadow(Style::BuilderState& builderState)
     831inline void BuilderCustom::applyInheritTextShadow(BuilderState& builderState)
    831832{
    832833    builderState.style().setTextShadow(builderState.parentStyle().textShadow() ? makeUnique<ShadowData>(*builderState.parentStyle().textShadow()) : nullptr);
    833834}
    834835
    835 inline void StyleBuilderCustom::applyValueTextShadow(Style::BuilderState& builderState, CSSValue& value)
     836inline void BuilderCustom::applyValueTextShadow(BuilderState& builderState, CSSValue& value)
    836837{
    837838    applyTextOrBoxShadowValue<CSSPropertyTextShadow>(builderState, value);
    838839}
    839840
    840 inline void StyleBuilderCustom::applyInitialBoxShadow(Style::BuilderState& builderState)
     841inline void BuilderCustom::applyInitialBoxShadow(BuilderState& builderState)
    841842{
    842843    builderState.style().setBoxShadow(nullptr);
    843844}
    844845
    845 inline void StyleBuilderCustom::applyInheritBoxShadow(Style::BuilderState& builderState)
     846inline void BuilderCustom::applyInheritBoxShadow(BuilderState& builderState)
    846847{
    847848    builderState.style().setBoxShadow(builderState.parentStyle().boxShadow() ? makeUnique<ShadowData>(*builderState.parentStyle().boxShadow()) : nullptr);
    848849}
    849850
    850 inline void StyleBuilderCustom::applyValueBoxShadow(Style::BuilderState& builderState, CSSValue& value)
     851inline void BuilderCustom::applyValueBoxShadow(BuilderState& builderState, CSSValue& value)
    851852{
    852853    applyTextOrBoxShadowValue<CSSPropertyBoxShadow>(builderState, value);
    853854}
    854855
    855 inline void StyleBuilderCustom::applyInitialWebkitBoxShadow(Style::BuilderState& builderState)
     856inline void BuilderCustom::applyInitialWebkitBoxShadow(BuilderState& builderState)
    856857{
    857858    applyInitialBoxShadow(builderState);
    858859}
    859860
    860 inline void StyleBuilderCustom::applyInheritWebkitBoxShadow(Style::BuilderState& builderState)
     861inline void BuilderCustom::applyInheritWebkitBoxShadow(BuilderState& builderState)
    861862{
    862863    applyInheritBoxShadow(builderState);
    863864}
    864865
    865 inline void StyleBuilderCustom::applyValueWebkitBoxShadow(Style::BuilderState& builderState, CSSValue& value)
     866inline void BuilderCustom::applyValueWebkitBoxShadow(BuilderState& builderState, CSSValue& value)
    866867{
    867868    applyTextOrBoxShadowValue<CSSPropertyWebkitBoxShadow>(builderState, value);
    868869}
    869870
    870 inline void StyleBuilderCustom::applyInitialFontFamily(Style::BuilderState& builderState)
     871inline void BuilderCustom::applyInitialFontFamily(BuilderState& builderState)
    871872{
    872873    auto fontDescription = builderState.style().fontDescription();
     
    884885}
    885886
    886 inline void StyleBuilderCustom::applyInheritFontFamily(Style::BuilderState& builderState)
     887inline void BuilderCustom::applyInheritFontFamily(BuilderState& builderState)
    887888{
    888889    auto fontDescription = builderState.style().fontDescription();
     
    894895}
    895896
    896 inline void StyleBuilderCustom::applyValueFontFamily(Style::BuilderState& builderState, CSSValue& value)
     897inline void BuilderCustom::applyValueFontFamily(BuilderState& builderState, CSSValue& value)
    897898{
    898899    auto& valueList = downcast<CSSValueList>(value);
     
    971972}
    972973
    973 inline bool StyleBuilderCustom::isValidDisplayValue(Style::BuilderState& builderState, DisplayType display)
     974inline bool BuilderCustom::isValidDisplayValue(BuilderState& builderState, DisplayType display)
    974975{
    975976    if (is<SVGElement>(builderState.element()) && builderState.style().styleType() == PseudoId::None)
     
    978979}
    979980
    980 inline void StyleBuilderCustom::applyInheritDisplay(Style::BuilderState& builderState)
     981inline void BuilderCustom::applyInheritDisplay(BuilderState& builderState)
    981982{
    982983    DisplayType display = builderState.parentStyle().display();
     
    985986}
    986987
    987 inline void StyleBuilderCustom::applyValueDisplay(Style::BuilderState& builderState, CSSValue& value)
     988inline void BuilderCustom::applyValueDisplay(BuilderState& builderState, CSSValue& value)
    988989{
    989990    DisplayType display = downcast<CSSPrimitiveValue>(value);
     
    992993}
    993994
    994 inline void StyleBuilderCustom::applyValueBaselineShift(Style::BuilderState& builderState, CSSValue& value)
     995inline void BuilderCustom::applyValueBaselineShift(BuilderState& builderState, CSSValue& value)
    995996{
    996997    SVGRenderStyle& svgStyle = builderState.style().accessSVGStyle();
     
    10161017}
    10171018
    1018 inline void StyleBuilderCustom::applyInitialWebkitAspectRatio(Style::BuilderState& builderState)
     1019inline void BuilderCustom::applyInitialWebkitAspectRatio(BuilderState& builderState)
    10191020{
    10201021    builderState.style().setAspectRatioType(RenderStyle::initialAspectRatioType());
     
    10231024}
    10241025
    1025 inline void StyleBuilderCustom::applyInheritWebkitAspectRatio(Style::BuilderState& builderState)
     1026inline void BuilderCustom::applyInheritWebkitAspectRatio(BuilderState& builderState)
    10261027{
    10271028    if (builderState.parentStyle().aspectRatioType() == AspectRatioType::Auto)
     
    10321033}
    10331034
    1034 inline void StyleBuilderCustom::applyValueWebkitAspectRatio(Style::BuilderState& builderState, CSSValue& value)
     1035inline void BuilderCustom::applyValueWebkitAspectRatio(BuilderState& builderState, CSSValue& value)
    10351036{
    10361037    if (is<CSSPrimitiveValue>(value)) {
     
    10521053}
    10531054
    1054 inline void StyleBuilderCustom::applyInitialWebkitTextEmphasisStyle(Style::BuilderState& builderState)
     1055inline void BuilderCustom::applyInitialWebkitTextEmphasisStyle(BuilderState& builderState)
    10551056{
    10561057    builderState.style().setTextEmphasisFill(RenderStyle::initialTextEmphasisFill());
     
    10591060}
    10601061
    1061 inline void StyleBuilderCustom::applyInheritWebkitTextEmphasisStyle(Style::BuilderState& builderState)
     1062inline void BuilderCustom::applyInheritWebkitTextEmphasisStyle(BuilderState& builderState)
    10621063{
    10631064    builderState.style().setTextEmphasisFill(builderState.parentStyle().textEmphasisFill());
     
    10661067}
    10671068
    1068 inline void StyleBuilderCustom::applyValueWebkitTextEmphasisStyle(Style::BuilderState& builderState, CSSValue& value)
     1069inline void BuilderCustom::applyValueWebkitTextEmphasisStyle(BuilderState& builderState, CSSValue& value)
    10691070{
    10701071    if (is<CSSValueList>(value)) {
     
    11021103}
    11031104
    1104 template <StyleBuilderCustom::CounterBehavior counterBehavior>
    1105 inline void StyleBuilderCustom::applyInheritCounter(Style::BuilderState& builderState)
     1105template <BuilderCustom::CounterBehavior counterBehavior>
     1106inline void BuilderCustom::applyInheritCounter(BuilderState& builderState)
    11061107{
    11071108    auto& map = builderState.style().accessCounterDirectives();
     
    11151116}
    11161117
    1117 template <StyleBuilderCustom::CounterBehavior counterBehavior>
    1118 inline void StyleBuilderCustom::applyValueCounter(Style::BuilderState& builderState, CSSValue& value)
     1118template <BuilderCustom::CounterBehavior counterBehavior>
     1119inline void BuilderCustom::applyValueCounter(BuilderState& builderState, CSSValue& value)
    11191120{
    11201121    bool setCounterIncrementToNone = counterBehavior == Increment && is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone;
     
    11461147}
    11471148
    1148 inline void StyleBuilderCustom::applyInitialCounterIncrement(Style::BuilderState&) { }
    1149 
    1150 inline void StyleBuilderCustom::applyInheritCounterIncrement(Style::BuilderState& builderState)
     1149inline void BuilderCustom::applyInitialCounterIncrement(BuilderState&) { }
     1150
     1151inline void BuilderCustom::applyInheritCounterIncrement(BuilderState& builderState)
    11511152{
    11521153    applyInheritCounter<Increment>(builderState);
    11531154}
    11541155
    1155 inline void StyleBuilderCustom::applyValueCounterIncrement(Style::BuilderState& builderState, CSSValue& value)
     1156inline void BuilderCustom::applyValueCounterIncrement(BuilderState& builderState, CSSValue& value)
    11561157{
    11571158    applyValueCounter<Increment>(builderState, value);
    11581159}
    11591160
    1160 inline void StyleBuilderCustom::applyInitialCounterReset(Style::BuilderState&) { }
    1161 
    1162 inline void StyleBuilderCustom::applyInheritCounterReset(Style::BuilderState& builderState)
     1161inline void BuilderCustom::applyInitialCounterReset(BuilderState&) { }
     1162
     1163inline void BuilderCustom::applyInheritCounterReset(BuilderState& builderState)
    11631164{
    11641165    applyInheritCounter<Reset>(builderState);
    11651166}
    11661167
    1167 inline void StyleBuilderCustom::applyValueCounterReset(Style::BuilderState& builderState, CSSValue& value)
     1168inline void BuilderCustom::applyValueCounterReset(BuilderState& builderState, CSSValue& value)
    11681169{
    11691170    applyValueCounter<Reset>(builderState, value);
    11701171}
    11711172
    1172 inline void StyleBuilderCustom::applyInitialCursor(Style::BuilderState& builderState)
     1173inline void BuilderCustom::applyInitialCursor(BuilderState& builderState)
    11731174{
    11741175    builderState.style().clearCursorList();
     
    11761177}
    11771178
    1178 inline void StyleBuilderCustom::applyInheritCursor(Style::BuilderState& builderState)
     1179inline void BuilderCustom::applyInheritCursor(BuilderState& builderState)
    11791180{
    11801181    builderState.style().setCursor(builderState.parentStyle().cursor());
     
    11821183}
    11831184
    1184 inline void StyleBuilderCustom::applyValueCursor(Style::BuilderState& builderState, CSSValue& value)
     1185inline void BuilderCustom::applyValueCursor(BuilderState& builderState, CSSValue& value)
    11851186{
    11861187    builderState.style().clearCursorList();
     
    12071208}
    12081209
    1209 inline void StyleBuilderCustom::applyInitialFill(Style::BuilderState& builderState)
     1210inline void BuilderCustom::applyInitialFill(BuilderState& builderState)
    12101211{
    12111212    auto& svgStyle = builderState.style().accessSVGStyle();
     
    12131214}
    12141215
    1215 inline void StyleBuilderCustom::applyInheritFill(Style::BuilderState& builderState)
     1216inline void BuilderCustom::applyInheritFill(BuilderState& builderState)
    12161217{
    12171218    auto& svgStyle = builderState.style().accessSVGStyle();
     
    12211222}
    12221223
    1223 inline void StyleBuilderCustom::applyValueFill(Style::BuilderState& builderState, CSSValue& value)
     1224inline void BuilderCustom::applyValueFill(BuilderState& builderState, CSSValue& value)
    12241225{
    12251226    auto& svgStyle = builderState.style().accessSVGStyle();
     
    12521253}
    12531254
    1254 inline void StyleBuilderCustom::applyInitialStroke(Style::BuilderState& builderState)
     1255inline void BuilderCustom::applyInitialStroke(BuilderState& builderState)
    12551256{
    12561257    SVGRenderStyle& svgStyle = builderState.style().accessSVGStyle();
     
    12581259}
    12591260
    1260 inline void StyleBuilderCustom::applyInheritStroke(Style::BuilderState& builderState)
     1261inline void BuilderCustom::applyInheritStroke(BuilderState& builderState)
    12611262{
    12621263    auto& svgStyle = builderState.style().accessSVGStyle();
     
    12651266}
    12661267
    1267 inline void StyleBuilderCustom::applyValueStroke(Style::BuilderState& builderState, CSSValue& value)
     1268inline void BuilderCustom::applyValueStroke(BuilderState& builderState, CSSValue& value)
    12681269{
    12691270    auto& svgStyle = builderState.style().accessSVGStyle();
     
    12961297}
    12971298
    1298 inline void StyleBuilderCustom::applyInitialContent(Style::BuilderState& builderState)
     1299inline void BuilderCustom::applyInitialContent(BuilderState& builderState)
    12991300{
    13001301    builderState.style().clearContent();
    13011302}
    13021303
    1303 inline void StyleBuilderCustom::applyInheritContent(Style::BuilderState&)
     1304inline void BuilderCustom::applyInheritContent(BuilderState&)
    13041305{
    13051306    // FIXME: In CSS3, it will be possible to inherit content. In CSS2 it is not. This
     
    13071308}
    13081309
    1309 inline void StyleBuilderCustom::applyValueContent(Style::BuilderState& builderState, CSSValue& value)
     1310inline void BuilderCustom::applyValueContent(BuilderState& builderState, CSSValue& value)
    13101311{
    13111312    if (is<CSSPrimitiveValue>(value)) {
     
    13911392}
    13921393
    1393 inline void StyleBuilderCustom::applyInheritFontVariantLigatures(Style::BuilderState& builderState)
     1394inline void BuilderCustom::applyInheritFontVariantLigatures(BuilderState& builderState)
    13941395{
    13951396    auto fontDescription = builderState.fontDescription();
     
    14011402}
    14021403
    1403 inline void StyleBuilderCustom::applyInitialFontVariantLigatures(Style::BuilderState& builderState)
     1404inline void BuilderCustom::applyInitialFontVariantLigatures(BuilderState& builderState)
    14041405{
    14051406    auto fontDescription = builderState.fontDescription();
     
    14111412}
    14121413
    1413 inline void StyleBuilderCustom::applyValueFontVariantLigatures(Style::BuilderState& builderState, CSSValue& value)
     1414inline void BuilderCustom::applyValueFontVariantLigatures(BuilderState& builderState, CSSValue& value)
    14141415{
    14151416    auto fontDescription = builderState.fontDescription();
     
    14221423}
    14231424
    1424 inline void StyleBuilderCustom::applyInheritFontVariantNumeric(Style::BuilderState& builderState)
     1425inline void BuilderCustom::applyInheritFontVariantNumeric(BuilderState& builderState)
    14251426{
    14261427    auto fontDescription = builderState.fontDescription();
     
    14331434}
    14341435
    1435 inline void StyleBuilderCustom::applyInitialFontVariantNumeric(Style::BuilderState& builderState)
     1436inline void BuilderCustom::applyInitialFontVariantNumeric(BuilderState& builderState)
    14361437{
    14371438    auto fontDescription = builderState.fontDescription();
     
    14441445}
    14451446
    1446 inline void StyleBuilderCustom::applyValueFontVariantNumeric(Style::BuilderState& builderState, CSSValue& value)
     1447inline void BuilderCustom::applyValueFontVariantNumeric(BuilderState& builderState, CSSValue& value)
    14471448{
    14481449    auto fontDescription = builderState.fontDescription();
     
    14561457}
    14571458
    1458 inline void StyleBuilderCustom::applyInheritFontVariantEastAsian(Style::BuilderState& builderState)
     1459inline void BuilderCustom::applyInheritFontVariantEastAsian(BuilderState& builderState)
    14591460{
    14601461    auto fontDescription = builderState.fontDescription();
     
    14651466}
    14661467
    1467 inline void StyleBuilderCustom::applyInitialFontVariantEastAsian(Style::BuilderState& builderState)
     1468inline void BuilderCustom::applyInitialFontVariantEastAsian(BuilderState& builderState)
    14681469{
    14691470    auto fontDescription = builderState.fontDescription();
     
    14741475}
    14751476
    1476 inline void StyleBuilderCustom::applyValueFontVariantEastAsian(Style::BuilderState& builderState, CSSValue& value)
     1477inline void BuilderCustom::applyValueFontVariantEastAsian(BuilderState& builderState, CSSValue& value)
    14771478{
    14781479    auto fontDescription = builderState.fontDescription();
     
    14841485}
    14851486
    1486 inline void StyleBuilderCustom::applyInitialFontSize(Style::BuilderState& builderState)
     1487inline void BuilderCustom::applyInitialFontSize(BuilderState& builderState)
    14871488{
    14881489    auto fontDescription = builderState.style().fontDescription();
     
    14971498}
    14981499
    1499 inline void StyleBuilderCustom::applyInheritFontSize(Style::BuilderState& builderState)
     1500inline void BuilderCustom::applyInheritFontSize(BuilderState& builderState)
    15001501{
    15011502    const auto& parentFontDescription = builderState.parentStyle().fontDescription();
     
    15131514// When the CSS keyword "larger" is used, this function will attempt to match within the keyword
    15141515// table, and failing that, will simply multiply by 1.2.
    1515 inline float StyleBuilderCustom::largerFontSize(float size)
     1516inline float BuilderCustom::largerFontSize(float size)
    15161517{
    15171518    // FIXME: Figure out where we fall in the size ranges (xx-small to xxx-large) and scale up to
     
    15211522
    15221523// Like the previous function, but for the keyword "smaller".
    1523 inline float StyleBuilderCustom::smallerFontSize(float size)
     1524inline float BuilderCustom::smallerFontSize(float size)
    15241525{
    15251526    // FIXME: Figure out where we fall in the size ranges (xx-small to xxx-large) and scale down to
     
    15281529}
    15291530
    1530 inline float StyleBuilderCustom::determineRubyTextSizeMultiplier(Style::BuilderState& builderState)
     1531inline float BuilderCustom::determineRubyTextSizeMultiplier(BuilderState& builderState)
    15311532{
    15321533    if (builderState.style().rubyPosition() != RubyPosition::InterCharacter)
     
    15451546}
    15461547
    1547 inline void StyleBuilderCustom::applyInitialFontStyle(Style::BuilderState& builderState)
     1548inline void BuilderCustom::applyInitialFontStyle(BuilderState& builderState)
    15481549{
    15491550    auto fontDescription = builderState.fontDescription();
     
    15531554}
    15541555
    1555 inline void StyleBuilderCustom::applyInheritFontStyle(Style::BuilderState& builderState)
     1556inline void BuilderCustom::applyInheritFontStyle(BuilderState& builderState)
    15561557{
    15571558    auto fontDescription = builderState.fontDescription();
     
    15611562}
    15621563
    1563 inline void StyleBuilderCustom::applyValueFontStyle(Style::BuilderState& builderState, CSSValue& value)
     1564inline void BuilderCustom::applyValueFontStyle(BuilderState& builderState, CSSValue& value)
    15641565{
    15651566    auto& fontStyleValue = downcast<CSSFontStyleValue>(value);
    15661567    auto fontDescription = builderState.fontDescription();
    1567     fontDescription.setItalic(StyleBuilderConverter::convertFontStyleFromValue(fontStyleValue));
     1568    fontDescription.setItalic(BuilderConverter::convertFontStyleFromValue(fontStyleValue));
    15681569    fontDescription.setFontStyleAxis(fontStyleValue.fontStyleValue->valueID() == CSSValueItalic ? FontStyleAxis::ital : FontStyleAxis::slnt);
    15691570    builderState.setFontDescription(WTFMove(fontDescription));
    15701571}
    15711572
    1572 inline void StyleBuilderCustom::applyValueFontSize(Style::BuilderState& builderState, CSSValue& value)
     1573inline void BuilderCustom::applyValueFontSize(BuilderState& builderState, CSSValue& value)
    15731574{
    15741575    auto fontDescription = builderState.style().fontDescription();
     
    16301631}
    16311632
    1632 inline void StyleBuilderCustom::applyInitialGridTemplateAreas(Style::BuilderState& builderState)
     1633inline void BuilderCustom::applyInitialGridTemplateAreas(BuilderState& builderState)
    16331634{
    16341635    builderState.style().setNamedGridArea(RenderStyle::initialNamedGridArea());
     
    16371638}
    16381639
    1639 inline void StyleBuilderCustom::applyInheritGridTemplateAreas(Style::BuilderState& builderState)
     1640inline void BuilderCustom::applyInheritGridTemplateAreas(BuilderState& builderState)
    16401641{
    16411642    builderState.style().setNamedGridArea(builderState.parentStyle().namedGridArea());
     
    16441645}
    16451646
    1646 inline void StyleBuilderCustom::applyValueGridTemplateAreas(Style::BuilderState& builderState, CSSValue& value)
     1647inline void BuilderCustom::applyValueGridTemplateAreas(BuilderState& builderState, CSSValue& value)
    16471648{
    16481649    if (is<CSSPrimitiveValue>(value)) {
     
    16561657    NamedGridLinesMap namedGridColumnLines = builderState.style().namedGridColumnLines();
    16571658    NamedGridLinesMap namedGridRowLines = builderState.style().namedGridRowLines();
    1658     StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridColumnLines, ForColumns);
    1659     StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridRowLines, ForRows);
     1659    BuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridColumnLines, ForColumns);
     1660    BuilderConverter::createImplicitNamedGridLinesFromGridArea(newNamedGridAreas, namedGridRowLines, ForRows);
    16601661    builderState.style().setNamedGridColumnLines(namedGridColumnLines);
    16611662    builderState.style().setNamedGridRowLines(namedGridRowLines);
     
    16661667}
    16671668
    1668 inline void StyleBuilderCustom::applyInitialGridTemplateColumns(Style::BuilderState& builderState)
     1669inline void BuilderCustom::applyInitialGridTemplateColumns(BuilderState& builderState)
    16691670{
    16701671    builderState.style().setGridColumns(RenderStyle::initialGridColumns());
     
    16731674}
    16741675
    1675 inline void StyleBuilderCustom::applyInheritGridTemplateColumns(Style::BuilderState& builderState)
     1676inline void BuilderCustom::applyInheritGridTemplateColumns(BuilderState& builderState)
    16761677{
    16771678    builderState.style().setGridColumns(builderState.parentStyle().gridColumns());
     
    16911692    style.setGridAutoRepeat##TrackType##sInsertionPoint(tracksData.m_autoRepeatInsertionPoint);
    16921693
    1693 inline void StyleBuilderCustom::applyValueGridTemplateColumns(Style::BuilderState& builderState, CSSValue& value)
    1694 {
    1695     StyleBuilderConverter::TracksData tracksData;
    1696     if (!StyleBuilderConverter::createGridTrackList(value, tracksData, builderState))
     1694inline void BuilderCustom::applyValueGridTemplateColumns(BuilderState& builderState, CSSValue& value)
     1695{
     1696    BuilderConverter::TracksData tracksData;
     1697    if (!BuilderConverter::createGridTrackList(value, tracksData, builderState))
    16971698        return;
    16981699    const NamedGridAreaMap& namedGridAreas = builderState.style().namedGridArea();
    16991700    if (!namedGridAreas.isEmpty())
    1700         StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForColumns);
     1701        BuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForColumns);
    17011702
    17021703    SET_TRACKS_DATA(tracksData, builderState.style(), Column);
    17031704}
    17041705
    1705 inline void StyleBuilderCustom::applyInitialGridTemplateRows(Style::BuilderState& builderState)
     1706inline void BuilderCustom::applyInitialGridTemplateRows(BuilderState& builderState)
    17061707{
    17071708    builderState.style().setGridRows(RenderStyle::initialGridRows());
     
    17101711}
    17111712
    1712 inline void StyleBuilderCustom::applyInheritGridTemplateRows(Style::BuilderState& builderState)
     1713inline void BuilderCustom::applyInheritGridTemplateRows(BuilderState& builderState)
    17131714{
    17141715    builderState.style().setGridRows(builderState.parentStyle().gridRows());
     
    17171718}
    17181719
    1719 inline void StyleBuilderCustom::applyValueGridTemplateRows(Style::BuilderState& builderState, CSSValue& value)
    1720 {
    1721     StyleBuilderConverter::TracksData tracksData;
    1722     if (!StyleBuilderConverter::createGridTrackList(value, tracksData, builderState))
     1720inline void BuilderCustom::applyValueGridTemplateRows(BuilderState& builderState, CSSValue& value)
     1721{
     1722    BuilderConverter::TracksData tracksData;
     1723    if (!BuilderConverter::createGridTrackList(value, tracksData, builderState))
    17231724        return;
    17241725    const NamedGridAreaMap& namedGridAreas = builderState.style().namedGridArea();
    17251726    if (!namedGridAreas.isEmpty())
    1726         StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForRows);
     1727        BuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForRows);
    17271728
    17281729    SET_TRACKS_DATA(tracksData, builderState.style(), Row);
    17291730}
    17301731
    1731 void StyleBuilderCustom::applyValueAlt(Style::BuilderState& builderState, CSSValue& value)
     1732void BuilderCustom::applyValueAlt(BuilderState& builderState, CSSValue& value)
    17321733{
    17331734    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    17511752}
    17521753
    1753 inline void StyleBuilderCustom::applyValueWillChange(Style::BuilderState& builderState, CSSValue& value)
     1754inline void BuilderCustom::applyValueWillChange(BuilderState& builderState, CSSValue& value)
    17541755{
    17551756    if (is<CSSPrimitiveValue>(value)) {
     
    17801781}
    17811782
    1782 inline void StyleBuilderCustom::applyValueStrokeWidth(Style::BuilderState& builderState, CSSValue& value)
    1783 {
    1784     builderState.style().setStrokeWidth(StyleBuilderConverter::convertLength(builderState, value));
     1783inline void BuilderCustom::applyValueStrokeWidth(BuilderState& builderState, CSSValue& value)
     1784{
     1785    builderState.style().setStrokeWidth(BuilderConverter::convertLength(builderState, value));
    17851786    builderState.style().setHasExplicitlySetStrokeWidth(true);
    17861787}
    17871788
    1788 inline void StyleBuilderCustom::applyValueStrokeColor(Style::BuilderState& builderState, CSSValue& value)
     1789inline void BuilderCustom::applyValueStrokeColor(BuilderState& builderState, CSSValue& value)
    17891790{
    17901791    auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
     
    17961797}
    17971798
    1798 inline void StyleBuilderCustom::applyInitialCustomProperty(Style::BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name)
     1799inline void BuilderCustom::applyInitialCustomProperty(BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name)
    17991800{
    18001801    if (registered && registered->initialValue()) {
     
    18081809}
    18091810
    1810 inline void StyleBuilderCustom::applyInheritCustomProperty(Style::BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name)
     1811inline void BuilderCustom::applyInheritCustomProperty(BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name)
    18111812{
    18121813    auto* parentValue = builderState.parentStyle().inheritedCustomProperties().get(name);
     
    18171818}
    18181819
    1819 inline void StyleBuilderCustom::applyValueCustomProperty(Style::BuilderState& builderState, const CSSRegisteredCustomProperty* registered, CSSCustomPropertyValue& value)
     1820inline void BuilderCustom::applyValueCustomProperty(BuilderState& builderState, const CSSRegisteredCustomProperty* registered, CSSCustomPropertyValue& value)
    18201821{
    18211822    ASSERT(value.isResolved());
     
    18281829}
    18291830
    1830 } // namespace WebCore
     1831}
     1832}
Note: See TracChangeset for help on using the changeset viewer.