Changeset 251841 in webkit
- Timestamp:
- Oct 31, 2019 7:28:27 AM (4 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 added
- 1 deleted
- 11 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r251318 r251841 1724 1724 # Generate CSS property names 1725 1725 add_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.cpp1726 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 1727 1727 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl 1728 1728 DEPENDS ${WebCore_CSS_PROPERTY_NAMES} … … 1732 1732 VERBATIM) 1733 1733 list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/CSSPropertyNames.cpp) 1734 list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilder .cpp)1734 list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StyleBuilderGenerated.cpp) 1735 1735 list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/StylePropertyShorthandFunctions.cpp) 1736 1736 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h) -
trunk/Source/WebCore/ChangeLog
r251840 r251841 1 2019-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 1 246 2019-10-31 Antoine Quint <graouts@apple.com> 2 247 -
trunk/Source/WebCore/DerivedSources.make
r251737 r251841 1290 1290 SelectorPseudoClassAndCompatibilityElementMap.cpp \ 1291 1291 SelectorPseudoElementTypeMap.cpp \ 1292 StyleBuilder .cpp \1292 StyleBuilderGenerated.cpp \ 1293 1293 StylePropertyShorthandFunctions.cpp \ 1294 1294 StylePropertyShorthandFunctions.h \ … … 1339 1339 CSSPropertyNames.cpp \ 1340 1340 CSSPropertyNames.h \ 1341 StyleBuilder .cpp \1341 StyleBuilderGenerated.cpp \ 1342 1342 StylePropertyShorthandFunctions.cpp \ 1343 1343 StylePropertyShorthandFunctions.h \ -
trunk/Source/WebCore/Sources.txt
r251796 r251841 2603 2603 PlugInsResourcesData.cpp 2604 2604 SVGElementFactory.cpp 2605 StyleBuilder .cpp2605 StyleBuilderGenerated.cpp 2606 2606 StylePropertyShorthandFunctions.cpp 2607 2607 UserAgentStyleSheetsData.cpp -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r251834 r251841 2417 2417 837D46271FA2A8CE0054E1FA /* ServiceWorkerClientIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 837D46251FA2A8C50054E1FA /* ServiceWorkerClientIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2418 2418 837FB3451F9EA06D00D0FC31 /* ExtendableMessageEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 837FB3401F9EA06600D0FC31 /* ExtendableMessageEvent.h */; }; 2419 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */; };2420 2419 838867351D13BA5F003697D0 /* RenderObjectEnums.h in Headers */ = {isa = PBXBuildFile; fileRef = 838867341D13BA59003697D0 /* RenderObjectEnums.h */; settings = {ATTRIBUTES = (Private, ); }; }; 2421 2420 838CA6BD1FC0DFE9005D9FA5 /* ServiceWorkerJobDataIdentifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 838CA6BB1FC0DFDD005D9FA5 /* ServiceWorkerJobDataIdentifier.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 4844 4843 E4ABABF32368B95900FA4345 /* StyleBuilderState.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABF22368B95800FA4345 /* StyleBuilderState.h */; }; 4845 4844 E4ABABF52368C6EF00FA4345 /* CascadeLevel.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABABF42368C6EF00FA4345 /* CascadeLevel.h */; }; 4845 E4ABAC04236AE95900FA4345 /* StyleBuilderGenerated.h in Headers */ = {isa = PBXBuildFile; fileRef = E4ABAC02236AE95800FA4345 /* StyleBuilderGenerated.h */; }; 4846 4846 E4AE7C1617D1BB950009FB31 /* ElementIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AE7C1517D1BB950009FB31 /* ElementIterator.h */; settings = {ATTRIBUTES = (Private, ); }; }; 4847 4847 E4AE7C1A17D232350009FB31 /* ElementAncestorIterator.h in Headers */ = {isa = PBXBuildFile; fileRef = E4AE7C1917D232350009FB31 /* ElementAncestorIterator.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 10178 10178 837FB3421F9EA06700D0FC31 /* ExtendableMessageEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExtendableMessageEvent.cpp; sourceTree = "<group>"; }; 10179 10179 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; }; 10182 10181 838867341D13BA59003697D0 /* RenderObjectEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderObjectEnums.h; sourceTree = "<group>"; }; 10183 10182 838869EB1CE81E9E00D16A9E /* JSTextCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTextCustom.cpp; sourceTree = "<group>"; }; … … 15181 15180 E4ABABF22368B95800FA4345 /* StyleBuilderState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilderState.h; sourceTree = "<group>"; }; 15182 15181 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>"; }; 15183 15183 E4AE7C1517D1BB950009FB31 /* ElementIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementIterator.h; sourceTree = "<group>"; }; 15184 15184 E4AE7C1917D232350009FB31 /* ElementAncestorIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementAncestorIterator.h; sourceTree = "<group>"; }; … … 20158 20158 9908B0FD1BCAD07D00ED0F55 /* StreamInternalsBuiltins.cpp */, 20159 20159 9B03D8061BB3110D00B764C9 /* StreamInternalsBuiltins.h */, 20160 8386A96E19F61E4F00E1EC4A /* StyleBuilder .cpp */,20160 8386A96E19F61E4F00E1EC4A /* StyleBuilderGenerated.cpp */, 20161 20161 83C05A581A686212007E5DEA /* StylePropertyShorthandFunctions.cpp */, 20162 20162 83C05A591A686212007E5DEA /* StylePropertyShorthandFunctions.h */, … … 26959 26959 E4ABABE52361A34200FA4345 /* PropertyCascade.cpp */, 26960 26960 E4ABABE22361A32900FA4345 /* PropertyCascade.h */, 26961 83B9687919F8AB83004EF7AF /* StyleBuilderConverter.h */, 26962 835D363619FF6193004C93AB /* StyleBuilderCustom.h */, 26963 E4ABAC02236AE95800FA4345 /* StyleBuilderGenerated.h */, 26961 26964 E4ABABF02368B91800FA4345 /* StyleBuilderState.cpp */, 26962 26965 E4ABABF22368B95800FA4345 /* StyleBuilderState.h */, … … 27371 27374 26AA0F9A18D2973D00419381 /* SelectorPseudoElementTypeMap.in */, 27372 27375 43107BE118CC19DE00CC18E8 /* SelectorPseudoTypeMap.h */, 27373 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */,27374 83B9687919F8AB83004EF7AF /* StyleBuilderConverter.h */,27375 835D363619FF6193004C93AB /* StyleBuilderCustom.h */,27376 27376 941827881D8B242200492764 /* StyleColor.cpp */, 27377 27377 941827891D8B242200492764 /* StyleColor.h */, … … 32143 32143 BC5EB6A30E81DC4F00B25965 /* StyleBackgroundData.h in Headers */, 32144 32144 BC5EB67B0E81D3BE00B25965 /* StyleBoxData.h in Headers */, 32145 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */,32146 32145 83B9687B19F8AB83004EF7AF /* StyleBuilderConverter.h in Headers */, 32147 32146 835D363719FF6193004C93AB /* StyleBuilderCustom.h in Headers */, … … 32349 32348 B2227AA30D00BF220071B782 /* SVGScriptElement.h in Headers */, 32350 32349 B2227AA60D00BF220071B782 /* SVGSetElement.h in Headers */, 32350 E4ABAC04236AE95900FA4345 /* StyleBuilderGenerated.h in Headers */, 32351 32351 E4AFD0100DAF335500F5F55C /* SVGSMILElement.h in Headers */, 32352 32352 B2227AA90D00BF220071B782 /* SVGStopElement.h in Headers */, -
trunk/Source/WebCore/css/CSSFontFace.cpp
r251413 r251841 139 139 auto& value0 = downcast<CSSPrimitiveValue>(*valueList.item(0)); 140 140 auto& value1 = downcast<CSSPrimitiveValue>(*valueList.item(1)); 141 auto result0 = Style BuilderConverter::convertFontWeightFromValue(value0);142 auto result1 = Style BuilderConverter::convertFontWeightFromValue(value1);141 auto result0 = Style::BuilderConverter::convertFontWeightFromValue(value0); 142 auto result1 = Style::BuilderConverter::convertFontWeightFromValue(value1); 143 143 return { result0, result1 }; 144 144 } … … 146 146 ASSERT(is<CSSPrimitiveValue>(value)); 147 147 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); 148 FontSelectionValue result = Style BuilderConverter::convertFontWeightFromValue(primitiveValue);148 FontSelectionValue result = Style::BuilderConverter::convertFontWeightFromValue(primitiveValue); 149 149 return { result, result }; 150 150 } … … 177 177 auto& value0 = downcast<CSSPrimitiveValue>(*valueList.item(0)); 178 178 auto& value1 = downcast<CSSPrimitiveValue>(*valueList.item(1)); 179 auto result0 = Style BuilderConverter::convertFontStretchFromValue(value0);180 auto result1 = Style BuilderConverter::convertFontStretchFromValue(value1);179 auto result0 = Style::BuilderConverter::convertFontStretchFromValue(value0); 180 auto result1 = Style::BuilderConverter::convertFontStretchFromValue(value1); 181 181 return { result0, result1 }; 182 182 } … … 184 184 ASSERT(is<CSSPrimitiveValue>(value)); 185 185 const auto& primitiveValue = downcast<CSSPrimitiveValue>(value); 186 FontSelectionValue result = Style BuilderConverter::convertFontStretchFromValue(primitiveValue);186 FontSelectionValue result = Style::BuilderConverter::convertFontStretchFromValue(primitiveValue); 187 187 return { result, result }; 188 188 } … … 207 207 { 208 208 if (value.isFontStyleValue()) { 209 auto result = Style BuilderConverter::convertFontStyleFromValue(value);209 auto result = Style::BuilderConverter::convertFontStyleFromValue(value); 210 210 return { result.valueOr(normalItalicValue()), result.valueOr(normalItalicValue()) }; 211 211 } -
trunk/Source/WebCore/css/CSSFontFaceSet.cpp
r248846 r251841 315 315 styleValue = CSSFontStyleValue::create(CSSValuePool::singleton().createIdentifierValue(CSSValueNormal)); 316 316 317 auto weightSelectionValue = Style BuilderConverter::convertFontWeightFromValue(*weightValue);318 auto stretchSelectionValue = Style BuilderConverter::convertFontStretchFromValue(*stretchValue);319 auto styleSelectionValue = Style BuilderConverter::convertFontStyleFromValue(*styleValue);317 auto weightSelectionValue = Style::BuilderConverter::convertFontWeightFromValue(*weightValue); 318 auto stretchSelectionValue = Style::BuilderConverter::convertFontStretchFromValue(*stretchValue); 319 auto styleSelectionValue = Style::BuilderConverter::convertFontStyleFromValue(*styleValue); 320 320 321 321 return { weightSelectionValue, stretchSelectionValue, styleSelectionValue }; -
trunk/Source/WebCore/css/CSSToStyleMap.cpp
r251796 r251841 232 232 if (pair) { 233 233 ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPositionX || propertyID == CSSPropertyWebkitMaskPositionX); 234 length = Style BuilderConverter::convertLength(m_builderState, *pair->second());234 length = Style::BuilderConverter::convertLength(m_builderState, *pair->second()); 235 235 } else 236 length = Style BuilderConverter::convertPositionComponentX(m_builderState, value);236 length = Style::BuilderConverter::convertPositionComponentX(m_builderState, value); 237 237 238 238 layer.setXPosition(length); … … 256 256 if (pair) { 257 257 ASSERT_UNUSED(propertyID, propertyID == CSSPropertyBackgroundPositionY || propertyID == CSSPropertyWebkitMaskPositionY); 258 length = Style BuilderConverter::convertLength(m_builderState, *pair->second());258 length = Style::BuilderConverter::convertLength(m_builderState, *pair->second()); 259 259 } else 260 length = Style BuilderConverter::convertPositionComponentY(m_builderState, value);260 length = Style::BuilderConverter::convertPositionComponentY(m_builderState, value); 261 261 262 262 layer.setYPosition(length); -
trunk/Source/WebCore/css/makeprop.pl
r251796 r251841 67 67 my %propertiesWithStyleBuilderOptions; 68 68 my %styleBuilderOptions = ( 69 "animatable" => 1, # Defined in Source/WebCore/ css/StyleBuilderConverter.h69 "animatable" => 1, # Defined in Source/WebCore/style/StyleBuilderConverter.h 70 70 "auto-functions" => 1, 71 71 "conditional-converter" => 1, … … 555 555 556 556 # 557 # StyleBuilder .cpp generator.557 # StyleBuilderGenerated.cpp generator. 558 558 # 559 559 … … 562 562 my $builderFunction = shift; 563 563 564 return $propertiesWithStyleBuilderOptions{$name}{"custom"}{$builderFunction} ? " StyleBuilderCustom" : "StyleBuilderFunctions";564 return $propertiesWithStyleBuilderOptions{$name}{"custom"}{$builderFunction} ? "BuilderCustom" : "BuilderFunctions"; 565 565 } 566 566 … … 914 914 my $isSVG = exists $propertiesWithStyleBuilderOptions{$name}{"svg"}; 915 915 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"; 917 917 $setterContent .= $indent . "{\n"; 918 918 my $style = "builderState.style()"; … … 944 944 945 945 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"; 947 947 $setterContent .= $indent . "{\n"; 948 948 my $isSVG = exists $propertiesWithStyleBuilderOptions{$name}{"svg"}; … … 991 991 992 992 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"; 994 994 $setterContent .= $indent . "{\n"; 995 995 my $convertedValue; 996 996 if (exists($propertiesWithStyleBuilderOptions{$name}{"converter"})) { 997 $convertedValue = " StyleBuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"converter"} . "(builderState, value)";997 $convertedValue = "BuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"converter"} . "(builderState, value)"; 998 998 } 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"; 1000 1000 $convertedValue = "WTFMove(convertedValue.value())"; 1001 1001 } else { … … 1043 1043 } 1044 1044 1045 open STYLEBUILDER, ">StyleBuilder .cpp" || die "Could not open StyleBuilder.cpp for writing";1045 open STYLEBUILDER, ">StyleBuilderGenerated.cpp" || die "Could not open StyleBuilderGenerated.cpp for writing"; 1046 1046 print STYLEBUILDER << "EOF"; 1047 1047 /* This file is automatically generated from $inputFile by makeprop, do not edit */ 1048 1048 1049 1049 #include "config.h" 1050 #include "StyleBuilder .h"1050 #include "StyleBuilderGenerated.h" 1051 1051 1052 1052 #include "CSSPrimitiveValueMappings.h" … … 1059 1059 1060 1060 namespace WebCore { 1061 1062 class StyleBuilderFunctions { 1061 namespace Style { 1062 1063 class BuilderFunctions { 1063 1064 public: 1064 1065 EOF … … 1084 1085 }; 1085 1086 1086 void StyleBuilder::applyProperty(CSSPropertyID property, Style::BuilderState& builderState, CSSValue& value, bool isInitial, bool isInherit, const CSSRegisteredCustomProperty* registered)1087 void BuilderGenerated::applyProperty(CSSPropertyID property, BuilderState& builderState, CSSValue& value, bool isInitial, bool isInherit, const CSSRegisteredCustomProperty* registered) 1087 1088 { 1088 1089 switch (property) { … … 1092 1093 auto& customProperty = downcast<CSSCustomPropertyValue>(value); 1093 1094 if (isInitial) 1094 StyleBuilderCustom::applyInitialCustomProperty(builderState, registered, customProperty.name());1095 BuilderCustom::applyInitialCustomProperty(builderState, registered, customProperty.name()); 1095 1096 else if (isInherit) 1096 StyleBuilderCustom::applyInheritCustomProperty(builderState, registered, customProperty.name());1097 BuilderCustom::applyInheritCustomProperty(builderState, registered, customProperty.name()); 1097 1098 else 1098 StyleBuilderCustom::applyValueCustomProperty(builderState, registered, customProperty);1099 BuilderCustom::applyValueCustomProperty(builderState, registered, customProperty); 1099 1100 break; 1100 1101 } … … 1121 1122 } 1122 1123 1124 } // namespace Style 1123 1125 } // namespace WebCore 1124 1126 EOF -
trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp
r251796 r251841 4301 4301 auto primitiveVal = consumeWidthOrHeight(m_range, m_context); 4302 4302 if (primitiveVal && primitiveVal->isPrimitiveValue() && downcast<CSSPrimitiveValue>(*primitiveVal).isLength()) { 4303 auto length = Style BuilderConverter::convertLength(builderState, *primitiveVal);4303 auto length = Style::BuilderConverter::convertLength(builderState, *primitiveVal); 4304 4304 if (!length.isCalculated() && !length.isUndefined()) 4305 4305 return CSSCustomPropertyValue::createSyntaxLength(name, WTFMove(length)); -
trunk/Source/WebCore/style/PropertyCascade.cpp
r251796 r251841 31 31 #include "CSSValuePool.h" 32 32 #include "PaintWorkletGlobalScope.h" 33 #include "StyleBuilder .h"33 #include "StyleBuilderGenerated.h" 34 34 #include "StylePropertyShorthand.h" 35 35 #include "StyleResolver.h" … … 625 625 #endif 626 626 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); 629 628 } 630 629 -
trunk/Source/WebCore/style/StyleBuilderConverter.h
r251840 r251841 60 60 61 61 namespace WebCore { 62 namespace Style { 62 63 63 64 // Note that we assume the CSS parser only allows valid CSSValue types. 64 class StyleBuilderConverter {65 class BuilderConverter { 65 66 public: 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&); 84 85 #if ENABLE(DARK_MODE_CSS) 85 static StyleColorScheme convertColorScheme( Style::BuilderState&, const CSSValue&);86 static StyleColorScheme convertColorScheme(BuilderState&, const CSSValue&); 86 87 #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&); 106 107 #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&); 109 110 #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&); 118 119 #if PLATFORM(IOS_FAMILY) 119 static bool convertTouchCallout( Style::BuilderState&, const CSSValue&);120 static bool convertTouchCallout(BuilderState&, const CSSValue&); 120 121 #endif 121 122 #if ENABLE(TOUCH_EVENTS) 122 static Color convertTapHighlightColor( Style::BuilderState&, const CSSValue&);123 static Color convertTapHighlightColor(BuilderState&, const CSSValue&); 123 124 #endif 124 125 #if ENABLE(POINTER_EVENTS) 125 static OptionSet<TouchAction> convertTouchAction( Style::BuilderState&, const CSSValue&);126 static OptionSet<TouchAction> convertTouchAction(BuilderState&, const CSSValue&); 126 127 #endif 127 128 #if ENABLE(OVERFLOW_SCROLLING_TOUCH) 128 static bool convertOverflowScrolling( Style::BuilderState&, const CSSValue&);129 static bool convertOverflowScrolling(BuilderState&, const CSSValue&); 129 130 #endif 130 static FontFeatureSettings convertFontFeatureSettings( Style::BuilderState&, const CSSValue&);131 static FontFeatureSettings convertFontFeatureSettings(BuilderState&, const CSSValue&); 131 132 static FontSelectionValue convertFontWeightFromValue(const CSSValue&); 132 133 static FontSelectionValue convertFontStretchFromValue(const CSSValue&); 133 134 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&); 137 138 #if ENABLE(VARIATION_FONTS) 138 static FontVariationSettings convertFontVariationSettings( Style::BuilderState&, const CSSValue&);139 static FontVariationSettings convertFontVariationSettings(BuilderState&, const CSSValue&); 139 140 #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&); 153 154 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&); 167 168 168 169 private: 169 friend class StyleBuilderCustom;170 friend class BuilderCustom; 170 171 171 172 static Length convertToRadiusLength(CSSToLengthConversionData&, const CSSPrimitiveValue&); … … 173 174 static OptionSet<TextDecorationSkip> valueToDecorationSkip(const CSSPrimitiveValue&); 174 175 #if ENABLE(CSS_SCROLL_SNAP) 175 static Length parseSnapCoordinate( Style::BuilderState&, const CSSValue&);176 static Length parseSnapCoordinate(BuilderState&, const CSSValue&); 176 177 #endif 177 178 … … 181 182 182 183 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&); 187 188 struct TracksData; 188 static bool createGridTrackList(const CSSValue&, TracksData&, Style::BuilderState&);189 static bool createGridTrackList(const CSSValue&, TracksData&, BuilderState&); 189 190 static bool createGridPosition(const CSSValue&, GridPosition&); 190 191 static void createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap&, NamedGridLinesMap&, GridTrackSizingDirection); 191 static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor( Style::BuilderState&);192 static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(BuilderState&); 192 193 }; 193 194 194 inline Length StyleBuilderConverter::convertLength(const Style::BuilderState& builderState, const CSSValue& value)195 inline Length BuilderConverter::convertLength(const BuilderState& builderState, const CSSValue& value) 195 196 { 196 197 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 215 216 } 216 217 217 inline Length StyleBuilderConverter::convertLengthOrAuto(const Style::BuilderState& builderState, const CSSValue& value)218 inline Length BuilderConverter::convertLengthOrAuto(const BuilderState& builderState, const CSSValue& value) 218 219 { 219 220 if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto) … … 222 223 } 223 224 224 inline Length StyleBuilderConverter::convertLengthSizing(const Style::BuilderState& builderState, const CSSValue& value)225 inline Length BuilderConverter::convertLengthSizing(const BuilderState& builderState, const CSSValue& value) 225 226 { 226 227 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 251 252 } 252 253 253 inline Length StyleBuilderConverter::convertLengthMaxSizing(const Style::BuilderState& builderState, const CSSValue& value)254 inline Length BuilderConverter::convertLengthMaxSizing(const BuilderState& builderState, const CSSValue& value) 254 255 { 255 256 if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone) … … 258 259 } 259 260 260 inline TabSize StyleBuilderConverter::convertTabSize(const Style::BuilderState& builderState, const CSSValue& value)261 inline TabSize BuilderConverter::convertTabSize(const BuilderState& builderState, const CSSValue& value) 261 262 { 262 263 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 267 268 268 269 template<typename T> 269 inline T StyleBuilderConverter::convertComputedLength(Style::BuilderState& builderState, const CSSValue& value)270 inline T BuilderConverter::convertComputedLength(BuilderState& builderState, const CSSValue& value) 270 271 { 271 272 return downcast<CSSPrimitiveValue>(value).computeLength<T>(builderState.cssToLengthConversionData()); … … 273 274 274 275 template<typename T> 275 inline T StyleBuilderConverter::convertLineWidth(Style::BuilderState& builderState, const CSSValue& value)276 inline T BuilderConverter::convertLineWidth(BuilderState& builderState, const CSSValue& value) 276 277 { 277 278 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 303 304 } 304 305 305 inline float StyleBuilderConverter::convertSpacing(Style::BuilderState& builderState, const CSSValue& value)306 inline float BuilderConverter::convertSpacing(BuilderState& builderState, const CSSValue& value) 306 307 { 307 308 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 315 316 } 316 317 317 inline Length StyleBuilderConverter::convertToRadiusLength(CSSToLengthConversionData& conversionData, const CSSPrimitiveValue& value)318 inline Length BuilderConverter::convertToRadiusLength(CSSToLengthConversionData& conversionData, const CSSPrimitiveValue& value) 318 319 { 319 320 if (value.isPercentage()) … … 324 325 } 325 326 326 inline LengthSize StyleBuilderConverter::convertRadius(Style::BuilderState& builderState, const CSSValue& value)327 inline LengthSize BuilderConverter::convertRadius(BuilderState& builderState, const CSSValue& value) 327 328 { 328 329 auto* pair = downcast<CSSPrimitiveValue>(value).pairValue(); … … 341 342 } 342 343 343 inline Length StyleBuilderConverter::convertTo100PercentMinusLength(const Length& length)344 inline Length BuilderConverter::convertTo100PercentMinusLength(const Length& length) 344 345 { 345 346 if (length.isPercent()) … … 355 356 } 356 357 357 inline Length StyleBuilderConverter::convertPositionComponentX(Style::BuilderState& builderState, const CSSValue& value)358 inline Length BuilderConverter::convertPositionComponentX(BuilderState& builderState, const CSSValue& value) 358 359 { 359 360 return convertPositionComponent<CSSValueLeft, CSSValueRight>(builderState, downcast<CSSPrimitiveValue>(value)); 360 361 } 361 362 362 inline Length StyleBuilderConverter::convertPositionComponentY(Style::BuilderState& builderState, const CSSValue& value)363 inline Length BuilderConverter::convertPositionComponentY(BuilderState& builderState, const CSSValue& value) 363 364 { 364 365 return convertPositionComponent<CSSValueTop, CSSValueBottom>(builderState, downcast<CSSPrimitiveValue>(value)); … … 366 367 367 368 template<CSSValueID cssValueFor0, CSSValueID cssValueFor100> 368 inline Length StyleBuilderConverter::convertPositionComponent(Style::BuilderState& builderState, const CSSPrimitiveValue& value)369 inline Length BuilderConverter::convertPositionComponent(BuilderState& builderState, const CSSPrimitiveValue& value) 369 370 { 370 371 Length length; … … 401 402 } 402 403 403 inline LengthPoint StyleBuilderConverter::convertObjectPosition(Style::BuilderState& builderState, const CSSValue& value)404 inline LengthPoint BuilderConverter::convertObjectPosition(BuilderState& builderState, const CSSValue& value) 404 405 { 405 406 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 414 415 } 415 416 416 inline OptionSet<TextDecoration> StyleBuilderConverter::convertTextDecoration(Style::BuilderState&, const CSSValue& value)417 inline OptionSet<TextDecoration> BuilderConverter::convertTextDecoration(BuilderState&, const CSSValue& value) 417 418 { 418 419 auto result = RenderStyle::initialTextDecoration(); … … 425 426 426 427 template<typename T> 427 inline T StyleBuilderConverter::convertNumber(Style::BuilderState&, const CSSValue& value)428 inline T BuilderConverter::convertNumber(BuilderState&, const CSSValue& value) 428 429 { 429 430 return downcast<CSSPrimitiveValue>(value).value<T>(CSSPrimitiveValue::CSS_NUMBER); … … 431 432 432 433 template<typename T> 433 inline T StyleBuilderConverter::convertNumberOrAuto(Style::BuilderState& builderState, const CSSValue& value)434 inline T BuilderConverter::convertNumberOrAuto(BuilderState& builderState, const CSSValue& value) 434 435 { 435 436 if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto) … … 438 439 } 439 440 440 inline short StyleBuilderConverter::convertWebkitHyphenateLimitLines(Style::BuilderState&, const CSSValue& value)441 inline short BuilderConverter::convertWebkitHyphenateLimitLines(BuilderState&, const CSSValue& value) 441 442 { 442 443 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 447 448 448 449 template<CSSPropertyID property> 449 inline NinePieceImage StyleBuilderConverter::convertBorderImage(Style::BuilderState& builderState, CSSValue& value)450 inline NinePieceImage BuilderConverter::convertBorderImage(BuilderState& builderState, CSSValue& value) 450 451 { 451 452 NinePieceImage image; … … 455 456 456 457 template<CSSPropertyID property> 457 inline NinePieceImage StyleBuilderConverter::convertBorderMask(Style::BuilderState& builderState, CSSValue& value)458 inline NinePieceImage BuilderConverter::convertBorderMask(BuilderState& builderState, CSSValue& value) 458 459 { 459 460 NinePieceImage image(NinePieceImage::Type::Mask); … … 463 464 464 465 template<CSSPropertyID> 465 inline RefPtr<StyleImage> StyleBuilderConverter::convertStyleImage(Style::BuilderState& builderState, CSSValue& value)466 inline RefPtr<StyleImage> BuilderConverter::convertStyleImage(BuilderState& builderState, CSSValue& value) 466 467 { 467 468 return builderState.createStyleImage(value); 468 469 } 469 470 470 inline TransformOperations StyleBuilderConverter::convertTransform(Style::BuilderState& builderState, const CSSValue& value)471 inline TransformOperations BuilderConverter::convertTransform(BuilderState& builderState, const CSSValue& value) 471 472 { 472 473 TransformOperations operations; … … 476 477 477 478 #if ENABLE(DARK_MODE_CSS) 478 inline void StyleBuilderConverter::updateColorScheme(const CSSPrimitiveValue& primitiveValue, StyleColorScheme& colorScheme)479 inline void BuilderConverter::updateColorScheme(const CSSPrimitiveValue& primitiveValue, StyleColorScheme& colorScheme) 479 480 { 480 481 ASSERT(primitiveValue.isValueID()); … … 499 500 } 500 501 501 inline StyleColorScheme StyleBuilderConverter::convertColorScheme(Style::BuilderState&, const CSSValue& value)502 inline StyleColorScheme BuilderConverter::convertColorScheme(BuilderState&, const CSSValue& value) 502 503 { 503 504 StyleColorScheme colorScheme; … … 517 518 #endif 518 519 519 inline String StyleBuilderConverter::convertString(Style::BuilderState&, const CSSValue& value)520 inline String BuilderConverter::convertString(BuilderState&, const CSSValue& value) 520 521 { 521 522 return downcast<CSSPrimitiveValue>(value).stringValue(); 522 523 } 523 524 524 inline String StyleBuilderConverter::convertStringOrAuto(Style::BuilderState& builderState, const CSSValue& value)525 inline String BuilderConverter::convertStringOrAuto(BuilderState& builderState, const CSSValue& value) 525 526 { 526 527 if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto) … … 529 530 } 530 531 531 inline String StyleBuilderConverter::convertStringOrNone(Style::BuilderState& builderState, const CSSValue& value)532 inline String BuilderConverter::convertStringOrNone(BuilderState& builderState, const CSSValue& value) 532 533 { 533 534 if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone) … … 536 537 } 537 538 538 inline OptionSet<TextEmphasisPosition> StyleBuilderConverter::valueToEmphasisPosition(const CSSPrimitiveValue& primitiveValue)539 inline OptionSet<TextEmphasisPosition> BuilderConverter::valueToEmphasisPosition(const CSSPrimitiveValue& primitiveValue) 539 540 { 540 541 ASSERT(primitiveValue.isValueID()); … … 557 558 } 558 559 559 inline OptionSet<TextEmphasisPosition> StyleBuilderConverter::convertTextEmphasisPosition(Style::BuilderState&, const CSSValue& value)560 inline OptionSet<TextEmphasisPosition> BuilderConverter::convertTextEmphasisPosition(BuilderState&, const CSSValue& value) 560 561 { 561 562 if (is<CSSPrimitiveValue>(value)) … … 568 569 } 569 570 570 inline TextAlignMode StyleBuilderConverter::convertTextAlign(Style::BuilderState& builderState, const CSSValue& value)571 inline TextAlignMode BuilderConverter::convertTextAlign(BuilderState& builderState, const CSSValue& value) 571 572 { 572 573 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 584 585 } 585 586 586 inline RefPtr<ClipPathOperation> StyleBuilderConverter::convertClipPath(Style::BuilderState& builderState, const CSSValue& value)587 inline RefPtr<ClipPathOperation> BuilderConverter::convertClipPath(BuilderState& builderState, const CSSValue& value) 587 588 { 588 589 if (is<CSSPrimitiveValue>(value)) { … … 628 629 } 629 630 630 inline Resize StyleBuilderConverter::convertResize(Style::BuilderState& builderState, const CSSValue& value)631 inline Resize BuilderConverter::convertResize(BuilderState& builderState, const CSSValue& value) 631 632 { 632 633 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 641 642 } 642 643 643 inline int StyleBuilderConverter::convertMarqueeRepetition(Style::BuilderState&, const CSSValue& value)644 inline int BuilderConverter::convertMarqueeRepetition(BuilderState&, const CSSValue& value) 644 645 { 645 646 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 651 652 } 652 653 653 inline int StyleBuilderConverter::convertMarqueeSpeed(Style::BuilderState&, const CSSValue& value)654 inline int BuilderConverter::convertMarqueeSpeed(BuilderState&, const CSSValue& value) 654 655 { 655 656 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 680 681 } 681 682 682 inline Ref<QuotesData> StyleBuilderConverter::convertQuotes(Style::BuilderState&, const CSSValue& value)683 inline Ref<QuotesData> BuilderConverter::convertQuotes(BuilderState&, const CSSValue& value) 683 684 { 684 685 if (is<CSSPrimitiveValue>(value)) { … … 703 704 } 704 705 705 inline TextUnderlinePosition StyleBuilderConverter::convertTextUnderlinePosition(Style::BuilderState&, const CSSValue& value)706 inline TextUnderlinePosition BuilderConverter::convertTextUnderlinePosition(BuilderState&, const CSSValue& value) 706 707 { 707 708 ASSERT(is<CSSPrimitiveValue>(value)); … … 709 710 } 710 711 711 inline TextUnderlineOffset StyleBuilderConverter::convertTextUnderlineOffset(Style::BuilderState& builderState, const CSSValue& value)712 inline TextUnderlineOffset BuilderConverter::convertTextUnderlineOffset(BuilderState& builderState, const CSSValue& value) 712 713 { 713 714 ASSERT(is<CSSPrimitiveValue>(value)); … … 723 724 } 724 725 725 inline TextDecorationThickness StyleBuilderConverter::convertTextDecorationThickness(Style::BuilderState& builderState, const CSSValue& value)726 inline TextDecorationThickness BuilderConverter::convertTextDecorationThickness(BuilderState& builderState, const CSSValue& value) 726 727 { 727 728 ASSERT(is<CSSPrimitiveValue>(value)); … … 739 740 } 740 741 741 inline RefPtr<StyleReflection> StyleBuilderConverter::convertReflection(Style::BuilderState& builderState, const CSSValue& value)742 inline RefPtr<StyleReflection> BuilderConverter::convertReflection(BuilderState& builderState, const CSSValue& value) 742 743 { 743 744 if (is<CSSPrimitiveValue>(value)) { … … 759 760 } 760 761 761 inline IntSize StyleBuilderConverter::convertInitialLetter(Style::BuilderState&, const CSSValue& value)762 inline IntSize BuilderConverter::convertInitialLetter(BuilderState&, const CSSValue& value) 762 763 { 763 764 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 774 775 } 775 776 776 inline float StyleBuilderConverter::convertTextStrokeWidth(Style::BuilderState& builderState, const CSSValue& value)777 inline float BuilderConverter::convertTextStrokeWidth(BuilderState& builderState, const CSSValue& value) 777 778 { 778 779 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 804 805 } 805 806 806 inline OptionSet<LineBoxContain> StyleBuilderConverter::convertLineBoxContain(Style::BuilderState&, const CSSValue& value)807 inline OptionSet<LineBoxContain> BuilderConverter::convertLineBoxContain(BuilderState&, const CSSValue& value) 807 808 { 808 809 if (is<CSSPrimitiveValue>(value)) { … … 814 815 } 815 816 816 inline OptionSet<TextDecorationSkip> StyleBuilderConverter::valueToDecorationSkip(const CSSPrimitiveValue& primitiveValue)817 inline OptionSet<TextDecorationSkip> BuilderConverter::valueToDecorationSkip(const CSSPrimitiveValue& primitiveValue) 817 818 { 818 819 ASSERT(primitiveValue.isValueID()); … … 835 836 } 836 837 837 inline OptionSet<TextDecorationSkip> StyleBuilderConverter::convertTextDecorationSkip(Style::BuilderState&, const CSSValue& value)838 inline OptionSet<TextDecorationSkip> BuilderConverter::convertTextDecorationSkip(BuilderState&, const CSSValue& value) 838 839 { 839 840 if (is<CSSPrimitiveValue>(value)) … … 851 852 } 852 853 853 inline RefPtr<ShapeValue> StyleBuilderConverter::convertShapeValue(Style::BuilderState& builderState, CSSValue& value)854 inline RefPtr<ShapeValue> BuilderConverter::convertShapeValue(BuilderState& builderState, CSSValue& value) 854 855 { 855 856 if (is<CSSPrimitiveValue>(value)) { … … 890 891 #if ENABLE(CSS_SCROLL_SNAP) 891 892 892 inline ScrollSnapType StyleBuilderConverter::convertScrollSnapType(Style::BuilderState&, const CSSValue& value)893 inline ScrollSnapType BuilderConverter::convertScrollSnapType(BuilderState&, const CSSValue& value) 893 894 { 894 895 ScrollSnapType type; … … 915 916 } 916 917 917 inline ScrollSnapAlign StyleBuilderConverter::convertScrollSnapAlign(Style::BuilderState&, const CSSValue& value)918 inline ScrollSnapAlign BuilderConverter::convertScrollSnapAlign(BuilderState&, const CSSValue& value) 918 919 { 919 920 auto& values = downcast<CSSValueList>(value); … … 929 930 #endif 930 931 931 inline GridLength StyleBuilderConverter::createGridTrackBreadth(const CSSPrimitiveValue& primitiveValue, Style::BuilderState& builderState)932 inline GridLength BuilderConverter::createGridTrackBreadth(const CSSPrimitiveValue& primitiveValue, BuilderState& builderState) 932 933 { 933 934 if (primitiveValue.valueID() == CSSValueMinContent || primitiveValue.valueID() == CSSValueWebkitMinContent) … … 944 945 } 945 946 946 inline GridTrackSize StyleBuilderConverter::createGridTrackSize(const CSSValue& value, Style::BuilderState& builderState)947 inline GridTrackSize BuilderConverter::createGridTrackSize(const CSSValue& value, BuilderState& builderState) 947 948 { 948 949 if (is<CSSPrimitiveValue>(value)) … … 955 956 return GridTrackSize(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(0)), builderState), FitContentTrackSizing); 956 957 957 ASSERT_WITH_SECURITY_IMPLICATION(function.length() == 2);958 RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(function.length() == 2); 958 959 GridLength minTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(0)), builderState)); 959 960 GridLength maxTrackBreadth(createGridTrackBreadth(downcast<CSSPrimitiveValue>(*function.itemWithoutBoundsCheck(1)), builderState)); … … 974 975 } 975 976 976 struct StyleBuilderConverter::TracksData {977 struct BuilderConverter::TracksData { 977 978 WTF_MAKE_NONCOPYABLE(TracksData); WTF_MAKE_FAST_ALLOCATED; 978 979 public: … … 989 990 }; 990 991 991 inline bool StyleBuilderConverter::createGridTrackList(const CSSValue& value, TracksData& tracksData, Style::BuilderState& builderState)992 inline bool BuilderConverter::createGridTrackList(const CSSValue& value, TracksData& tracksData, BuilderState& builderState) 992 993 { 993 994 // Handle 'none'. … … 1045 1046 } 1046 1047 1047 inline bool StyleBuilderConverter::createGridPosition(const CSSValue& value, GridPosition& position)1048 inline bool BuilderConverter::createGridPosition(const CSSValue& value, GridPosition& position) 1048 1049 { 1049 1050 // We accept the specification's grammar: … … 1095 1096 } 1096 1097 1097 inline void StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction)1098 inline void BuilderConverter::createImplicitNamedGridLinesFromGridArea(const NamedGridAreaMap& namedGridAreas, NamedGridLinesMap& namedGridLines, GridTrackSizingDirection direction) 1098 1099 { 1099 1100 for (auto& area : namedGridAreas) { … … 1112 1113 } 1113 1114 1114 inline Vector<GridTrackSize> StyleBuilderConverter::convertGridTrackSizeList(Style::BuilderState& builderState, const CSSValue& value)1115 inline Vector<GridTrackSize> BuilderConverter::convertGridTrackSizeList(BuilderState& builderState, const CSSValue& value) 1115 1116 { 1116 1117 ASSERT(value.isValueList()); … … 1127 1128 } 1128 1129 1129 inline GridTrackSize StyleBuilderConverter::convertGridTrackSize(Style::BuilderState& builderState, const CSSValue& value)1130 inline GridTrackSize BuilderConverter::convertGridTrackSize(BuilderState& builderState, const CSSValue& value) 1130 1131 { 1131 1132 return createGridTrackSize(value, builderState); 1132 1133 } 1133 1134 1134 inline Optional<GridPosition> StyleBuilderConverter::convertGridPosition(Style::BuilderState&, const CSSValue& value)1135 inline Optional<GridPosition> BuilderConverter::convertGridPosition(BuilderState&, const CSSValue& value) 1135 1136 { 1136 1137 GridPosition gridPosition; … … 1140 1141 } 1141 1142 1142 inline GridAutoFlow StyleBuilderConverter::convertGridAutoFlow(Style::BuilderState&, const CSSValue& value)1143 inline GridAutoFlow BuilderConverter::convertGridAutoFlow(BuilderState&, const CSSValue& value) 1143 1144 { 1144 1145 auto& list = downcast<CSSValueList>(value); … … 1178 1179 } 1179 1180 1180 inline CSSToLengthConversionData StyleBuilderConverter::csstoLengthConversionDataWithTextZoomFactor(Style::BuilderState& builderState)1181 inline CSSToLengthConversionData BuilderConverter::csstoLengthConversionDataWithTextZoomFactor(BuilderState& builderState) 1181 1182 { 1182 1183 if (auto* frame = builderState.document().frame()) { … … 1187 1188 } 1188 1189 1189 inline Optional<Length> StyleBuilderConverter::convertWordSpacing(Style::BuilderState& builderState, const CSSValue& value)1190 inline Optional<Length> BuilderConverter::convertWordSpacing(BuilderState& builderState, const CSSValue& value) 1190 1191 { 1191 1192 Optional<Length> wordSpacing; … … 1203 1204 } 1204 1205 1205 inline Optional<float> StyleBuilderConverter::convertPerspective(Style::BuilderState& builderState, const CSSValue& value)1206 inline Optional<float> BuilderConverter::convertPerspective(BuilderState& builderState, const CSSValue& value) 1206 1207 { 1207 1208 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 1220 1221 } 1221 1222 1222 inline Optional<Length> StyleBuilderConverter::convertMarqueeIncrement(Style::BuilderState& builderState, const CSSValue& value)1223 inline Optional<Length> BuilderConverter::convertMarqueeIncrement(BuilderState& builderState, const CSSValue& value) 1223 1224 { 1224 1225 Optional<Length> marqueeLength; … … 1246 1247 } 1247 1248 1248 inline Optional<FilterOperations> StyleBuilderConverter::convertFilterOperations(Style::BuilderState& builderState, const CSSValue& value)1249 inline Optional<FilterOperations> BuilderConverter::convertFilterOperations(BuilderState& builderState, const CSSValue& value) 1249 1250 { 1250 1251 FilterOperations operations; … … 1254 1255 } 1255 1256 1256 inline FontFeatureSettings StyleBuilderConverter::convertFontFeatureSettings(Style::BuilderState&, const CSSValue& value)1257 inline FontFeatureSettings BuilderConverter::convertFontFeatureSettings(BuilderState&, const CSSValue& value) 1257 1258 { 1258 1259 if (is<CSSPrimitiveValue>(value)) { … … 1269 1270 } 1270 1271 1271 inline FontSelectionValue StyleBuilderConverter::convertFontWeightFromValue(const CSSValue& value)1272 inline FontSelectionValue BuilderConverter::convertFontWeightFromValue(const CSSValue& value) 1272 1273 { 1273 1274 ASSERT(is<CSSPrimitiveValue>(value)); … … 1292 1293 } 1293 1294 1294 inline FontSelectionValue StyleBuilderConverter::convertFontStretchFromValue(const CSSValue& value)1295 inline FontSelectionValue BuilderConverter::convertFontStretchFromValue(const CSSValue& value) 1295 1296 { 1296 1297 ASSERT(is<CSSPrimitiveValue>(value)); … … 1308 1309 1309 1310 // 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)1311 inline Optional<FontSelectionValue> BuilderConverter::convertFontStyleFromValue(const CSSValue& value) 1311 1312 { 1312 1313 ASSERT(is<CSSFontStyleValue>(value)); … … 1324 1325 } 1325 1326 1326 inline FontSelectionValue StyleBuilderConverter::convertFontWeight(Style::BuilderState& builderState, const CSSValue& value)1327 inline FontSelectionValue BuilderConverter::convertFontWeight(BuilderState& builderState, const CSSValue& value) 1327 1328 { 1328 1329 ASSERT(is<CSSPrimitiveValue>(value)); … … 1338 1339 } 1339 1340 1340 inline FontSelectionValue StyleBuilderConverter::convertFontStretch(Style::BuilderState&, const CSSValue& value)1341 inline FontSelectionValue BuilderConverter::convertFontStretch(BuilderState&, const CSSValue& value) 1341 1342 { 1342 1343 return convertFontStretchFromValue(value); … … 1344 1345 1345 1346 #if ENABLE(VARIATION_FONTS) 1346 inline FontVariationSettings StyleBuilderConverter::convertFontVariationSettings(Style::BuilderState&, const CSSValue& value)1347 inline FontVariationSettings BuilderConverter::convertFontVariationSettings(BuilderState&, const CSSValue& value) 1347 1348 { 1348 1349 if (is<CSSPrimitiveValue>(value)) { … … 1361 1362 1362 1363 #if PLATFORM(IOS_FAMILY) 1363 inline bool StyleBuilderConverter::convertTouchCallout(Style::BuilderState&, const CSSValue& value)1364 inline bool BuilderConverter::convertTouchCallout(BuilderState&, const CSSValue& value) 1364 1365 { 1365 1366 return !equalLettersIgnoringASCIICase(downcast<CSSPrimitiveValue>(value).stringValue(), "none"); … … 1368 1369 1369 1370 #if ENABLE(TOUCH_EVENTS) 1370 inline Color StyleBuilderConverter::convertTapHighlightColor(Style::BuilderState& builderState, const CSSValue& value)1371 inline Color BuilderConverter::convertTapHighlightColor(BuilderState& builderState, const CSSValue& value) 1371 1372 { 1372 1373 return builderState.colorFromPrimitiveValue(downcast<CSSPrimitiveValue>(value)); … … 1375 1376 1376 1377 #if ENABLE(POINTER_EVENTS) 1377 inline OptionSet<TouchAction> StyleBuilderConverter::convertTouchAction(Style::BuilderState&, const CSSValue& value)1378 inline OptionSet<TouchAction> BuilderConverter::convertTouchAction(BuilderState&, const CSSValue& value) 1378 1379 { 1379 1380 if (is<CSSPrimitiveValue>(value)) … … 1397 1398 1398 1399 #if ENABLE(OVERFLOW_SCROLLING_TOUCH) 1399 inline bool StyleBuilderConverter::convertOverflowScrolling(Style::BuilderState&, const CSSValue& value)1400 inline bool BuilderConverter::convertOverflowScrolling(BuilderState&, const CSSValue& value) 1400 1401 { 1401 1402 return downcast<CSSPrimitiveValue>(value).valueID() == CSSValueTouch; … … 1403 1404 #endif 1404 1405 1405 inline SVGLengthValue StyleBuilderConverter::convertSVGLengthValue(Style::BuilderState&, const CSSValue& value)1406 inline SVGLengthValue BuilderConverter::convertSVGLengthValue(BuilderState&, const CSSValue& value) 1406 1407 { 1407 1408 return SVGLengthValue::fromCSSPrimitiveValue(downcast<CSSPrimitiveValue>(value)); 1408 1409 } 1409 1410 1410 inline Vector<SVGLengthValue> StyleBuilderConverter::convertSVGLengthVector(Style::BuilderState& builderState, const CSSValue& value)1411 inline Vector<SVGLengthValue> BuilderConverter::convertSVGLengthVector(BuilderState& builderState, const CSSValue& value) 1411 1412 { 1412 1413 auto& valueList = downcast<CSSValueList>(value); … … 1420 1421 } 1421 1422 1422 inline Vector<SVGLengthValue> StyleBuilderConverter::convertStrokeDashArray(Style::BuilderState& builderState, const CSSValue& value)1423 inline Vector<SVGLengthValue> BuilderConverter::convertStrokeDashArray(BuilderState& builderState, const CSSValue& value) 1423 1424 { 1424 1425 if (is<CSSPrimitiveValue>(value)) { … … 1430 1431 } 1431 1432 1432 inline PaintOrder StyleBuilderConverter::convertPaintOrder(Style::BuilderState&, const CSSValue& value)1433 inline PaintOrder BuilderConverter::convertPaintOrder(BuilderState&, const CSSValue& value) 1433 1434 { 1434 1435 if (is<CSSPrimitiveValue>(value)) { … … 1451 1452 } 1452 1453 1453 inline float StyleBuilderConverter::convertOpacity(Style::BuilderState&, const CSSValue& value)1454 inline float BuilderConverter::convertOpacity(BuilderState&, const CSSValue& value) 1454 1455 { 1455 1456 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 1460 1461 } 1461 1462 1462 inline String StyleBuilderConverter::convertSVGURIReference(Style::BuilderState& builderState, const CSSValue& value)1463 inline String BuilderConverter::convertSVGURIReference(BuilderState& builderState, const CSSValue& value) 1463 1464 { 1464 1465 String s; … … 1470 1471 } 1471 1472 1472 inline Color StyleBuilderConverter::convertSVGColor(Style::BuilderState& builderState, const CSSValue& value)1473 inline Color BuilderConverter::convertSVGColor(BuilderState& builderState, const CSSValue& value) 1473 1474 { 1474 1475 return builderState.colorFromPrimitiveValue(downcast<CSSPrimitiveValue>(value)); 1475 1476 } 1476 1477 1477 inline StyleSelfAlignmentData StyleBuilderConverter::convertSelfOrDefaultAlignmentData(Style::BuilderState&, const CSSValue& value)1478 inline StyleSelfAlignmentData BuilderConverter::convertSelfOrDefaultAlignmentData(BuilderState&, const CSSValue& value) 1478 1479 { 1479 1480 StyleSelfAlignmentData alignmentData = RenderStyle::initialSelfAlignment(); … … 1483 1484 alignmentData.setPositionType(ItemPositionType::Legacy); 1484 1485 alignmentData.setPosition(*pairValue->second()); 1485 } else if (pairValue->first()->valueID() == CSSValueFirst) {1486 } else if (pairValue->first()->valueID() == CSSValueFirst) 1486 1487 alignmentData.setPosition(ItemPosition::Baseline); 1487 } else if (pairValue->first()->valueID() == CSSValueLast) {1488 else if (pairValue->first()->valueID() == CSSValueLast) 1488 1489 alignmentData.setPosition(ItemPosition::LastBaseline); 1489 }else {1490 else { 1490 1491 alignmentData.setOverflow(*pairValue->first()); 1491 1492 alignmentData.setPosition(*pairValue->second()); … … 1496 1497 } 1497 1498 1498 inline StyleContentAlignmentData StyleBuilderConverter::convertContentAlignmentData(Style::BuilderState&, const CSSValue& value)1499 inline StyleContentAlignmentData BuilderConverter::convertContentAlignmentData(BuilderState&, const CSSValue& value) 1499 1500 { 1500 1501 StyleContentAlignmentData alignmentData = RenderStyle::initialContentAlignment(); … … 1511 1512 } 1512 1513 1513 inline GlyphOrientation StyleBuilderConverter::convertGlyphOrientation(Style::BuilderState&, const CSSValue& value)1514 inline GlyphOrientation BuilderConverter::convertGlyphOrientation(BuilderState&, const CSSValue& value) 1514 1515 { 1515 1516 float angle = fabsf(fmodf(downcast<CSSPrimitiveValue>(value).floatValue(), 360.0f)); … … 1523 1524 } 1524 1525 1525 inline GlyphOrientation StyleBuilderConverter::convertGlyphOrientationOrAuto(Style::BuilderState& builderState, const CSSValue& value)1526 inline GlyphOrientation BuilderConverter::convertGlyphOrientationOrAuto(BuilderState& builderState, const CSSValue& value) 1526 1527 { 1527 1528 if (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueAuto) … … 1530 1531 } 1531 1532 1532 inline Optional<Length> StyleBuilderConverter::convertLineHeight(Style::BuilderState& builderState, const CSSValue& value, float multiplier)1533 inline Optional<Length> BuilderConverter::convertLineHeight(BuilderState& builderState, const CSSValue& value, float multiplier) 1533 1534 { 1534 1535 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 1537 1538 1538 1539 if (primitiveValue.isLength()) { 1539 Length length = primitiveValue.computeLength<Length>( StyleBuilderConverter::csstoLengthConversionDataWithTextZoomFactor(builderState));1540 Length length = primitiveValue.computeLength<Length>(BuilderConverter::csstoLengthConversionDataWithTextZoomFactor(builderState)); 1540 1541 if (multiplier != 1.f) 1541 1542 length = Length(length.value() * multiplier, Fixed); … … 1561 1562 } 1562 1563 1563 inline FontSynthesis StyleBuilderConverter::convertFontSynthesis(Style::BuilderState&, const CSSValue& value)1564 inline FontSynthesis BuilderConverter::convertFontSynthesis(BuilderState&, const CSSValue& value) 1564 1565 { 1565 1566 if (is<CSSPrimitiveValue>(value)) { … … 1590 1591 } 1591 1592 1592 inline OptionSet<SpeakAs> StyleBuilderConverter::convertSpeakAs(Style::BuilderState&, const CSSValue& value)1593 inline OptionSet<SpeakAs> BuilderConverter::convertSpeakAs(BuilderState&, const CSSValue& value) 1593 1594 { 1594 1595 auto result = RenderStyle::initialSpeakAs(); … … 1600 1601 } 1601 1602 1602 inline OptionSet<HangingPunctuation> StyleBuilderConverter::convertHangingPunctuation(Style::BuilderState&, const CSSValue& value)1603 inline OptionSet<HangingPunctuation> BuilderConverter::convertHangingPunctuation(BuilderState&, const CSSValue& value) 1603 1604 { 1604 1605 auto result = RenderStyle::initialHangingPunctuation(); … … 1610 1611 } 1611 1612 1612 inline GapLength StyleBuilderConverter::convertGapLength(Style::BuilderState& builderState, const CSSValue& value)1613 inline GapLength BuilderConverter::convertGapLength(BuilderState& builderState, const CSSValue& value) 1613 1614 { 1614 1615 return (downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNormal) ? GapLength() : GapLength(convertLength(builderState, value)); 1615 1616 } 1616 1617 1617 } // namespace WebCore 1618 } 1619 } -
trunk/Source/WebCore/style/StyleBuilderCustom.h
r251840 r251841 53 53 54 54 namespace WebCore { 55 namespace Style { 55 56 56 57 #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&) 60 61 61 62 template<typename T> inline T forwardInheritedValue(T&& value) { return std::forward<T>(value); } … … 66 67 67 68 // Note that we assume the CSS parser only allows valid CSSValue types. 68 class StyleBuilderCustom {69 class BuilderCustom { 69 70 public: 70 71 // Custom handling of inherit, initial and value setting. … … 110 111 111 112 // 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&) { } 116 117 #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&) { } 119 120 #endif 120 121 121 122 // 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&); 124 125 125 126 // 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&); 133 134 #if ENABLE(TEXT_AUTOSIZING) 134 static void applyValueWebkitTextSizeAdjust( Style::BuilderState&, CSSValue&);135 static void applyValueWebkitTextSizeAdjust(BuilderState&, CSSValue&); 135 136 #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&); 140 141 141 142 #if ENABLE(DARK_MODE_CSS) 142 static void applyValueColorScheme( Style::BuilderState&, CSSValue&);143 static void applyValueColorScheme(BuilderState&, CSSValue&); 143 144 #endif 144 145 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&); 151 152 152 153 private: 153 static void resetEffectiveZoom( Style::BuilderState&);154 static void resetEffectiveZoom(BuilderState&); 154 155 155 156 static Length mmLength(double mm); … … 158 159 159 160 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); 162 163 163 164 enum CounterBehavior {Increment = 0, Reset}; 164 165 template <CounterBehavior counterBehavior> 165 static void applyInheritCounter( Style::BuilderState&);166 static void applyInheritCounter(BuilderState&); 166 167 template <CounterBehavior counterBehavior> 167 static void applyValueCounter( Style::BuilderState&, CSSValue&);168 static void applyValueCounter(BuilderState&, CSSValue&); 168 169 169 170 static float largerFontSize(float size); 170 171 static float smallerFontSize(float size); 171 static float determineRubyTextSizeMultiplier( Style::BuilderState&);172 static float determineRubyTextSizeMultiplier(BuilderState&); 172 173 }; 173 174 174 inline void StyleBuilderCustom::applyValueDirection(Style::BuilderState& builderState, CSSValue& value)175 inline void BuilderCustom::applyValueDirection(BuilderState& builderState, CSSValue& value) 175 176 { 176 177 builderState.style().setDirection(downcast<CSSPrimitiveValue>(value)); … … 178 179 } 179 180 180 inline void StyleBuilderCustom::applyInitialTextAlign(Style::BuilderState& builderState)181 inline void BuilderCustom::applyInitialTextAlign(BuilderState& builderState) 181 182 { 182 183 builderState.style().setTextAlign(RenderStyle::initialTextAlign()); … … 184 185 } 185 186 186 inline void StyleBuilderCustom::applyValueTextAlign(Style::BuilderState& builderState, CSSValue& value)187 { 188 builderState.style().setTextAlign( StyleBuilderConverter::convertTextAlign(builderState, value));187 inline void BuilderCustom::applyValueTextAlign(BuilderState& builderState, CSSValue& value) 188 { 189 builderState.style().setTextAlign(BuilderConverter::convertTextAlign(builderState, value)); 189 190 builderState.style().setHasExplicitlySetTextAlign(true); 190 191 } 191 192 192 inline void StyleBuilderCustom::resetEffectiveZoom(Style::BuilderState& builderState)193 inline void BuilderCustom::resetEffectiveZoom(BuilderState& builderState) 193 194 { 194 195 // Reset the zoom in effect. This allows the setZoom method to accurately compute a new zoom in effect. … … 196 197 } 197 198 198 inline void StyleBuilderCustom::applyInitialZoom(Style::BuilderState& builderState)199 inline void BuilderCustom::applyInitialZoom(BuilderState& builderState) 199 200 { 200 201 resetEffectiveZoom(builderState); … … 202 203 } 203 204 204 inline void StyleBuilderCustom::applyInheritZoom(Style::BuilderState& builderState)205 inline void BuilderCustom::applyInheritZoom(BuilderState& builderState) 205 206 { 206 207 resetEffectiveZoom(builderState); … … 208 209 } 209 210 210 inline void StyleBuilderCustom::applyValueZoom(Style::BuilderState& builderState, CSSValue& value)211 inline void BuilderCustom::applyValueZoom(BuilderState& builderState, CSSValue& value) 211 212 { 212 213 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 232 233 } 233 234 } 234 inline Length StyleBuilderCustom::mmLength(double mm)235 inline Length BuilderCustom::mmLength(double mm) 235 236 { 236 237 Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(mm, CSSPrimitiveValue::CSS_MM)); 237 238 return value.get().computeLength<Length>(CSSToLengthConversionData()); 238 239 } 239 inline Length StyleBuilderCustom::inchLength(double inch)240 inline Length BuilderCustom::inchLength(double inch) 240 241 { 241 242 Ref<CSSPrimitiveValue> value(CSSPrimitiveValue::create(inch, CSSPrimitiveValue::CSS_IN)); 242 243 return value.get().computeLength<Length>(CSSToLengthConversionData()); 243 244 } 244 bool StyleBuilderCustom::getPageSizeFromName(CSSPrimitiveValue* pageSizeName, CSSPrimitiveValue* pageOrientation, Length& width, Length& height)245 bool BuilderCustom::getPageSizeFromName(CSSPrimitiveValue* pageSizeName, CSSPrimitiveValue* pageOrientation, Length& width, Length& height) 245 246 { 246 247 static NeverDestroyed<Length> a5Width(mmLength(148)); … … 316 317 } 317 318 318 inline void StyleBuilderCustom::applyValueVerticalAlign(Style::BuilderState& builderState, CSSValue& value)319 inline void BuilderCustom::applyValueVerticalAlign(BuilderState& builderState, CSSValue& value) 319 320 { 320 321 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 327 328 #if ENABLE(CSS_IMAGE_RESOLUTION) 328 329 329 inline void StyleBuilderCustom::applyInheritImageResolution(Style::BuilderState& builderState)330 inline void BuilderCustom::applyInheritImageResolution(BuilderState& builderState) 330 331 { 331 332 builderState.style().setImageResolutionSource(builderState.parentStyle().imageResolutionSource()); … … 334 335 } 335 336 336 inline void StyleBuilderCustom::applyInitialImageResolution(Style::BuilderState& builderState)337 inline void BuilderCustom::applyInitialImageResolution(BuilderState& builderState) 337 338 { 338 339 builderState.style().setImageResolutionSource(RenderStyle::initialImageResolutionSource()); … … 341 342 } 342 343 343 inline void StyleBuilderCustom::applyValueImageResolution(Style::BuilderState& builderState, CSSValue& value)344 inline void BuilderCustom::applyValueImageResolution(BuilderState& builderState, CSSValue& value) 344 345 { 345 346 ImageResolutionSource source = RenderStyle::initialImageResolutionSource(); … … 362 363 #endif // ENABLE(CSS_IMAGE_RESOLUTION) 363 364 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)365 inline void BuilderCustom::applyInheritSize(BuilderState&) { } 366 367 inline void BuilderCustom::applyInitialSize(BuilderState&) { } 368 369 inline void BuilderCustom::applyValueSize(BuilderState& builderState, CSSValue& value) 369 370 { 370 371 builderState.style().resetPageSizeType(); … … 442 443 } 443 444 444 inline void StyleBuilderCustom::applyInheritTextIndent(Style::BuilderState& builderState)445 inline void BuilderCustom::applyInheritTextIndent(BuilderState& builderState) 445 446 { 446 447 builderState.style().setTextIndent(Length { builderState.parentStyle().textIndent() }); … … 451 452 } 452 453 453 inline void StyleBuilderCustom::applyInitialTextIndent(Style::BuilderState& builderState)454 inline void BuilderCustom::applyInitialTextIndent(BuilderState& builderState) 454 455 { 455 456 builderState.style().setTextIndent(RenderStyle::initialTextIndent()); … … 460 461 } 461 462 462 inline void StyleBuilderCustom::applyValueTextIndent(Style::BuilderState& builderState, CSSValue& value)463 inline void BuilderCustom::applyValueTextIndent(BuilderState& builderState, CSSValue& value) 463 464 { 464 465 Length lengthOrPercentageValue; … … 494 495 class ApplyPropertyBorderImageModifier { 495 496 public: 496 static void applyInheritValue( Style::BuilderState& builderState)497 static void applyInheritValue(BuilderState& builderState) 497 498 { 498 499 NinePieceImage image(getValue(builderState.style())); … … 514 515 } 515 516 516 static void applyInitialValue( Style::BuilderState& builderState)517 static void applyInitialValue(BuilderState& builderState) 517 518 { 518 519 NinePieceImage image(getValue(builderState.style())); … … 542 543 } 543 544 544 static void applyValue( Style::BuilderState& builderState, CSSValue& value)545 static void applyValue(BuilderState& builderState, CSSValue& value) 545 546 { 546 547 NinePieceImage image(getValue(builderState.style())); … … 575 576 576 577 #define DEFINE_BORDER_IMAGE_MODIFIER_HANDLER(type, modifier) \ 577 inline void StyleBuilderCustom::applyInherit##type##modifier(Style::BuilderState& builderState) \578 inline void BuilderCustom::applyInherit##type##modifier(BuilderState& builderState) \ 578 579 { \ 579 580 ApplyPropertyBorderImageModifier<type, modifier>::applyInheritValue(builderState); \ 580 581 } \ 581 inline void StyleBuilderCustom::applyInitial##type##modifier(Style::BuilderState& builderState) \582 inline void BuilderCustom::applyInitial##type##modifier(BuilderState& builderState) \ 582 583 { \ 583 584 ApplyPropertyBorderImageModifier<type, modifier>::applyInitialValue(builderState); \ 584 585 } \ 585 inline void StyleBuilderCustom::applyValue##type##modifier(Style::BuilderState& builderState, CSSValue& value) \586 inline void BuilderCustom::applyValue##type##modifier(BuilderState& builderState, CSSValue& value) \ 586 587 { \ 587 588 ApplyPropertyBorderImageModifier<type, modifier>::applyValue(builderState, value); \ … … 599 600 #if ENABLE(TEXT_AUTOSIZING) 600 601 601 inline void StyleBuilderCustom::applyInheritLineHeight(Style::BuilderState& builderState)602 inline void BuilderCustom::applyInheritLineHeight(BuilderState& builderState) 602 603 { 603 604 builderState.style().setLineHeight(Length { builderState.parentStyle().lineHeight() }); … … 605 606 } 606 607 607 inline void StyleBuilderCustom::applyInitialLineHeight(Style::BuilderState& builderState)608 inline void BuilderCustom::applyInitialLineHeight(BuilderState& builderState) 608 609 { 609 610 builderState.style().setLineHeight(RenderStyle::initialLineHeight()); … … 655 656 } 656 657 657 inline void StyleBuilderCustom::applyValueLineHeight(Style::BuilderState& builderState, CSSValue& value)658 { 659 Optional<Length> lineHeight = StyleBuilderConverter::convertLineHeight(builderState, value, 1);658 inline void BuilderCustom::applyValueLineHeight(BuilderState& builderState, CSSValue& value) 659 { 660 Optional<Length> lineHeight = BuilderConverter::convertLineHeight(builderState, value, 1); 660 661 if (!lineHeight) 661 662 return; … … 670 671 computedLineHeight = lineHeight.value(); 671 672 else 672 computedLineHeight = StyleBuilderConverter::convertLineHeight(builderState, value, multiplier).value();673 computedLineHeight = BuilderConverter::convertLineHeight(builderState, value, multiplier).value(); 673 674 } 674 675 … … 679 680 #endif 680 681 681 inline void StyleBuilderCustom::applyInheritOutlineStyle(Style::BuilderState& builderState)682 inline void BuilderCustom::applyInheritOutlineStyle(BuilderState& builderState) 682 683 { 683 684 builderState.style().setOutlineStyleIsAuto(builderState.parentStyle().outlineStyleIsAuto()); … … 685 686 } 686 687 687 inline void StyleBuilderCustom::applyInitialOutlineStyle(Style::BuilderState& builderState)688 inline void BuilderCustom::applyInitialOutlineStyle(BuilderState& builderState) 688 689 { 689 690 builderState.style().setOutlineStyleIsAuto(RenderStyle::initialOutlineStyleIsAuto()); … … 691 692 } 692 693 693 inline void StyleBuilderCustom::applyValueOutlineStyle(Style::BuilderState& builderState, CSSValue& value)694 inline void BuilderCustom::applyValueOutlineStyle(BuilderState& builderState, CSSValue& value) 694 695 { 695 696 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 699 700 } 700 701 701 inline void StyleBuilderCustom::applyInitialClip(Style::BuilderState& builderState)702 inline void BuilderCustom::applyInitialClip(BuilderState& builderState) 702 703 { 703 704 builderState.style().setClip(Length(), Length(), Length(), Length()); … … 705 706 } 706 707 707 inline void StyleBuilderCustom::applyInheritClip(Style::BuilderState& builderState)708 inline void BuilderCustom::applyInheritClip(BuilderState& builderState) 708 709 { 709 710 auto& parentStyle = builderState.parentStyle(); … … 715 716 } 716 717 717 inline void StyleBuilderCustom::applyValueClip(Style::BuilderState& builderState, CSSValue& value)718 inline void BuilderCustom::applyValueClip(BuilderState& builderState, CSSValue& value) 718 719 { 719 720 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 732 733 } 733 734 734 inline void StyleBuilderCustom::applyValueWebkitLocale(Style::BuilderState& builderState, CSSValue& value)735 inline void BuilderCustom::applyValueWebkitLocale(BuilderState& builderState, CSSValue& value) 735 736 { 736 737 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 744 745 } 745 746 746 inline void StyleBuilderCustom::applyValueWritingMode(Style::BuilderState& builderState, CSSValue& value)747 inline void BuilderCustom::applyValueWritingMode(BuilderState& builderState, CSSValue& value) 747 748 { 748 749 builderState.setWritingMode(downcast<CSSPrimitiveValue>(value)); … … 750 751 } 751 752 752 inline void StyleBuilderCustom::applyValueWebkitTextOrientation(Style::BuilderState& builderState, CSSValue& value)753 inline void BuilderCustom::applyValueWebkitTextOrientation(BuilderState& builderState, CSSValue& value) 753 754 { 754 755 builderState.setTextOrientation(downcast<CSSPrimitiveValue>(value)); … … 756 757 757 758 #if ENABLE(TEXT_AUTOSIZING) 758 inline void StyleBuilderCustom::applyValueWebkitTextSizeAdjust(Style::BuilderState& builderState, CSSValue& value)759 inline void BuilderCustom::applyValueWebkitTextSizeAdjust(BuilderState& builderState, CSSValue& value) 759 760 { 760 761 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 770 771 #endif 771 772 772 inline void StyleBuilderCustom::applyValueWebkitTextZoom(Style::BuilderState& builderState, CSSValue& value)773 inline void BuilderCustom::applyValueWebkitTextZoom(BuilderState& builderState, CSSValue& value) 773 774 { 774 775 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 781 782 782 783 #if ENABLE(DARK_MODE_CSS) 783 inline void StyleBuilderCustom::applyValueColorScheme(Style::BuilderState& builderState, CSSValue& value)784 { 785 builderState.style().setColorScheme( StyleBuilderConverter::convertColorScheme(builderState, value));784 inline void BuilderCustom::applyValueColorScheme(BuilderState& builderState, CSSValue& value) 785 { 786 builderState.style().setColorScheme(BuilderConverter::convertColorScheme(builderState, value)); 786 787 builderState.style().setHasExplicitlySetColorScheme(true); 787 788 } … … 789 790 790 791 template<CSSPropertyID property> 791 inline void StyleBuilderCustom::applyTextOrBoxShadowValue(Style::BuilderState& builderState, CSSValue& value)792 inline void BuilderCustom::applyTextOrBoxShadowValue(BuilderState& builderState, CSSValue& value) 792 793 { 793 794 if (is<CSSPrimitiveValue>(value)) { … … 823 824 } 824 825 825 inline void StyleBuilderCustom::applyInitialTextShadow(Style::BuilderState& builderState)826 inline void BuilderCustom::applyInitialTextShadow(BuilderState& builderState) 826 827 { 827 828 builderState.style().setTextShadow(nullptr); 828 829 } 829 830 830 inline void StyleBuilderCustom::applyInheritTextShadow(Style::BuilderState& builderState)831 inline void BuilderCustom::applyInheritTextShadow(BuilderState& builderState) 831 832 { 832 833 builderState.style().setTextShadow(builderState.parentStyle().textShadow() ? makeUnique<ShadowData>(*builderState.parentStyle().textShadow()) : nullptr); 833 834 } 834 835 835 inline void StyleBuilderCustom::applyValueTextShadow(Style::BuilderState& builderState, CSSValue& value)836 inline void BuilderCustom::applyValueTextShadow(BuilderState& builderState, CSSValue& value) 836 837 { 837 838 applyTextOrBoxShadowValue<CSSPropertyTextShadow>(builderState, value); 838 839 } 839 840 840 inline void StyleBuilderCustom::applyInitialBoxShadow(Style::BuilderState& builderState)841 inline void BuilderCustom::applyInitialBoxShadow(BuilderState& builderState) 841 842 { 842 843 builderState.style().setBoxShadow(nullptr); 843 844 } 844 845 845 inline void StyleBuilderCustom::applyInheritBoxShadow(Style::BuilderState& builderState)846 inline void BuilderCustom::applyInheritBoxShadow(BuilderState& builderState) 846 847 { 847 848 builderState.style().setBoxShadow(builderState.parentStyle().boxShadow() ? makeUnique<ShadowData>(*builderState.parentStyle().boxShadow()) : nullptr); 848 849 } 849 850 850 inline void StyleBuilderCustom::applyValueBoxShadow(Style::BuilderState& builderState, CSSValue& value)851 inline void BuilderCustom::applyValueBoxShadow(BuilderState& builderState, CSSValue& value) 851 852 { 852 853 applyTextOrBoxShadowValue<CSSPropertyBoxShadow>(builderState, value); 853 854 } 854 855 855 inline void StyleBuilderCustom::applyInitialWebkitBoxShadow(Style::BuilderState& builderState)856 inline void BuilderCustom::applyInitialWebkitBoxShadow(BuilderState& builderState) 856 857 { 857 858 applyInitialBoxShadow(builderState); 858 859 } 859 860 860 inline void StyleBuilderCustom::applyInheritWebkitBoxShadow(Style::BuilderState& builderState)861 inline void BuilderCustom::applyInheritWebkitBoxShadow(BuilderState& builderState) 861 862 { 862 863 applyInheritBoxShadow(builderState); 863 864 } 864 865 865 inline void StyleBuilderCustom::applyValueWebkitBoxShadow(Style::BuilderState& builderState, CSSValue& value)866 inline void BuilderCustom::applyValueWebkitBoxShadow(BuilderState& builderState, CSSValue& value) 866 867 { 867 868 applyTextOrBoxShadowValue<CSSPropertyWebkitBoxShadow>(builderState, value); 868 869 } 869 870 870 inline void StyleBuilderCustom::applyInitialFontFamily(Style::BuilderState& builderState)871 inline void BuilderCustom::applyInitialFontFamily(BuilderState& builderState) 871 872 { 872 873 auto fontDescription = builderState.style().fontDescription(); … … 884 885 } 885 886 886 inline void StyleBuilderCustom::applyInheritFontFamily(Style::BuilderState& builderState)887 inline void BuilderCustom::applyInheritFontFamily(BuilderState& builderState) 887 888 { 888 889 auto fontDescription = builderState.style().fontDescription(); … … 894 895 } 895 896 896 inline void StyleBuilderCustom::applyValueFontFamily(Style::BuilderState& builderState, CSSValue& value)897 inline void BuilderCustom::applyValueFontFamily(BuilderState& builderState, CSSValue& value) 897 898 { 898 899 auto& valueList = downcast<CSSValueList>(value); … … 971 972 } 972 973 973 inline bool StyleBuilderCustom::isValidDisplayValue(Style::BuilderState& builderState, DisplayType display)974 inline bool BuilderCustom::isValidDisplayValue(BuilderState& builderState, DisplayType display) 974 975 { 975 976 if (is<SVGElement>(builderState.element()) && builderState.style().styleType() == PseudoId::None) … … 978 979 } 979 980 980 inline void StyleBuilderCustom::applyInheritDisplay(Style::BuilderState& builderState)981 inline void BuilderCustom::applyInheritDisplay(BuilderState& builderState) 981 982 { 982 983 DisplayType display = builderState.parentStyle().display(); … … 985 986 } 986 987 987 inline void StyleBuilderCustom::applyValueDisplay(Style::BuilderState& builderState, CSSValue& value)988 inline void BuilderCustom::applyValueDisplay(BuilderState& builderState, CSSValue& value) 988 989 { 989 990 DisplayType display = downcast<CSSPrimitiveValue>(value); … … 992 993 } 993 994 994 inline void StyleBuilderCustom::applyValueBaselineShift(Style::BuilderState& builderState, CSSValue& value)995 inline void BuilderCustom::applyValueBaselineShift(BuilderState& builderState, CSSValue& value) 995 996 { 996 997 SVGRenderStyle& svgStyle = builderState.style().accessSVGStyle(); … … 1016 1017 } 1017 1018 1018 inline void StyleBuilderCustom::applyInitialWebkitAspectRatio(Style::BuilderState& builderState)1019 inline void BuilderCustom::applyInitialWebkitAspectRatio(BuilderState& builderState) 1019 1020 { 1020 1021 builderState.style().setAspectRatioType(RenderStyle::initialAspectRatioType()); … … 1023 1024 } 1024 1025 1025 inline void StyleBuilderCustom::applyInheritWebkitAspectRatio(Style::BuilderState& builderState)1026 inline void BuilderCustom::applyInheritWebkitAspectRatio(BuilderState& builderState) 1026 1027 { 1027 1028 if (builderState.parentStyle().aspectRatioType() == AspectRatioType::Auto) … … 1032 1033 } 1033 1034 1034 inline void StyleBuilderCustom::applyValueWebkitAspectRatio(Style::BuilderState& builderState, CSSValue& value)1035 inline void BuilderCustom::applyValueWebkitAspectRatio(BuilderState& builderState, CSSValue& value) 1035 1036 { 1036 1037 if (is<CSSPrimitiveValue>(value)) { … … 1052 1053 } 1053 1054 1054 inline void StyleBuilderCustom::applyInitialWebkitTextEmphasisStyle(Style::BuilderState& builderState)1055 inline void BuilderCustom::applyInitialWebkitTextEmphasisStyle(BuilderState& builderState) 1055 1056 { 1056 1057 builderState.style().setTextEmphasisFill(RenderStyle::initialTextEmphasisFill()); … … 1059 1060 } 1060 1061 1061 inline void StyleBuilderCustom::applyInheritWebkitTextEmphasisStyle(Style::BuilderState& builderState)1062 inline void BuilderCustom::applyInheritWebkitTextEmphasisStyle(BuilderState& builderState) 1062 1063 { 1063 1064 builderState.style().setTextEmphasisFill(builderState.parentStyle().textEmphasisFill()); … … 1066 1067 } 1067 1068 1068 inline void StyleBuilderCustom::applyValueWebkitTextEmphasisStyle(Style::BuilderState& builderState, CSSValue& value)1069 inline void BuilderCustom::applyValueWebkitTextEmphasisStyle(BuilderState& builderState, CSSValue& value) 1069 1070 { 1070 1071 if (is<CSSValueList>(value)) { … … 1102 1103 } 1103 1104 1104 template < StyleBuilderCustom::CounterBehavior counterBehavior>1105 inline void StyleBuilderCustom::applyInheritCounter(Style::BuilderState& builderState)1105 template <BuilderCustom::CounterBehavior counterBehavior> 1106 inline void BuilderCustom::applyInheritCounter(BuilderState& builderState) 1106 1107 { 1107 1108 auto& map = builderState.style().accessCounterDirectives(); … … 1115 1116 } 1116 1117 1117 template < StyleBuilderCustom::CounterBehavior counterBehavior>1118 inline void StyleBuilderCustom::applyValueCounter(Style::BuilderState& builderState, CSSValue& value)1118 template <BuilderCustom::CounterBehavior counterBehavior> 1119 inline void BuilderCustom::applyValueCounter(BuilderState& builderState, CSSValue& value) 1119 1120 { 1120 1121 bool setCounterIncrementToNone = counterBehavior == Increment && is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).valueID() == CSSValueNone; … … 1146 1147 } 1147 1148 1148 inline void StyleBuilderCustom::applyInitialCounterIncrement(Style::BuilderState&) { }1149 1150 inline void StyleBuilderCustom::applyInheritCounterIncrement(Style::BuilderState& builderState)1149 inline void BuilderCustom::applyInitialCounterIncrement(BuilderState&) { } 1150 1151 inline void BuilderCustom::applyInheritCounterIncrement(BuilderState& builderState) 1151 1152 { 1152 1153 applyInheritCounter<Increment>(builderState); 1153 1154 } 1154 1155 1155 inline void StyleBuilderCustom::applyValueCounterIncrement(Style::BuilderState& builderState, CSSValue& value)1156 inline void BuilderCustom::applyValueCounterIncrement(BuilderState& builderState, CSSValue& value) 1156 1157 { 1157 1158 applyValueCounter<Increment>(builderState, value); 1158 1159 } 1159 1160 1160 inline void StyleBuilderCustom::applyInitialCounterReset(Style::BuilderState&) { }1161 1162 inline void StyleBuilderCustom::applyInheritCounterReset(Style::BuilderState& builderState)1161 inline void BuilderCustom::applyInitialCounterReset(BuilderState&) { } 1162 1163 inline void BuilderCustom::applyInheritCounterReset(BuilderState& builderState) 1163 1164 { 1164 1165 applyInheritCounter<Reset>(builderState); 1165 1166 } 1166 1167 1167 inline void StyleBuilderCustom::applyValueCounterReset(Style::BuilderState& builderState, CSSValue& value)1168 inline void BuilderCustom::applyValueCounterReset(BuilderState& builderState, CSSValue& value) 1168 1169 { 1169 1170 applyValueCounter<Reset>(builderState, value); 1170 1171 } 1171 1172 1172 inline void StyleBuilderCustom::applyInitialCursor(Style::BuilderState& builderState)1173 inline void BuilderCustom::applyInitialCursor(BuilderState& builderState) 1173 1174 { 1174 1175 builderState.style().clearCursorList(); … … 1176 1177 } 1177 1178 1178 inline void StyleBuilderCustom::applyInheritCursor(Style::BuilderState& builderState)1179 inline void BuilderCustom::applyInheritCursor(BuilderState& builderState) 1179 1180 { 1180 1181 builderState.style().setCursor(builderState.parentStyle().cursor()); … … 1182 1183 } 1183 1184 1184 inline void StyleBuilderCustom::applyValueCursor(Style::BuilderState& builderState, CSSValue& value)1185 inline void BuilderCustom::applyValueCursor(BuilderState& builderState, CSSValue& value) 1185 1186 { 1186 1187 builderState.style().clearCursorList(); … … 1207 1208 } 1208 1209 1209 inline void StyleBuilderCustom::applyInitialFill(Style::BuilderState& builderState)1210 inline void BuilderCustom::applyInitialFill(BuilderState& builderState) 1210 1211 { 1211 1212 auto& svgStyle = builderState.style().accessSVGStyle(); … … 1213 1214 } 1214 1215 1215 inline void StyleBuilderCustom::applyInheritFill(Style::BuilderState& builderState)1216 inline void BuilderCustom::applyInheritFill(BuilderState& builderState) 1216 1217 { 1217 1218 auto& svgStyle = builderState.style().accessSVGStyle(); … … 1221 1222 } 1222 1223 1223 inline void StyleBuilderCustom::applyValueFill(Style::BuilderState& builderState, CSSValue& value)1224 inline void BuilderCustom::applyValueFill(BuilderState& builderState, CSSValue& value) 1224 1225 { 1225 1226 auto& svgStyle = builderState.style().accessSVGStyle(); … … 1252 1253 } 1253 1254 1254 inline void StyleBuilderCustom::applyInitialStroke(Style::BuilderState& builderState)1255 inline void BuilderCustom::applyInitialStroke(BuilderState& builderState) 1255 1256 { 1256 1257 SVGRenderStyle& svgStyle = builderState.style().accessSVGStyle(); … … 1258 1259 } 1259 1260 1260 inline void StyleBuilderCustom::applyInheritStroke(Style::BuilderState& builderState)1261 inline void BuilderCustom::applyInheritStroke(BuilderState& builderState) 1261 1262 { 1262 1263 auto& svgStyle = builderState.style().accessSVGStyle(); … … 1265 1266 } 1266 1267 1267 inline void StyleBuilderCustom::applyValueStroke(Style::BuilderState& builderState, CSSValue& value)1268 inline void BuilderCustom::applyValueStroke(BuilderState& builderState, CSSValue& value) 1268 1269 { 1269 1270 auto& svgStyle = builderState.style().accessSVGStyle(); … … 1296 1297 } 1297 1298 1298 inline void StyleBuilderCustom::applyInitialContent(Style::BuilderState& builderState)1299 inline void BuilderCustom::applyInitialContent(BuilderState& builderState) 1299 1300 { 1300 1301 builderState.style().clearContent(); 1301 1302 } 1302 1303 1303 inline void StyleBuilderCustom::applyInheritContent(Style::BuilderState&)1304 inline void BuilderCustom::applyInheritContent(BuilderState&) 1304 1305 { 1305 1306 // FIXME: In CSS3, it will be possible to inherit content. In CSS2 it is not. This … … 1307 1308 } 1308 1309 1309 inline void StyleBuilderCustom::applyValueContent(Style::BuilderState& builderState, CSSValue& value)1310 inline void BuilderCustom::applyValueContent(BuilderState& builderState, CSSValue& value) 1310 1311 { 1311 1312 if (is<CSSPrimitiveValue>(value)) { … … 1391 1392 } 1392 1393 1393 inline void StyleBuilderCustom::applyInheritFontVariantLigatures(Style::BuilderState& builderState)1394 inline void BuilderCustom::applyInheritFontVariantLigatures(BuilderState& builderState) 1394 1395 { 1395 1396 auto fontDescription = builderState.fontDescription(); … … 1401 1402 } 1402 1403 1403 inline void StyleBuilderCustom::applyInitialFontVariantLigatures(Style::BuilderState& builderState)1404 inline void BuilderCustom::applyInitialFontVariantLigatures(BuilderState& builderState) 1404 1405 { 1405 1406 auto fontDescription = builderState.fontDescription(); … … 1411 1412 } 1412 1413 1413 inline void StyleBuilderCustom::applyValueFontVariantLigatures(Style::BuilderState& builderState, CSSValue& value)1414 inline void BuilderCustom::applyValueFontVariantLigatures(BuilderState& builderState, CSSValue& value) 1414 1415 { 1415 1416 auto fontDescription = builderState.fontDescription(); … … 1422 1423 } 1423 1424 1424 inline void StyleBuilderCustom::applyInheritFontVariantNumeric(Style::BuilderState& builderState)1425 inline void BuilderCustom::applyInheritFontVariantNumeric(BuilderState& builderState) 1425 1426 { 1426 1427 auto fontDescription = builderState.fontDescription(); … … 1433 1434 } 1434 1435 1435 inline void StyleBuilderCustom::applyInitialFontVariantNumeric(Style::BuilderState& builderState)1436 inline void BuilderCustom::applyInitialFontVariantNumeric(BuilderState& builderState) 1436 1437 { 1437 1438 auto fontDescription = builderState.fontDescription(); … … 1444 1445 } 1445 1446 1446 inline void StyleBuilderCustom::applyValueFontVariantNumeric(Style::BuilderState& builderState, CSSValue& value)1447 inline void BuilderCustom::applyValueFontVariantNumeric(BuilderState& builderState, CSSValue& value) 1447 1448 { 1448 1449 auto fontDescription = builderState.fontDescription(); … … 1456 1457 } 1457 1458 1458 inline void StyleBuilderCustom::applyInheritFontVariantEastAsian(Style::BuilderState& builderState)1459 inline void BuilderCustom::applyInheritFontVariantEastAsian(BuilderState& builderState) 1459 1460 { 1460 1461 auto fontDescription = builderState.fontDescription(); … … 1465 1466 } 1466 1467 1467 inline void StyleBuilderCustom::applyInitialFontVariantEastAsian(Style::BuilderState& builderState)1468 inline void BuilderCustom::applyInitialFontVariantEastAsian(BuilderState& builderState) 1468 1469 { 1469 1470 auto fontDescription = builderState.fontDescription(); … … 1474 1475 } 1475 1476 1476 inline void StyleBuilderCustom::applyValueFontVariantEastAsian(Style::BuilderState& builderState, CSSValue& value)1477 inline void BuilderCustom::applyValueFontVariantEastAsian(BuilderState& builderState, CSSValue& value) 1477 1478 { 1478 1479 auto fontDescription = builderState.fontDescription(); … … 1484 1485 } 1485 1486 1486 inline void StyleBuilderCustom::applyInitialFontSize(Style::BuilderState& builderState)1487 inline void BuilderCustom::applyInitialFontSize(BuilderState& builderState) 1487 1488 { 1488 1489 auto fontDescription = builderState.style().fontDescription(); … … 1497 1498 } 1498 1499 1499 inline void StyleBuilderCustom::applyInheritFontSize(Style::BuilderState& builderState)1500 inline void BuilderCustom::applyInheritFontSize(BuilderState& builderState) 1500 1501 { 1501 1502 const auto& parentFontDescription = builderState.parentStyle().fontDescription(); … … 1513 1514 // When the CSS keyword "larger" is used, this function will attempt to match within the keyword 1514 1515 // table, and failing that, will simply multiply by 1.2. 1515 inline float StyleBuilderCustom::largerFontSize(float size)1516 inline float BuilderCustom::largerFontSize(float size) 1516 1517 { 1517 1518 // FIXME: Figure out where we fall in the size ranges (xx-small to xxx-large) and scale up to … … 1521 1522 1522 1523 // Like the previous function, but for the keyword "smaller". 1523 inline float StyleBuilderCustom::smallerFontSize(float size)1524 inline float BuilderCustom::smallerFontSize(float size) 1524 1525 { 1525 1526 // FIXME: Figure out where we fall in the size ranges (xx-small to xxx-large) and scale down to … … 1528 1529 } 1529 1530 1530 inline float StyleBuilderCustom::determineRubyTextSizeMultiplier(Style::BuilderState& builderState)1531 inline float BuilderCustom::determineRubyTextSizeMultiplier(BuilderState& builderState) 1531 1532 { 1532 1533 if (builderState.style().rubyPosition() != RubyPosition::InterCharacter) … … 1545 1546 } 1546 1547 1547 inline void StyleBuilderCustom::applyInitialFontStyle(Style::BuilderState& builderState)1548 inline void BuilderCustom::applyInitialFontStyle(BuilderState& builderState) 1548 1549 { 1549 1550 auto fontDescription = builderState.fontDescription(); … … 1553 1554 } 1554 1555 1555 inline void StyleBuilderCustom::applyInheritFontStyle(Style::BuilderState& builderState)1556 inline void BuilderCustom::applyInheritFontStyle(BuilderState& builderState) 1556 1557 { 1557 1558 auto fontDescription = builderState.fontDescription(); … … 1561 1562 } 1562 1563 1563 inline void StyleBuilderCustom::applyValueFontStyle(Style::BuilderState& builderState, CSSValue& value)1564 inline void BuilderCustom::applyValueFontStyle(BuilderState& builderState, CSSValue& value) 1564 1565 { 1565 1566 auto& fontStyleValue = downcast<CSSFontStyleValue>(value); 1566 1567 auto fontDescription = builderState.fontDescription(); 1567 fontDescription.setItalic( StyleBuilderConverter::convertFontStyleFromValue(fontStyleValue));1568 fontDescription.setItalic(BuilderConverter::convertFontStyleFromValue(fontStyleValue)); 1568 1569 fontDescription.setFontStyleAxis(fontStyleValue.fontStyleValue->valueID() == CSSValueItalic ? FontStyleAxis::ital : FontStyleAxis::slnt); 1569 1570 builderState.setFontDescription(WTFMove(fontDescription)); 1570 1571 } 1571 1572 1572 inline void StyleBuilderCustom::applyValueFontSize(Style::BuilderState& builderState, CSSValue& value)1573 inline void BuilderCustom::applyValueFontSize(BuilderState& builderState, CSSValue& value) 1573 1574 { 1574 1575 auto fontDescription = builderState.style().fontDescription(); … … 1630 1631 } 1631 1632 1632 inline void StyleBuilderCustom::applyInitialGridTemplateAreas(Style::BuilderState& builderState)1633 inline void BuilderCustom::applyInitialGridTemplateAreas(BuilderState& builderState) 1633 1634 { 1634 1635 builderState.style().setNamedGridArea(RenderStyle::initialNamedGridArea()); … … 1637 1638 } 1638 1639 1639 inline void StyleBuilderCustom::applyInheritGridTemplateAreas(Style::BuilderState& builderState)1640 inline void BuilderCustom::applyInheritGridTemplateAreas(BuilderState& builderState) 1640 1641 { 1641 1642 builderState.style().setNamedGridArea(builderState.parentStyle().namedGridArea()); … … 1644 1645 } 1645 1646 1646 inline void StyleBuilderCustom::applyValueGridTemplateAreas(Style::BuilderState& builderState, CSSValue& value)1647 inline void BuilderCustom::applyValueGridTemplateAreas(BuilderState& builderState, CSSValue& value) 1647 1648 { 1648 1649 if (is<CSSPrimitiveValue>(value)) { … … 1656 1657 NamedGridLinesMap namedGridColumnLines = builderState.style().namedGridColumnLines(); 1657 1658 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); 1660 1661 builderState.style().setNamedGridColumnLines(namedGridColumnLines); 1661 1662 builderState.style().setNamedGridRowLines(namedGridRowLines); … … 1666 1667 } 1667 1668 1668 inline void StyleBuilderCustom::applyInitialGridTemplateColumns(Style::BuilderState& builderState)1669 inline void BuilderCustom::applyInitialGridTemplateColumns(BuilderState& builderState) 1669 1670 { 1670 1671 builderState.style().setGridColumns(RenderStyle::initialGridColumns()); … … 1673 1674 } 1674 1675 1675 inline void StyleBuilderCustom::applyInheritGridTemplateColumns(Style::BuilderState& builderState)1676 inline void BuilderCustom::applyInheritGridTemplateColumns(BuilderState& builderState) 1676 1677 { 1677 1678 builderState.style().setGridColumns(builderState.parentStyle().gridColumns()); … … 1691 1692 style.setGridAutoRepeat##TrackType##sInsertionPoint(tracksData.m_autoRepeatInsertionPoint); 1692 1693 1693 inline void StyleBuilderCustom::applyValueGridTemplateColumns(Style::BuilderState& builderState, CSSValue& value)1694 { 1695 StyleBuilderConverter::TracksData tracksData;1696 if (! StyleBuilderConverter::createGridTrackList(value, tracksData, builderState))1694 inline void BuilderCustom::applyValueGridTemplateColumns(BuilderState& builderState, CSSValue& value) 1695 { 1696 BuilderConverter::TracksData tracksData; 1697 if (!BuilderConverter::createGridTrackList(value, tracksData, builderState)) 1697 1698 return; 1698 1699 const NamedGridAreaMap& namedGridAreas = builderState.style().namedGridArea(); 1699 1700 if (!namedGridAreas.isEmpty()) 1700 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForColumns);1701 BuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForColumns); 1701 1702 1702 1703 SET_TRACKS_DATA(tracksData, builderState.style(), Column); 1703 1704 } 1704 1705 1705 inline void StyleBuilderCustom::applyInitialGridTemplateRows(Style::BuilderState& builderState)1706 inline void BuilderCustom::applyInitialGridTemplateRows(BuilderState& builderState) 1706 1707 { 1707 1708 builderState.style().setGridRows(RenderStyle::initialGridRows()); … … 1710 1711 } 1711 1712 1712 inline void StyleBuilderCustom::applyInheritGridTemplateRows(Style::BuilderState& builderState)1713 inline void BuilderCustom::applyInheritGridTemplateRows(BuilderState& builderState) 1713 1714 { 1714 1715 builderState.style().setGridRows(builderState.parentStyle().gridRows()); … … 1717 1718 } 1718 1719 1719 inline void StyleBuilderCustom::applyValueGridTemplateRows(Style::BuilderState& builderState, CSSValue& value)1720 { 1721 StyleBuilderConverter::TracksData tracksData;1722 if (! StyleBuilderConverter::createGridTrackList(value, tracksData, builderState))1720 inline void BuilderCustom::applyValueGridTemplateRows(BuilderState& builderState, CSSValue& value) 1721 { 1722 BuilderConverter::TracksData tracksData; 1723 if (!BuilderConverter::createGridTrackList(value, tracksData, builderState)) 1723 1724 return; 1724 1725 const NamedGridAreaMap& namedGridAreas = builderState.style().namedGridArea(); 1725 1726 if (!namedGridAreas.isEmpty()) 1726 StyleBuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForRows);1727 BuilderConverter::createImplicitNamedGridLinesFromGridArea(namedGridAreas, tracksData.m_namedGridLines, ForRows); 1727 1728 1728 1729 SET_TRACKS_DATA(tracksData, builderState.style(), Row); 1729 1730 } 1730 1731 1731 void StyleBuilderCustom::applyValueAlt(Style::BuilderState& builderState, CSSValue& value)1732 void BuilderCustom::applyValueAlt(BuilderState& builderState, CSSValue& value) 1732 1733 { 1733 1734 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 1751 1752 } 1752 1753 1753 inline void StyleBuilderCustom::applyValueWillChange(Style::BuilderState& builderState, CSSValue& value)1754 inline void BuilderCustom::applyValueWillChange(BuilderState& builderState, CSSValue& value) 1754 1755 { 1755 1756 if (is<CSSPrimitiveValue>(value)) { … … 1780 1781 } 1781 1782 1782 inline void StyleBuilderCustom::applyValueStrokeWidth(Style::BuilderState& builderState, CSSValue& value)1783 { 1784 builderState.style().setStrokeWidth( StyleBuilderConverter::convertLength(builderState, value));1783 inline void BuilderCustom::applyValueStrokeWidth(BuilderState& builderState, CSSValue& value) 1784 { 1785 builderState.style().setStrokeWidth(BuilderConverter::convertLength(builderState, value)); 1785 1786 builderState.style().setHasExplicitlySetStrokeWidth(true); 1786 1787 } 1787 1788 1788 inline void StyleBuilderCustom::applyValueStrokeColor(Style::BuilderState& builderState, CSSValue& value)1789 inline void BuilderCustom::applyValueStrokeColor(BuilderState& builderState, CSSValue& value) 1789 1790 { 1790 1791 auto& primitiveValue = downcast<CSSPrimitiveValue>(value); … … 1796 1797 } 1797 1798 1798 inline void StyleBuilderCustom::applyInitialCustomProperty(Style::BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name)1799 inline void BuilderCustom::applyInitialCustomProperty(BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name) 1799 1800 { 1800 1801 if (registered && registered->initialValue()) { … … 1808 1809 } 1809 1810 1810 inline void StyleBuilderCustom::applyInheritCustomProperty(Style::BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name)1811 inline void BuilderCustom::applyInheritCustomProperty(BuilderState& builderState, const CSSRegisteredCustomProperty* registered, const AtomString& name) 1811 1812 { 1812 1813 auto* parentValue = builderState.parentStyle().inheritedCustomProperties().get(name); … … 1817 1818 } 1818 1819 1819 inline void StyleBuilderCustom::applyValueCustomProperty(Style::BuilderState& builderState, const CSSRegisteredCustomProperty* registered, CSSCustomPropertyValue& value)1820 inline void BuilderCustom::applyValueCustomProperty(BuilderState& builderState, const CSSRegisteredCustomProperty* registered, CSSCustomPropertyValue& value) 1820 1821 { 1821 1822 ASSERT(value.isResolved()); … … 1828 1829 } 1829 1830 1830 } // namespace WebCore 1831 } 1832 }
Note: See TracChangeset
for help on using the changeset viewer.