Changeset 175052 in webkit
- Timestamp:
- Oct 22, 2014 9:56:36 AM (9 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 1 added
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r175050 r175052 3245 3245 # Generate CSS property names 3246 3246 add_custom_command( 3247 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.gperf 3247 OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.gperf ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp 3248 3248 MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl 3249 3249 DEPENDS ${WebCore_CSS_PROPERTY_NAMES} … … 3253 3253 VERBATIM) 3254 3254 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp) 3255 list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp) 3255 3256 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h) 3256 3257 ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h) -
trunk/Source/WebCore/ChangeLog
r175051 r175052 1 2014-10-22 Chris Dumez <cdumez@apple.com> 2 3 Add initial support for generating the StyleBuilder from CSSPropertyNames.in 4 https://bugs.webkit.org/show_bug.cgi?id=137910 5 6 Reviewed by Andreas Kling. 7 8 Add initial support for generating the StyleBuilder from 9 CSSPropertyNames.in. This is a first step towards getting rid of the 10 legacy DeprecatedStyleBuilder class and having everything defined in one 11 place (CSSPropertyNames.in). 12 13 This patch updates makeprop.pl script to generate a StyleBuilder.cpp 14 file that generate a the StyleBuilder::applyProperty() method 15 implementation using a huge switch statement for all the CSS 16 properties. With this patch, we are now generating the new StyleBuilder 17 code for all the "simple" CSS properties (i.e. those that were using 18 ApplyPropertyDefault<> in DeprecatedStyleBuilder.cpp). I am using a 19 "NewStyleBuilder" option in CSSPropertyNames.in for properties that 20 we generate to help with improving incrementally the generator. Once 21 we are able to generate all properties, this transition option will 22 do away and become the default. 23 24 By default, the generator will make an educated guess for the type 25 name, the getter, the setter and the initial function of each property. 26 For example, for the border-collapse property, it will use: 27 - TypeName: EBorderCollapse (i.e. 'E' + PropertyId) 28 - Getter: borderCollapse() (i.e. PropertyId with first letter lowercased) 29 - Setter: setBorderCollapse() (i.e. 'set' + PropertyId) 30 - Initial: initialBorderCollapse() (i.e. 'initial' + PropertyId) 31 32 This works for most properties. For properties that need 33 special-casing, developers can use the following options in 34 CSSPropertyNames.in: 35 - TypeName: Overrides the type name 36 - Getter: Overrides the getter name 37 - Setter: Overrides the setter name 38 - Initial: Overrides the initial function name 39 - NameForMethods: Overrides the Getter / Setter / Initial function 40 names. For e.g. "NameForMethods=OverflowWrap" will use 41 "overflowWrap() / setOverflowWrap() / initialOverflowWrap()". 42 43 The patch is inspired by the following Blink revision by 44 <timloh@chromium.org>: 45 https://src.chromium.org/viewvc/blink?view=rev&revision=150424 46 47 No new tests, no behavior change. 48 49 * CMakeLists.txt: 50 * DerivedSources.make: 51 * WebCore.vcxproj/WebCore.vcxproj: 52 * WebCore.vcxproj/WebCore.vcxproj.filters: 53 * WebCore.xcodeproj/project.pbxproj: 54 * css/CSSPropertyNames.in: 55 * css/DeprecatedStyleBuilder.cpp: 56 (WebCore::ApplyPropertyVerticalAlign::createHandler): 57 (WebCore::ApplyPropertyDisplay::applyInitialValue): 58 (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder): 59 * css/StyleBuilder.h: Added. 60 * css/StyleResolver.cpp: 61 (WebCore::StyleResolver::adjustRenderStyle): 62 (WebCore::StyleResolver::applyProperty): 63 * css/makeprop.pl: 64 * rendering/style/RenderStyle.h: 65 Move the initialXXX() methods that were in NonInheritedFlags to 66 RenderStyle class, with the other initialXXX() methods to facilitate 67 code generation. 68 69 * rendering/style/StyleMultiColData.cpp: 70 (WebCore::StyleMultiColData::StyleMultiColData): 71 * rendering/style/StyleRareNonInheritedData.cpp: 72 (WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData): 73 1 74 2014-10-22 Carlos Garcia Campos <cgarcia@igalia.com> 2 75 -
trunk/Source/WebCore/DerivedSources.make
r174892 r175052 785 785 SelectorPseudoClassAndCompatibilityElementMap.cpp \ 786 786 SelectorPseudoElementTypeMap.cpp \ 787 StyleBuilder.cpp \ 787 788 UserAgentStyleSheets.h \ 788 789 WebKitFontFamilyNames.cpp \ … … 821 822 WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in 822 823 823 CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)824 CSSPropertyNames.h StyleBuilder.cpp : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES) 824 825 $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in 825 826 $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)" -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r175050 r175052 286 286 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoClassAndCompatibilityElementMap.cpp" /> 287 287 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoElementTypeMap.cpp" /> 288 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StyleBuilder.cpp" /> 288 289 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSANGLEInstancedArrays.cpp"> 289 290 <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r175050 r175052 5195 5195 <Filter>DerivedSources</Filter> 5196 5196 </ClCompile> 5197 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StyleBuilder.cpp"> 5198 <Filter>DerivedSources</Filter> 5199 </ClCompile> 5197 5200 <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\EventFactory.cpp"> 5198 5201 <Filter>DerivedSources</Filter> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r175050 r175052 2483 2483 836FBCEA178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */; }; 2484 2484 836FBCEC178C117F00B21A15 /* SVGAnimatedProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */; }; 2485 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */; }; 2486 8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */; }; 2485 2487 83C1D425178D5AB400141E68 /* SVGPathSegArcAbs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D413178D5AB400141E68 /* SVGPathSegArcAbs.h */; }; 2486 2488 83C1D426178D5AB400141E68 /* SVGPathSegArcRel.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D414178D5AB400141E68 /* SVGPathSegArcRel.h */; }; … … 9641 9643 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTypeAnimator.cpp; sourceTree = "<group>"; }; 9642 9644 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedProperty.cpp; sourceTree = "<group>"; }; 9645 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilder.h; sourceTree = "<group>"; }; 9646 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleBuilder.cpp; path = StyleBuilder.cpp; sourceTree = "<group>"; }; 9643 9647 83C1D413178D5AB400141E68 /* SVGPathSegArcAbs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegArcAbs.h; sourceTree = "<group>"; }; 9644 9648 83C1D414178D5AB400141E68 /* SVGPathSegArcRel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegArcRel.h; sourceTree = "<group>"; }; … … 16252 16256 656581E809D1508D000E61D7 /* SVGNames.cpp */, 16253 16257 656581E909D1508D000E61D7 /* SVGNames.h */, 16258 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */, 16254 16259 CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */, 16255 16260 CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */, … … 22207 22212 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */, 22208 22213 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */, 22214 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */, 22209 22215 ); 22210 22216 path = css; … … 23364 23370 CD5596921475B678001D0BD0 /* AudioFileReaderIOS.h in Headers */, 23365 23371 FD3160BF12B0272A00C1A359 /* AudioFileReaderMac.h in Headers */, 23372 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */, 23366 23373 FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */, 23367 23374 FD31601012B0267600C1A359 /* AudioListener.h in Headers */, … … 27397 27404 4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */, 27398 27405 1AF4CEE918BC350100BC2D34 /* DefaultVisitedLinkStore.cpp in Sources */, 27406 8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */, 27399 27407 FD31602B12B0267600C1A359 /* DelayDSPKernel.cpp in Sources */, 27400 27408 FD31602D12B0267600C1A359 /* DelayNode.cpp in Sources */, -
trunk/Source/WebCore/css/CSSPropertyNames.in
r173579 r175052 40 40 41 41 // Keep this in between the highest priority props and the lower ones. 42 -webkit-ruby-position [Inherited ]42 -webkit-ruby-position [Inherited, NewStyleBuilder, TypeName=RubyPosition] 43 43 44 44 // The remaining properties are listed in alphabetical order … … 64 64 border-bottom-right-radius 65 65 -webkit-border-bottom-right-radius = border-bottom-right-radius 66 border-bottom-style 66 border-bottom-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle] 67 67 border-bottom-width 68 border-collapse [Inherited ]68 border-collapse [Inherited, NewStyleBuilder] 69 69 border-color 70 70 border-image … … 76 76 border-left 77 77 border-left-color 78 border-left-style 78 border-left-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle] 79 79 border-left-width 80 80 border-radius 81 81 border-right 82 82 border-right-color 83 border-right-style 83 border-right-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle] 84 84 border-right-width 85 85 border-spacing [Inherited] … … 91 91 border-top-right-radius 92 92 -webkit-border-top-right-radius = border-top-right-radius 93 border-top-style 93 border-top-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle] 94 94 border-top-width 95 95 border-width 96 96 bottom 97 97 box-shadow 98 box-sizing 98 box-sizing [NewStyleBuilder] 99 99 // -webkit-box-sizing worked in Safari 4 and earlier. 100 100 -webkit-box-sizing = box-sizing 101 caption-side [Inherited ]101 caption-side [Inherited, NewStyleBuilder] 102 102 -epub-caption-side = caption-side 103 clear 103 clear [NewStyleBuilder] 104 104 clip 105 105 -webkit-clip-path … … 109 109 cursor [Inherited] 110 110 #if defined(ENABLE_CURSOR_VISIBILITY) && ENABLE_CURSOR_VISIBILITY 111 -webkit-cursor-visibility [Inherited ]112 #endif 113 empty-cells [Inherited ]114 float 111 -webkit-cursor-visibility [Inherited, NewStyleBuilder, TypeName=CursorVisibility] 112 #endif 113 empty-cells [Inherited, NewStyleBuilder, TypeName=EEmptyCell] 114 float [NewStyleBuilder, TypeName=EFloat, NameForMethods=Floating] 115 115 font-stretch 116 116 height 117 117 #if defined(ENABLE_CSS_IMAGE_ORIENTATION) && ENABLE_CSS_IMAGE_ORIENTATION 118 image-orientation [Inherited ]119 #endif 120 image-rendering [Inherited ]118 image-orientation [Inherited, NewStyleBuilder, TypeName=ImageOrientationEnum] 119 #endif 120 image-rendering [Inherited, NewStyleBuilder] 121 121 #if defined(ENABLE_CSS_IMAGE_RESOLUTION) && ENABLE_CSS_IMAGE_RESOLUTION 122 122 image-resolution [Inherited] … … 126 126 list-style [Inherited] 127 127 list-style-image [Inherited] 128 list-style-position [Inherited ]129 list-style-type [Inherited ]128 list-style-position [Inherited, NewStyleBuilder] 129 list-style-type [Inherited, NewStyleBuilder] 130 130 margin 131 131 margin-bottom … … 137 137 min-height 138 138 min-width 139 object-fit 140 opacity 139 object-fit [NewStyleBuilder, TypeName=ObjectFit] 140 opacity [NewStyleBuilder, TypeName=float] 141 141 // Honor -webkit-opacity as a synonym for opacity. This was the only syntax that worked in Safari 1.1, 142 142 // and may be in use on some websites and widgets. … … 149 149 outline-width 150 150 overflow 151 overflow-wrap 152 overflow-x 153 overflow-y 151 overflow-wrap [NewStyleBuilder] 152 overflow-x [NewStyleBuilder, TypeName=EOverflow] 153 overflow-y [NewStyleBuilder, TypeName=EOverflow] 154 154 padding 155 155 padding-bottom … … 158 158 padding-top 159 159 page 160 page-break-after 161 page-break-before 162 page-break-inside 160 page-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 161 page-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 162 page-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 163 163 paint-order 164 pointer-events [Inherited ]165 position 164 pointer-events [Inherited, NewStyleBuilder] 165 position [NewStyleBuilder] 166 166 quotes [Inherited] 167 167 resize [Inherited] … … 169 169 size 170 170 src 171 speak [Inherited ]172 table-layout 173 tab-size [Inherited ]171 speak [Inherited, NewStyleBuilder] 172 table-layout [NewStyleBuilder] 173 tab-size [Inherited, NewStyleBuilder, TypeName=unsigned] 174 174 text-align [Inherited] 175 175 text-decoration … … 180 180 text-line-through-style 181 181 text-line-through-width 182 text-overflow 182 text-overflow [NewStyleBuilder, TypeName=TextOverflow] 183 183 text-overline 184 184 text-overline-color … … 187 187 text-overline-width 188 188 text-shadow [Inherited] 189 text-transform [Inherited ]189 text-transform [Inherited, NewStyleBuilder] 190 190 -epub-text-transform = text-transform 191 191 text-underline … … 201 201 transition-timing-function 202 202 203 unicode-bidi 203 unicode-bidi [NewStyleBuilder] 204 204 unicode-range 205 205 vertical-align 206 visibility [Inherited ]207 white-space [Inherited ]206 visibility [Inherited, NewStyleBuilder] 207 white-space [Inherited, NewStyleBuilder] 208 208 widows [Inherited] 209 209 width 210 word-break [Inherited ]210 word-break [Inherited, NewStyleBuilder] 211 211 -epub-word-break = word-break 212 212 word-spacing [Inherited] 213 word-wrap [Inherited ]213 word-wrap [Inherited, NewStyleBuilder=EOverflowWrap, NameForMethods=OverflowWrap] 214 214 z-index 215 215 -webkit-alt … … 223 223 -webkit-animation-play-state 224 224 -webkit-animation-timing-function 225 -webkit-appearance 225 -webkit-appearance [NewStyleBuilder, TypeName=ControlPart] 226 226 -webkit-aspect-ratio [Inherited] 227 -webkit-backface-visibility 227 -webkit-backface-visibility [NewStyleBuilder] 228 228 -webkit-background-clip 229 229 -webkit-background-composite … … 245 245 -webkit-border-end-style 246 246 -webkit-border-end-width 247 -webkit-border-fit 247 -webkit-border-fit [NewStyleBuilder] 248 248 -webkit-border-horizontal-spacing [Inherited] 249 249 -webkit-border-image … … 257 257 -webkit-border-start-width 258 258 -webkit-border-vertical-spacing [Inherited] 259 -webkit-box-align 260 -webkit-box-direction [Inherited ]261 -webkit-box-flex 262 -webkit-box-flex-group 263 -webkit-box-lines 264 -webkit-box-ordinal-group 265 -webkit-box-orient 266 -webkit-box-pack 259 -webkit-box-align [NewStyleBuilder, TypeName=EBoxAlignment] 260 -webkit-box-direction [Inherited, NewStyleBuilder] 261 -webkit-box-flex [NewStyleBuilder, TypeName=float] 262 -webkit-box-flex-group [NewStyleBuilder, TypeName=unsigned] 263 -webkit-box-lines [NewStyleBuilder] 264 -webkit-box-ordinal-group [NewStyleBuilder, TypeName=unsigned] 265 -webkit-box-orient [NewStyleBuilder] 266 -webkit-box-pack [NewStyleBuilder] 267 267 -webkit-box-reflect 268 268 // -webkit-box-shadow differs from box-shadow in its treatement of blur radii > 8px. … … 270 270 // w_r > 8px, b_r = 8 + 4 * sqrt((w_r - 8) / 2). 271 271 -webkit-box-shadow 272 -webkit-color-correction [Inherited ]273 -webkit-column-axis 274 -webkit-column-break-after 275 -webkit-column-break-before 276 -webkit-column-break-inside 272 -webkit-color-correction [Inherited, NewStyleBuilder, TypeName=ColorSpace, NameForMethods=ColorSpace] 273 -webkit-column-axis [NewStyleBuilder, TypeName=ColumnAxis] 274 -webkit-column-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 275 -webkit-column-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 276 -webkit-column-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 277 277 -webkit-column-count 278 -webkit-column-fill 278 -webkit-column-fill [NewStyleBuilder, TypeName=ColumnFill] 279 279 -webkit-column-gap 280 -webkit-column-progression 280 -webkit-column-progression [NewStyleBuilder, TypeName=ColumnProgression] 281 281 -webkit-column-rule 282 282 -webkit-column-rule-color 283 -webkit-column-rule-style 283 -webkit-column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle] 284 284 -webkit-column-rule-width 285 -webkit-column-span 285 -webkit-column-span [NewStyleBuilder, TypeName=ColumnSpan] 286 286 -webkit-column-width 287 287 -webkit-columns 288 288 #if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK 289 -webkit-box-decoration-break 289 -webkit-box-decoration-break [NewStyleBuilder] 290 290 #endif 291 291 #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING 292 mix-blend-mode 293 isolation 292 mix-blend-mode [NewStyleBuilder, TypeName=BlendMode, NameForMethods=BlendMode] 293 isolation [NewStyleBuilder, TypeName=Isolation] 294 294 #endif 295 295 -webkit-filter 296 align-content 296 align-content [NewStyleBuilder] 297 297 -webkit-align-content = align-content 298 align-items 298 align-items [NewStyleBuilder] 299 299 -webkit-align-items = align-items 300 align-self 300 align-self [NewStyleBuilder, TypeName=EAlignItems] 301 301 -webkit-align-self = align-self 302 302 flex … … 304 304 flex-basis 305 305 -webkit-flex-basis = flex-basis 306 flex-direction 306 flex-direction [NewStyleBuilder] 307 307 -webkit-flex-direction = flex-direction 308 308 flex-flow 309 309 -webkit-flex-flow = flex-flow 310 flex-grow 310 flex-grow [NewStyleBuilder, TypeName=float] 311 311 -webkit-flex-grow = flex-grow 312 flex-shrink 312 flex-shrink [NewStyleBuilder, TypeName=float] 313 313 -webkit-flex-shrink = flex-shrink 314 flex-wrap 314 flex-wrap [NewStyleBuilder] 315 315 -webkit-flex-wrap = flex-wrap 316 justify-content 316 justify-content [NewStyleBuilder] 317 317 -webkit-justify-content = justify-content 318 318 -webkit-justify-self … … 339 339 -webkit-hyphenate-limit-before [Inherited] 340 340 -webkit-hyphenate-limit-lines [Inherited] 341 -webkit-hyphens [Inherited ]341 -webkit-hyphens [Inherited, NewStyleBuilder, TypeName=Hyphens] 342 342 -epub-hyphens = -webkit-hyphens 343 343 -webkit-initial-letter 344 344 -webkit-line-box-contain [Inherited] 345 -webkit-line-align [Inherited ]346 -webkit-line-break [Inherited ]347 -webkit-line-clamp 345 -webkit-line-align [Inherited, NewStyleBuilder, TypeName=LineAlign] 346 -webkit-line-break [Inherited, NewStyleBuilder, TypeName=LineBreak] 347 -webkit-line-clamp [NewStyleBuilder, TypeName=LineClampValue] 348 348 -webkit-line-grid [Inherited] 349 -webkit-line-snap [Inherited ]349 -webkit-line-snap [Inherited, NewStyleBuilder, TypeName=LineSnap] 350 350 -webkit-logical-width 351 351 -webkit-logical-height 352 -webkit-margin-after-collapse 353 -webkit-margin-before-collapse 354 -webkit-margin-bottom-collapse 355 -webkit-margin-top-collapse 352 -webkit-margin-after-collapse [NewStyleBuilder, TypeName=EMarginCollapse] 353 -webkit-margin-before-collapse [NewStyleBuilder, TypeName=EMarginCollapse] 354 -webkit-margin-bottom-collapse [NewStyleBuilder, TypeName=EMarginCollapse, NameForMethods=MarginAfterCollapse] 355 -webkit-margin-top-collapse [NewStyleBuilder, TypeName=EMarginCollapse, NameForMethods=MarginBeforeCollapse] 356 356 -webkit-margin-collapse 357 357 -webkit-margin-after … … 360 360 -webkit-margin-start 361 361 -webkit-marquee 362 -webkit-marquee-direction 362 -webkit-marquee-direction [NewStyleBuilder] 363 363 -webkit-marquee-increment 364 364 -webkit-marquee-repetition 365 365 -webkit-marquee-speed 366 -webkit-marquee-style 366 -webkit-marquee-style [NewStyleBuilder, TypeName=EMarqueeBehavior, NameForMethods=MarqueeBehavior] 367 367 -webkit-mask 368 368 -webkit-mask-box-image … … 388 388 -webkit-min-logical-width 389 389 -webkit-min-logical-height 390 -webkit-nbsp-mode [Inherited ]391 order 390 -webkit-nbsp-mode [Inherited, NewStyleBuilder, TypeName=ENBSPMode, Setter=setNBSPMode, Initial=initialNBSPMode] 391 order [NewStyleBuilder, TypeName=int] 392 392 -webkit-order = order 393 393 -webkit-padding-after … … 399 399 -webkit-perspective-origin-x 400 400 -webkit-perspective-origin-y 401 -webkit-print-color-adjust [Inherited ]402 -webkit-rtl-ordering [Inherited ]401 -webkit-print-color-adjust [Inherited, NewStyleBuilder, TypeName=PrintColorAdjust] 402 -webkit-rtl-ordering [Inherited, NewStyleBuilder, TypeName=Order, Setter=setRTLOrdering, Initial=initialRTLOrdering] 403 403 #if defined(ENABLE_CSS_SCROLL_SNAP) 404 404 -webkit-scroll-snap-points-x … … 408 408 -webkit-scroll-snap-coordinate 409 409 #endif 410 -webkit-text-combine [Inherited ]410 -webkit-text-combine [Inherited, NewStyleBuilder, TypeName=TextCombine] 411 411 -epub-text-combine = -webkit-text-combine 412 412 #if defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT 413 -webkit-text-align-last [Inherited ]414 -webkit-text-justify [Inherited ]413 -webkit-text-align-last [Inherited, NewStyleBuilder, TypeName=TextAlignLast] 414 -webkit-text-justify [Inherited, NewStyleBuilder, TypeName=TextJustify] 415 415 #endif 416 416 -webkit-text-decoration 417 417 -webkit-text-decoration-line 418 -webkit-text-decoration-style 418 -webkit-text-decoration-style [NewStyleBuilder, TypeName=TextDecorationStyle] 419 419 -webkit-text-decoration-color 420 420 -webkit-text-decoration-skip [Inherited] … … 433 433 text-emphasis-style = -webkit-text-emphasis-style 434 434 -webkit-text-fill-color [Inherited] 435 -webkit-text-security [Inherited ]435 -webkit-text-security [Inherited, NewStyleBuilder] 436 436 -webkit-text-stroke [Inherited] 437 437 -webkit-text-stroke-color [Inherited] … … 442 442 -webkit-transform-origin-y 443 443 -webkit-transform-origin-z 444 -webkit-transform-style 444 -webkit-transform-style [NewStyleBuilder, TypeName=ETransformStyle3D, NameForMethods=TransformStyle3D] 445 445 -webkit-transition 446 446 -webkit-transition-delay … … 448 448 -webkit-transition-property 449 449 -webkit-transition-timing-function 450 -webkit-user-drag 451 -webkit-user-modify [Inherited ]452 -webkit-user-select [Inherited ]450 -webkit-user-drag [NewStyleBuilder] 451 -webkit-user-modify [Inherited, NewStyleBuilder] 452 -webkit-user-select [Inherited, NewStyleBuilder] 453 453 #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS 454 454 -webkit-flow-into 455 455 -webkit-flow-from 456 -webkit-region-fragment 457 -webkit-region-break-after 458 -webkit-region-break-before 459 -webkit-region-break-inside 456 -webkit-region-fragment [NewStyleBuilder, TypeName=RegionFragment] 457 -webkit-region-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 458 -webkit-region-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 459 -webkit-region-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak] 460 460 #endif 461 461 #if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES -
trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp
r175043 r175052 1976 1976 static PropertyHandler createHandler() 1977 1977 { 1978 PropertyHandler handler = ApplyPropertyDefaultBase<EVerticalAlign, &RenderStyle::verticalAlign, EVerticalAlign, &RenderStyle::setVerticalAlign, EVerticalAlign, &RenderStyle:: NonInheritedFlags::initialVerticalAlign>::createHandler();1978 PropertyHandler handler = ApplyPropertyDefaultBase<EVerticalAlign, &RenderStyle::verticalAlign, EVerticalAlign, &RenderStyle::setVerticalAlign, EVerticalAlign, &RenderStyle::initialVerticalAlign>::createHandler(); 1979 1979 return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue); 1980 1980 } … … 2100 2100 static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver) 2101 2101 { 2102 styleResolver->style()->setDisplay(RenderStyle:: NonInheritedFlags::initialDisplay());2102 styleResolver->style()->setDisplay(RenderStyle::initialDisplay()); 2103 2103 } 2104 2104 … … 2359 2359 setPropertyHandler(CSSPropertyBorderBottomLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomLeftRadius, &RenderStyle::setBorderBottomLeftRadius, &RenderStyle::initialBorderRadius>::createHandler()); 2360 2360 setPropertyHandler(CSSPropertyBorderBottomRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomRightRadius, &RenderStyle::setBorderBottomRightRadius, &RenderStyle::initialBorderRadius>::createHandler()); 2361 setPropertyHandler(CSSPropertyBorderBottomStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderBottomStyle, EBorderStyle, &RenderStyle::setBorderBottomStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());2362 2361 setPropertyHandler(CSSPropertyBorderBottomWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderBottomWidth, &RenderStyle::setBorderBottomWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2363 setPropertyHandler(CSSPropertyBorderCollapse, ApplyPropertyDefault<EBorderCollapse, &RenderStyle::borderCollapse, EBorderCollapse, &RenderStyle::setBorderCollapse, EBorderCollapse, &RenderStyle::initialBorderCollapse>::createHandler());2364 2362 setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifier<BorderImage, Outset>::createHandler()); 2365 2363 setPropertyHandler(CSSPropertyBorderImageRepeat, ApplyPropertyBorderImageModifier<BorderImage, Repeat>::createHandler()); … … 2368 2366 setPropertyHandler(CSSPropertyBorderImageWidth, ApplyPropertyBorderImageModifier<BorderImage, Width>::createHandler()); 2369 2367 setPropertyHandler(CSSPropertyBorderLeftColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor, &RenderStyle::color>::createHandler()); 2370 setPropertyHandler(CSSPropertyBorderLeftStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderLeftStyle, EBorderStyle, &RenderStyle::setBorderLeftStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());2371 2368 setPropertyHandler(CSSPropertyBorderLeftWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2372 2369 setPropertyHandler(CSSPropertyBorderRightColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderRightColor, &RenderStyle::setBorderRightColor, &RenderStyle::setVisitedLinkBorderRightColor, &RenderStyle::color>::createHandler()); 2373 setPropertyHandler(CSSPropertyBorderRightStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderRightStyle, EBorderStyle, &RenderStyle::setBorderRightStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());2374 2370 setPropertyHandler(CSSPropertyBorderRightWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2375 2371 setPropertyHandler(CSSPropertyBorderTopColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderTopColor, &RenderStyle::setBorderTopColor, &RenderStyle::setVisitedLinkBorderTopColor, &RenderStyle::color>::createHandler()); 2376 2372 setPropertyHandler(CSSPropertyBorderTopLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius, &RenderStyle::initialBorderRadius>::createHandler()); 2377 2373 setPropertyHandler(CSSPropertyBorderTopRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius, &RenderStyle::initialBorderRadius>::createHandler()); 2378 setPropertyHandler(CSSPropertyBorderTopStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderTopStyle, EBorderStyle, &RenderStyle::setBorderTopStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());2379 2374 setPropertyHandler(CSSPropertyBorderTopWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2380 2375 setPropertyHandler(CSSPropertyBottom, ApplyPropertyLength<&RenderStyle::bottom, &RenderStyle::setBottom, &RenderStyle::initialOffset, AutoEnabled>::createHandler()); 2381 setPropertyHandler(CSSPropertyBoxSizing, ApplyPropertyDefault<EBoxSizing, &RenderStyle::boxSizing, EBoxSizing, &RenderStyle::setBoxSizing, EBoxSizing, &RenderStyle::initialBoxSizing>::createHandler());2382 setPropertyHandler(CSSPropertyCaptionSide, ApplyPropertyDefault<ECaptionSide, &RenderStyle::captionSide, ECaptionSide, &RenderStyle::setCaptionSide, ECaptionSide, &RenderStyle::initialCaptionSide>::createHandler());2383 setPropertyHandler(CSSPropertyClear, ApplyPropertyDefault<EClear, &RenderStyle::clear, EClear, &RenderStyle::setClear, EClear, &RenderStyle::NonInheritedFlags::initialClear>::createHandler());2384 2376 setPropertyHandler(CSSPropertyClip, ApplyPropertyClip::createHandler()); 2385 2377 setPropertyHandler(CSSPropertyColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::color, &RenderStyle::setColor, &RenderStyle::setVisitedLinkColor, &RenderStyle::invalidColor, RenderStyle::initialColor>::createHandler()); … … 2389 2381 setPropertyHandler(CSSPropertyDirection, ApplyPropertyDirection<&RenderStyle::direction, &RenderStyle::setDirection, RenderStyle::initialDirection>::createHandler()); 2390 2382 setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler()); 2391 setPropertyHandler(CSSPropertyEmptyCells, ApplyPropertyDefault<EEmptyCell, &RenderStyle::emptyCells, EEmptyCell, &RenderStyle::setEmptyCells, EEmptyCell, &RenderStyle::initialEmptyCells>::createHandler());2392 setPropertyHandler(CSSPropertyFloat, ApplyPropertyDefault<EFloat, &RenderStyle::floating, EFloat, &RenderStyle::setFloating, EFloat, &RenderStyle::NonInheritedFlags::initialFloating>::createHandler());2393 2383 setPropertyHandler(CSSPropertyFontFamily, ApplyPropertyFontFamily::createHandler()); 2394 2384 setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler()); … … 2397 2387 setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHandler()); 2398 2388 setPropertyHandler(CSSPropertyHeight, ApplyPropertyLength<&RenderStyle::height, &RenderStyle::setHeight, &RenderStyle::initialSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled, NoneDisabled, UndefinedDisabled>::createHandler()); 2399 #if ENABLE(CSS_IMAGE_ORIENTATION)2400 setPropertyHandler(CSSPropertyImageOrientation, ApplyPropertyDefault<ImageOrientationEnum, &RenderStyle::imageOrientation, ImageOrientationEnum, &RenderStyle::setImageOrientation, ImageOrientationEnum, &RenderStyle::initialImageOrientation>::createHandler());2401 #endif2402 setPropertyHandler(CSSPropertyImageRendering, ApplyPropertyDefault<EImageRendering, &RenderStyle::imageRendering, EImageRendering, &RenderStyle::setImageRendering, EImageRendering, &RenderStyle::initialImageRendering>::createHandler());2403 2389 #if ENABLE(CSS_IMAGE_RESOLUTION) 2404 2390 setPropertyHandler(CSSPropertyImageResolution, ApplyPropertyImageResolution::createHandler()); … … 2413 2399 #endif 2414 2400 setPropertyHandler(CSSPropertyListStyleImage, ApplyPropertyStyleImage<&RenderStyle::listStyleImage, &RenderStyle::setListStyleImage, &RenderStyle::initialListStyleImage, CSSPropertyListStyleImage>::createHandler()); 2415 setPropertyHandler(CSSPropertyListStylePosition, ApplyPropertyDefault<EListStylePosition, &RenderStyle::listStylePosition, EListStylePosition, &RenderStyle::setListStylePosition, EListStylePosition, &RenderStyle::initialListStylePosition>::createHandler());2416 setPropertyHandler(CSSPropertyListStyleType, ApplyPropertyDefault<EListStyleType, &RenderStyle::listStyleType, EListStyleType, &RenderStyle::setListStyleType, EListStyleType, &RenderStyle::initialListStyleType>::createHandler());2417 2401 setPropertyHandler(CSSPropertyMarginBottom, ApplyPropertyLength<&RenderStyle::marginBottom, &RenderStyle::setMarginBottom, &RenderStyle::initialMargin, AutoEnabled>::createHandler()); 2418 2402 setPropertyHandler(CSSPropertyMarginLeft, ApplyPropertyLength<&RenderStyle::marginLeft, &RenderStyle::setMarginLeft, &RenderStyle::initialMargin, AutoEnabled>::createHandler()); … … 2423 2407 setPropertyHandler(CSSPropertyMinHeight, ApplyPropertyLength<&RenderStyle::minHeight, &RenderStyle::setMinHeight, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled>::createHandler()); 2424 2408 setPropertyHandler(CSSPropertyMinWidth, ApplyPropertyLength<&RenderStyle::minWidth, &RenderStyle::setMinWidth, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled>::createHandler()); 2425 setPropertyHandler(CSSPropertyObjectFit, ApplyPropertyDefault<ObjectFit, &RenderStyle::objectFit, ObjectFit, &RenderStyle::setObjectFit, ObjectFit, &RenderStyle::initialObjectFit>::createHandler());2426 setPropertyHandler(CSSPropertyOpacity, ApplyPropertyDefault<float, &RenderStyle::opacity, float, &RenderStyle::setOpacity, float, &RenderStyle::initialOpacity>::createHandler());2427 2409 setPropertyHandler(CSSPropertyOrphans, ApplyPropertyAuto<short, &RenderStyle::orphans, &RenderStyle::setOrphans, &RenderStyle::hasAutoOrphans, &RenderStyle::setHasAutoOrphans>::createHandler()); 2428 2410 setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler()); … … 2430 2412 setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::createHandler()); 2431 2413 setPropertyHandler(CSSPropertyOutlineWidth, ApplyPropertyComputeLength<unsigned short, &RenderStyle::outlineWidth, &RenderStyle::setOutlineWidth, &RenderStyle::initialOutlineWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2432 setPropertyHandler(CSSPropertyOverflowWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());2433 setPropertyHandler(CSSPropertyOverflowX, ApplyPropertyDefault<EOverflow, &RenderStyle::overflowX, EOverflow, &RenderStyle::setOverflowX, EOverflow, &RenderStyle::NonInheritedFlags::initialOverflowX>::createHandler());2434 setPropertyHandler(CSSPropertyOverflowY, ApplyPropertyDefault<EOverflow, &RenderStyle::overflowY, EOverflow, &RenderStyle::setOverflowY, EOverflow, &RenderStyle::NonInheritedFlags::initialOverflowY>::createHandler());2435 2414 setPropertyHandler(CSSPropertyPaddingBottom, ApplyPropertyLength<&RenderStyle::paddingBottom, &RenderStyle::setPaddingBottom, &RenderStyle::initialPadding>::createHandler()); 2436 2415 setPropertyHandler(CSSPropertyPaddingLeft, ApplyPropertyLength<&RenderStyle::paddingLeft, &RenderStyle::setPaddingLeft, &RenderStyle::initialPadding>::createHandler()); 2437 2416 setPropertyHandler(CSSPropertyPaddingRight, ApplyPropertyLength<&RenderStyle::paddingRight, &RenderStyle::setPaddingRight, &RenderStyle::initialPadding>::createHandler()); 2438 2417 setPropertyHandler(CSSPropertyPaddingTop, ApplyPropertyLength<&RenderStyle::paddingTop, &RenderStyle::setPaddingTop, &RenderStyle::initialPadding>::createHandler()); 2439 setPropertyHandler(CSSPropertyPageBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakAfter, EPageBreak, &RenderStyle::setPageBreakAfter, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2440 setPropertyHandler(CSSPropertyPageBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakBefore, EPageBreak, &RenderStyle::setPageBreakBefore, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2441 setPropertyHandler(CSSPropertyPageBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakInside, EPageBreak, &RenderStyle::setPageBreakInside, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2442 setPropertyHandler(CSSPropertyPointerEvents, ApplyPropertyDefault<EPointerEvents, &RenderStyle::pointerEvents, EPointerEvents, &RenderStyle::setPointerEvents, EPointerEvents, &RenderStyle::initialPointerEvents>::createHandler());2443 setPropertyHandler(CSSPropertyPosition, ApplyPropertyDefault<EPosition, &RenderStyle::position, EPosition, &RenderStyle::setPosition, EPosition, &RenderStyle::NonInheritedFlags::initialPosition>::createHandler());2444 2418 setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler()); 2445 2419 setPropertyHandler(CSSPropertyRight, ApplyPropertyLength<&RenderStyle::right, &RenderStyle::setRight, &RenderStyle::initialOffset, AutoEnabled>::createHandler()); 2446 2420 setPropertyHandler(CSSPropertySize, ApplyPropertyPageSize::createHandler()); 2447 setPropertyHandler(CSSPropertySpeak, ApplyPropertyDefault<ESpeak, &RenderStyle::speak, ESpeak, &RenderStyle::setSpeak, ESpeak, &RenderStyle::initialSpeak>::createHandler());2448 setPropertyHandler(CSSPropertyTableLayout, ApplyPropertyDefault<ETableLayout, &RenderStyle::tableLayout, ETableLayout, &RenderStyle::setTableLayout, ETableLayout, &RenderStyle::NonInheritedFlags::initialTableLayout>::createHandler());2449 setPropertyHandler(CSSPropertyTabSize, ApplyPropertyDefault<unsigned, &RenderStyle::tabSize, unsigned, &RenderStyle::setTabSize, unsigned, &RenderStyle::initialTabSize>::createHandler());2450 2421 setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler()); 2451 2422 setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler()); 2452 #if ENABLE(CSS3_TEXT)2453 setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());2454 setPropertyHandler(CSSPropertyWebkitTextJustify, ApplyPropertyDefault<TextJustify, &RenderStyle::textJustify, TextJustify, &RenderStyle::setTextJustify, TextJustify, &RenderStyle::initialTextJustify>::createHandler());2455 #endif // CSS3_TEXT2456 2423 setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler()); 2457 setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler());2458 2424 setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler()); 2459 2425 setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler()); 2460 2426 setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler()); 2461 2427 setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyTextIndent::createHandler()); 2462 setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());2463 2428 setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler()); 2464 setPropertyHandler(CSSPropertyTextTransform, ApplyPropertyDefault<ETextTransform, &RenderStyle::textTransform, ETextTransform, &RenderStyle::setTextTransform, ETextTransform, &RenderStyle::initialTextTransform>::createHandler());2465 2429 setPropertyHandler(CSSPropertyTop, ApplyPropertyLength<&RenderStyle::top, &RenderStyle::setTop, &RenderStyle::initialOffset, AutoEnabled>::createHandler()); 2466 setPropertyHandler(CSSPropertyUnicodeBidi, ApplyPropertyDefault<EUnicodeBidi, &RenderStyle::unicodeBidi, EUnicodeBidi, &RenderStyle::setUnicodeBidi, EUnicodeBidi, &RenderStyle::NonInheritedFlags::initialUnicodeBidi>::createHandler());2467 2430 setPropertyHandler(CSSPropertyVerticalAlign, ApplyPropertyVerticalAlign::createHandler()); 2468 setPropertyHandler(CSSPropertyVisibility, ApplyPropertyDefault<EVisibility, &RenderStyle::visibility, EVisibility, &RenderStyle::setVisibility, EVisibility, &RenderStyle::initialVisibility>::createHandler());2469 2431 setPropertyHandler(CSSPropertyWebkitAnimationDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler()); 2470 2432 setPropertyHandler(CSSPropertyWebkitAnimationDirection, ApplyPropertyAnimation<Animation::AnimationDirection, &Animation::direction, &Animation::setDirection, &Animation::isDirectionSet, &Animation::clearDirection, &Animation::initialAnimationDirection, &CSSToStyleMap::mapAnimationDirection, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler()); … … 2475 2437 setPropertyHandler(CSSPropertyWebkitAnimationPlayState, ApplyPropertyAnimation<EAnimPlayState, &Animation::playState, &Animation::setPlayState, &Animation::isPlayStateSet, &Animation::clearPlayState, &Animation::initialAnimationPlayState, &CSSToStyleMap::mapAnimationPlayState, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler()); 2476 2438 setPropertyHandler(CSSPropertyWebkitAnimationTimingFunction, ApplyPropertyAnimation<const PassRefPtr<TimingFunction>, &Animation::timingFunction, &Animation::setTimingFunction, &Animation::isTimingFunctionSet, &Animation::clearTimingFunction, &Animation::initialAnimationTimingFunction, &CSSToStyleMap::mapAnimationTimingFunction, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler()); 2477 setPropertyHandler(CSSPropertyWebkitAppearance, ApplyPropertyDefault<ControlPart, &RenderStyle::appearance, ControlPart, &RenderStyle::setAppearance, ControlPart, &RenderStyle::initialAppearance>::createHandler());2478 2439 setPropertyHandler(CSSPropertyWebkitAspectRatio, ApplyPropertyAspectRatio::createHandler()); 2479 setPropertyHandler(CSSPropertyWebkitBackfaceVisibility, ApplyPropertyDefault<EBackfaceVisibility, &RenderStyle::backfaceVisibility, EBackfaceVisibility, &RenderStyle::setBackfaceVisibility, EBackfaceVisibility, &RenderStyle::initialBackfaceVisibility>::createHandler());2480 2440 setPropertyHandler(CSSPropertyWebkitBackgroundClip, CSSPropertyBackgroundClip); 2481 2441 setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler()); 2482 2442 setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin); 2483 2443 setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize); 2484 #if ENABLE(CSS_COMPOSITING)2485 setPropertyHandler(CSSPropertyMixBlendMode, ApplyPropertyDefault<BlendMode, &RenderStyle::blendMode, BlendMode, &RenderStyle::setBlendMode, BlendMode, &RenderStyle::initialBlendMode>::createHandler());2486 setPropertyHandler(CSSPropertyIsolation, ApplyPropertyDefault<Isolation, &RenderStyle::isolation, Isolation, &RenderStyle::setIsolation, Isolation, &RenderStyle::initialIsolation>::createHandler());2487 #endif2488 setPropertyHandler(CSSPropertyWebkitBorderFit, ApplyPropertyDefault<EBorderFit, &RenderStyle::borderFit, EBorderFit, &RenderStyle::setBorderFit, EBorderFit, &RenderStyle::initialBorderFit>::createHandler());2489 2444 setPropertyHandler(CSSPropertyWebkitBorderHorizontalSpacing, ApplyPropertyComputeLength<short, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing, &RenderStyle::initialHorizontalBorderSpacing>::createHandler()); 2490 2445 setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImage<BorderImage, CSSPropertyWebkitBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage>::createHandler()); 2491 2446 setPropertyHandler(CSSPropertyWebkitBorderVerticalSpacing, ApplyPropertyComputeLength<short, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing, &RenderStyle::initialVerticalBorderSpacing>::createHandler()); 2492 setPropertyHandler(CSSPropertyWebkitBoxAlign, ApplyPropertyDefault<EBoxAlignment, &RenderStyle::boxAlign, EBoxAlignment, &RenderStyle::setBoxAlign, EBoxAlignment, &RenderStyle::initialBoxAlign>::createHandler());2493 #if ENABLE(CSS_BOX_DECORATION_BREAK)2494 setPropertyHandler(CSSPropertyWebkitBoxDecorationBreak, ApplyPropertyDefault<EBoxDecorationBreak, &RenderStyle::boxDecorationBreak, EBoxDecorationBreak, &RenderStyle::setBoxDecorationBreak, EBoxDecorationBreak, &RenderStyle::initialBoxDecorationBreak>::createHandler());2495 #endif2496 setPropertyHandler(CSSPropertyWebkitBoxDirection, ApplyPropertyDefault<EBoxDirection, &RenderStyle::boxDirection, EBoxDirection, &RenderStyle::setBoxDirection, EBoxDirection, &RenderStyle::initialBoxDirection>::createHandler());2497 setPropertyHandler(CSSPropertyWebkitBoxFlex, ApplyPropertyDefault<float, &RenderStyle::boxFlex, float, &RenderStyle::setBoxFlex, float, &RenderStyle::initialBoxFlex>::createHandler());2498 setPropertyHandler(CSSPropertyWebkitBoxFlexGroup, ApplyPropertyDefault<unsigned, &RenderStyle::boxFlexGroup, unsigned, &RenderStyle::setBoxFlexGroup, unsigned, &RenderStyle::initialBoxFlexGroup>::createHandler());2499 setPropertyHandler(CSSPropertyWebkitBoxLines, ApplyPropertyDefault<EBoxLines, &RenderStyle::boxLines, EBoxLines, &RenderStyle::setBoxLines, EBoxLines, &RenderStyle::initialBoxLines>::createHandler());2500 setPropertyHandler(CSSPropertyWebkitBoxOrdinalGroup, ApplyPropertyDefault<unsigned, &RenderStyle::boxOrdinalGroup, unsigned, &RenderStyle::setBoxOrdinalGroup, unsigned, &RenderStyle::initialBoxOrdinalGroup>::createHandler());2501 setPropertyHandler(CSSPropertyWebkitBoxOrient, ApplyPropertyDefault<EBoxOrient, &RenderStyle::boxOrient, EBoxOrient, &RenderStyle::setBoxOrient, EBoxOrient, &RenderStyle::initialBoxOrient>::createHandler());2502 setPropertyHandler(CSSPropertyWebkitBoxPack, ApplyPropertyDefault<EBoxPack, &RenderStyle::boxPack, EBoxPack, &RenderStyle::setBoxPack, EBoxPack, &RenderStyle::initialBoxPack>::createHandler());2503 setPropertyHandler(CSSPropertyWebkitColorCorrection, ApplyPropertyDefault<ColorSpace, &RenderStyle::colorSpace, ColorSpace, &RenderStyle::setColorSpace, ColorSpace, &RenderStyle::initialColorSpace>::createHandler());2504 setPropertyHandler(CSSPropertyWebkitColumnAxis, ApplyPropertyDefault<ColumnAxis, &RenderStyle::columnAxis, ColumnAxis, &RenderStyle::setColumnAxis, ColumnAxis, &RenderStyle::initialColumnAxis>::createHandler());2505 setPropertyHandler(CSSPropertyWebkitColumnBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::columnBreakAfter, EPageBreak, &RenderStyle::setColumnBreakAfter, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2506 setPropertyHandler(CSSPropertyWebkitColumnBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::columnBreakBefore, EPageBreak, &RenderStyle::setColumnBreakBefore, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2507 setPropertyHandler(CSSPropertyWebkitColumnBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::columnBreakInside, EPageBreak, &RenderStyle::setColumnBreakInside, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2508 2447 setPropertyHandler(CSSPropertyWebkitColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler()); 2509 setPropertyHandler(CSSPropertyWebkitColumnFill, ApplyPropertyDefault<ColumnFill, &RenderStyle::columnFill, ColumnFill, &RenderStyle::setColumnFill, ColumnFill, &RenderStyle::initialColumnFill>::createHandler());2510 2448 setPropertyHandler(CSSPropertyWebkitColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler()); 2511 setPropertyHandler(CSSPropertyWebkitColumnProgression, ApplyPropertyDefault<ColumnProgression, &RenderStyle::columnProgression, ColumnProgression, &RenderStyle::setColumnProgression, ColumnProgression, &RenderStyle::initialColumnProgression>::createHandler());2512 2449 setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler()); 2513 2450 setPropertyHandler(CSSPropertyWebkitColumnRuleWidth, ApplyPropertyComputeLength<unsigned short, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth, &RenderStyle::initialColumnRuleWidth, NormalDisabled, ThicknessEnabled>::createHandler()); 2514 setPropertyHandler(CSSPropertyWebkitColumnSpan, ApplyPropertyDefault<ColumnSpan, &RenderStyle::columnSpan, ColumnSpan, &RenderStyle::setColumnSpan, ColumnSpan, &RenderStyle::initialColumnSpan>::createHandler());2515 setPropertyHandler(CSSPropertyWebkitColumnRuleStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::columnRuleStyle, EBorderStyle, &RenderStyle::setColumnRuleStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());2516 2451 setPropertyHandler(CSSPropertyWebkitColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler()); 2517 #if ENABLE(CURSOR_VISIBILITY)2518 setPropertyHandler(CSSPropertyWebkitCursorVisibility, ApplyPropertyDefault<CursorVisibility, &RenderStyle::cursorVisibility, CursorVisibility, &RenderStyle::setCursorVisibility, CursorVisibility, &RenderStyle::initialCursorVisibility>::createHandler());2519 #endif2520 setPropertyHandler(CSSPropertyAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());2521 setPropertyHandler(CSSPropertyAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());2522 setPropertyHandler(CSSPropertyAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());2523 2452 setPropertyHandler(CSSPropertyFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler()); 2524 setPropertyHandler(CSSPropertyFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());2525 setPropertyHandler(CSSPropertyFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());2526 setPropertyHandler(CSSPropertyFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());2527 setPropertyHandler(CSSPropertyFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());2528 setPropertyHandler(CSSPropertyJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());2529 setPropertyHandler(CSSPropertyOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());2530 2453 #if ENABLE(CSS_REGIONS) 2531 2454 setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler()); … … 2539 2462 setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitBefore, &RenderStyle::setHyphenationLimitBefore, &RenderStyle::initialHyphenationLimitBefore>::createHandler()); 2540 2463 setPropertyHandler(CSSPropertyWebkitHyphenateLimitLines, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitLines, &RenderStyle::setHyphenationLimitLines, &RenderStyle::initialHyphenationLimitLines, CSSValueNoLimit>::createHandler()); 2541 setPropertyHandler(CSSPropertyWebkitHyphens, ApplyPropertyDefault<Hyphens, &RenderStyle::hyphens, Hyphens, &RenderStyle::setHyphens, Hyphens, &RenderStyle::initialHyphens>::createHandler());2542 setPropertyHandler(CSSPropertyWebkitLineAlign, ApplyPropertyDefault<LineAlign, &RenderStyle::lineAlign, LineAlign, &RenderStyle::setLineAlign, LineAlign, &RenderStyle::initialLineAlign>::createHandler());2543 setPropertyHandler(CSSPropertyWebkitLineBreak, ApplyPropertyDefault<LineBreak, &RenderStyle::lineBreak, LineBreak, &RenderStyle::setLineBreak, LineBreak, &RenderStyle::initialLineBreak>::createHandler());2544 setPropertyHandler(CSSPropertyWebkitLineClamp, ApplyPropertyDefault<const LineClampValue&, &RenderStyle::lineClamp, LineClampValue, &RenderStyle::setLineClamp, LineClampValue, &RenderStyle::initialLineClamp>::createHandler());2545 2464 setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler()); 2546 setPropertyHandler(CSSPropertyWebkitLineSnap, ApplyPropertyDefault<LineSnap, &RenderStyle::lineSnap, LineSnap, &RenderStyle::setLineSnap, LineSnap, &RenderStyle::initialLineSnap>::createHandler());2547 setPropertyHandler(CSSPropertyWebkitMarginAfterCollapse, ApplyPropertyDefault<EMarginCollapse, &RenderStyle::marginAfterCollapse, EMarginCollapse, &RenderStyle::setMarginAfterCollapse, EMarginCollapse, &RenderStyle::initialMarginAfterCollapse>::createHandler());2548 setPropertyHandler(CSSPropertyWebkitMarginBeforeCollapse, ApplyPropertyDefault<EMarginCollapse, &RenderStyle::marginBeforeCollapse, EMarginCollapse, &RenderStyle::setMarginBeforeCollapse, EMarginCollapse, &RenderStyle::initialMarginBeforeCollapse>::createHandler());2549 setPropertyHandler(CSSPropertyWebkitMarginBottomCollapse, CSSPropertyWebkitMarginAfterCollapse);2550 setPropertyHandler(CSSPropertyWebkitMarginTopCollapse, CSSPropertyWebkitMarginBeforeCollapse);2551 setPropertyHandler(CSSPropertyWebkitMarqueeDirection, ApplyPropertyDefault<EMarqueeDirection, &RenderStyle::marqueeDirection, EMarqueeDirection, &RenderStyle::setMarqueeDirection, EMarqueeDirection, &RenderStyle::initialMarqueeDirection>::createHandler());2552 2465 setPropertyHandler(CSSPropertyWebkitMarqueeIncrement, ApplyPropertyMarqueeIncrement::createHandler()); 2553 2466 setPropertyHandler(CSSPropertyWebkitMarqueeRepetition, ApplyPropertyMarqueeRepetition::createHandler()); 2554 2467 setPropertyHandler(CSSPropertyWebkitMarqueeSpeed, ApplyPropertyMarqueeSpeed::createHandler()); 2555 setPropertyHandler(CSSPropertyWebkitMarqueeStyle, ApplyPropertyDefault<EMarqueeBehavior, &RenderStyle::marqueeBehavior, EMarqueeBehavior, &RenderStyle::setMarqueeBehavior, EMarqueeBehavior, &RenderStyle::initialMarqueeBehavior>::createHandler());2556 2468 setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImage<BorderMask, CSSPropertyWebkitMaskBoxImage, &RenderStyle::maskBoxImage, &RenderStyle::setMaskBoxImage>::createHandler()); 2557 2469 setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifier<BorderMask, Outset>::createHandler()); … … 2570 2482 setPropertyHandler(CSSPropertyWebkitMaskSize, ApplyPropertyFillLayer<FillSize, CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSToStyleMap::mapFillSize>::createHandler()); 2571 2483 setPropertyHandler(CSSPropertyWebkitMaskSourceType, ApplyPropertyFillLayer<EMaskSourceType, CSSPropertyWebkitMaskSourceType, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isMaskSourceTypeSet, &FillLayer::maskSourceType, &FillLayer::setMaskSourceType, &FillLayer::clearMaskSourceType, &FillLayer::initialMaskSourceType, &CSSToStyleMap::mapFillMaskSourceType>::createHandler()); 2572 setPropertyHandler(CSSPropertyWebkitNbspMode, ApplyPropertyDefault<ENBSPMode, &RenderStyle::nbspMode, ENBSPMode, &RenderStyle::setNBSPMode, ENBSPMode, &RenderStyle::initialNBSPMode>::createHandler());2573 2484 setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler()); 2574 2485 setPropertyHandler(CSSPropertyWebkitPerspectiveOriginX, ApplyPropertyLength<&RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX, &RenderStyle::initialPerspectiveOriginX>::createHandler()); 2575 2486 setPropertyHandler(CSSPropertyWebkitPerspectiveOriginY, ApplyPropertyLength<&RenderStyle::perspectiveOriginY, &RenderStyle::setPerspectiveOriginY, &RenderStyle::initialPerspectiveOriginY>::createHandler()); 2576 setPropertyHandler(CSSPropertyWebkitPrintColorAdjust, ApplyPropertyDefault<PrintColorAdjust, &RenderStyle::printColorAdjust, PrintColorAdjust, &RenderStyle::setPrintColorAdjust, PrintColorAdjust, &RenderStyle::initialPrintColorAdjust>::createHandler());2577 #if ENABLE(CSS_REGIONS)2578 setPropertyHandler(CSSPropertyWebkitRegionBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakAfter, EPageBreak, &RenderStyle::setRegionBreakAfter, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2579 setPropertyHandler(CSSPropertyWebkitRegionBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakBefore, EPageBreak, &RenderStyle::setRegionBreakBefore, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2580 setPropertyHandler(CSSPropertyWebkitRegionBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakInside, EPageBreak, &RenderStyle::setRegionBreakInside, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());2581 setPropertyHandler(CSSPropertyWebkitRegionFragment, ApplyPropertyDefault<RegionFragment, &RenderStyle::regionFragment, RegionFragment, &RenderStyle::setRegionFragment, RegionFragment, &RenderStyle::initialRegionFragment>::createHandler());2582 #endif2583 setPropertyHandler(CSSPropertyWebkitRtlOrdering, ApplyPropertyDefault<Order, &RenderStyle::rtlOrdering, Order, &RenderStyle::setRTLOrdering, Order, &RenderStyle::initialRTLOrdering>::createHandler());2584 setPropertyHandler(CSSPropertyWebkitRubyPosition, ApplyPropertyDefault<RubyPosition, &RenderStyle::rubyPosition, RubyPosition, &RenderStyle::setRubyPosition, RubyPosition, &RenderStyle::initialRubyPosition>::createHandler());2585 setPropertyHandler(CSSPropertyWebkitTextCombine, ApplyPropertyDefault<TextCombine, &RenderStyle::textCombine, TextCombine, &RenderStyle::setTextCombine, TextCombine, &RenderStyle::initialTextCombine>::createHandler());2586 2487 setPropertyHandler(CSSPropertyWebkitTextEmphasisColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor, &RenderStyle::color>::createHandler()); 2587 2488 setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, ApplyPropertyTextEmphasisPosition::createHandler()); 2588 2489 setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler()); 2589 2490 setPropertyHandler(CSSPropertyWebkitTextFillColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::setVisitedLinkTextFillColor, &RenderStyle::color>::createHandler()); 2590 setPropertyHandler(CSSPropertyWebkitTextSecurity, ApplyPropertyDefault<ETextSecurity, &RenderStyle::textSecurity, ETextSecurity, &RenderStyle::setTextSecurity, ETextSecurity, &RenderStyle::initialTextSecurity>::createHandler());2591 2491 setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler()); 2592 2492 setPropertyHandler(CSSPropertyWebkitTransformOriginX, ApplyPropertyLength<&RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX, &RenderStyle::initialTransformOriginX>::createHandler()); 2593 2493 setPropertyHandler(CSSPropertyWebkitTransformOriginY, ApplyPropertyLength<&RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY, &RenderStyle::initialTransformOriginY>::createHandler()); 2594 2494 setPropertyHandler(CSSPropertyWebkitTransformOriginZ, ApplyPropertyComputeLength<float, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ, &RenderStyle::initialTransformOriginZ>::createHandler()); 2595 setPropertyHandler(CSSPropertyWebkitTransformStyle, ApplyPropertyDefault<ETransformStyle3D, &RenderStyle::transformStyle3D, ETransformStyle3D, &RenderStyle::setTransformStyle3D, ETransformStyle3D, &RenderStyle::initialTransformStyle3D>::createHandler());2596 2495 setPropertyHandler(CSSPropertyWebkitTransitionDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler()); 2597 2496 setPropertyHandler(CSSPropertyWebkitTransitionDuration, ApplyPropertyAnimation<double, &Animation::duration, &Animation::setDuration, &Animation::isDurationSet, &Animation::clearDuration, &Animation::initialAnimationDuration, &CSSToStyleMap::mapAnimationDuration, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler()); 2598 2497 setPropertyHandler(CSSPropertyWebkitTransitionProperty, ApplyPropertyAnimation<CSSPropertyID, &Animation::property, &Animation::setProperty, &Animation::isPropertySet, &Animation::clearProperty, &Animation::initialAnimationProperty, &CSSToStyleMap::mapAnimationProperty, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler()); 2599 2498 setPropertyHandler(CSSPropertyWebkitTransitionTimingFunction, ApplyPropertyAnimation<const PassRefPtr<TimingFunction>, &Animation::timingFunction, &Animation::setTimingFunction, &Animation::isTimingFunctionSet, &Animation::clearTimingFunction, &Animation::initialAnimationTimingFunction, &CSSToStyleMap::mapAnimationTimingFunction, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler()); 2600 setPropertyHandler(CSSPropertyWebkitUserDrag, ApplyPropertyDefault<EUserDrag, &RenderStyle::userDrag, EUserDrag, &RenderStyle::setUserDrag, EUserDrag, &RenderStyle::initialUserDrag>::createHandler());2601 setPropertyHandler(CSSPropertyWebkitUserModify, ApplyPropertyDefault<EUserModify, &RenderStyle::userModify, EUserModify, &RenderStyle::setUserModify, EUserModify, &RenderStyle::initialUserModify>::createHandler());2602 setPropertyHandler(CSSPropertyWebkitUserSelect, ApplyPropertyDefault<EUserSelect, &RenderStyle::userSelect, EUserSelect, &RenderStyle::setUserSelect, EUserSelect, &RenderStyle::initialUserSelect>::createHandler());2603 2499 setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler()); 2604 2500 #if ENABLE(CSS_SHAPES) … … 2607 2503 setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler()); 2608 2504 #endif 2609 setPropertyHandler(CSSPropertyWhiteSpace, ApplyPropertyDefault<EWhiteSpace, &RenderStyle::whiteSpace, EWhiteSpace, &RenderStyle::setWhiteSpace, EWhiteSpace, &RenderStyle::initialWhiteSpace>::createHandler());2610 2505 setPropertyHandler(CSSPropertyWidows, ApplyPropertyAuto<short, &RenderStyle::widows, &RenderStyle::setWidows, &RenderStyle::hasAutoWidows, &RenderStyle::setHasAutoWidows>::createHandler()); 2611 2506 setPropertyHandler(CSSPropertyWidth, ApplyPropertyLength<&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler()); 2612 setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &RenderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &RenderStyle::initialWordBreak>::createHandler());2613 2507 setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyWordSpacing::createHandler()); 2614 2615 // UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' property. So using the same handlers.2616 setPropertyHandler(CSSPropertyWordWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());2617 2618 2508 setPropertyHandler(CSSPropertyCx, ApplyPropertyLength<&RenderStyle::cx, &RenderStyle::setCx, &RenderStyle::initialZeroLength>::createHandler()); 2619 2509 setPropertyHandler(CSSPropertyCy, ApplyPropertyLength<&RenderStyle::cy, &RenderStyle::setCy, &RenderStyle::initialZeroLength>::createHandler()); -
trunk/Source/WebCore/css/StyleResolver.cpp
r174836 r175052 9 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 10 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 11 * Copyright (C) 2012 Google Inc. All rights reserved.11 * Copyright (C) 2012, 2013 Google Inc. All rights reserved. 12 12 * Copyright (C) 2014 Igalia S.L. 13 13 * … … 114 114 #include "ShadowData.h" 115 115 #include "ShadowRoot.h" 116 #include "StyleBuilder.h" 116 117 #include "StyleCachedImage.h" 117 118 #include "StyleFontSizeFunctions.h" … … 1359 1360 // Only the root <svg> element in an SVG document fragment tree honors css position 1360 1361 if (!(e->hasTagName(SVGNames::svgTag) && e->parentNode() && !e->parentNode()->isSVGElement())) 1361 style.setPosition(RenderStyle:: NonInheritedFlags::initialPosition());1362 style.setPosition(RenderStyle::initialPosition()); 1362 1363 1363 1364 // RenderSVGRoot handles zooming for the whole SVG subtree, so foreignObject content should … … 2127 2128 return; 2128 2129 } 2130 2131 // Use the new StyleBuilder. 2132 if (StyleBuilder::applyProperty(id, *this, value, isInitial, isInherit)) 2133 return; 2129 2134 2130 2135 CSSPrimitiveValue* primitiveValue = is<CSSPrimitiveValue>(*value) ? downcast<CSSPrimitiveValue>(value) : nullptr; … … 2947 2952 case CSSPropertyTransitionTimingFunction: 2948 2953 return; 2949 // These properties are implemented in the DeprecatedStyleBuilder lookup table .2954 // These properties are implemented in the DeprecatedStyleBuilder lookup table or in the new StyleBuilder. 2950 2955 case CSSPropertyBackgroundAttachment: 2951 2956 case CSSPropertyBackgroundClip: -
trunk/Source/WebCore/css/makeprop.pl
r162907 r175052 4 4 # 5 5 # Copyright (C) 1999 Waldo Bastian (bastian@kde.org) 6 # Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.6 # Copyright (C) 2007, 2008, 2012, 2014 Apple Inc. All rights reserved. 7 7 # Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 8 8 # Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged 9 # Copyright (C) 2013 Google Inc. All rights reserved. 9 10 # 10 11 # This library is free software; you can redistribute it and/or … … 41 42 my @names = (); 42 43 my %nameIsInherited; 44 # FIXME: Eventually all properties should use the new style builder and the following 45 # variable should go away. 46 my %propertiesUsingNewStyleBuilder; 47 my %newStyleBuilderOptions = ( 48 Getter => 1, 49 Initial => 1, 50 NameForMethods => 1, 51 Setter => 1, 52 TypeName => 1, 53 ); 43 54 my %nameToId; 44 55 my @aliases = (); … … 68 79 $nameIsInherited{$_} = 0; 69 80 foreach my $option (@options) { 70 if ($option eq "Inherited") { 81 my ($optionName, $optionValue) = split(/=/, $option); 82 if ($optionName eq "Inherited") { 71 83 $nameIsInherited{$_} = 1; 84 } elsif ($optionName eq "NewStyleBuilder") { 85 # FIXME: This is temporary. Eventually, all properties will use the new 86 # style builder and this option will go away. 87 $propertiesUsingNewStyleBuilder{$_} = {}; 88 } elsif ($newStyleBuilderOptions{$optionName}) { 89 die "\"" . $optionName . "\" option was used without \"NewStyleBuilder\" option for " . $_ . " property." if not exists($propertiesUsingNewStyleBuilder{$_}); 90 $propertiesUsingNewStyleBuilder{$_}{$optionName} = $optionValue; 91 } else { 92 die "Unrecognized \"" . $optionName . "\" option for " . $_ . " property."; 72 93 } 73 94 } … … 303 324 close HEADER; 304 325 326 # 327 # StyleBuilder.cpp generator. 328 # 329 330 foreach my $name (@names) { 331 # Skip properties not using the new style builder yet. 332 next unless exists($propertiesUsingNewStyleBuilder{$name}); 333 334 my $nameForMethods = $nameToId{$name}; 335 $nameForMethods =~ s/Webkit//g; 336 if (exists($propertiesUsingNewStyleBuilder{$name}{"NameForMethods"})) { 337 $nameForMethods = $propertiesUsingNewStyleBuilder{$name}{"NameForMethods"}; 338 } 339 340 if (!exists($propertiesUsingNewStyleBuilder{$name}{"TypeName"})) { 341 $propertiesUsingNewStyleBuilder{$name}{"TypeName"} = "E" . $nameForMethods; 342 } 343 if (!exists($propertiesUsingNewStyleBuilder{$name}{"Getter"})) { 344 $propertiesUsingNewStyleBuilder{$name}{"Getter"} = lcfirst($nameForMethods); 345 } 346 if (!exists($propertiesUsingNewStyleBuilder{$name}{"Setter"})) { 347 $propertiesUsingNewStyleBuilder{$name}{"Setter"} = "set" . $nameForMethods; 348 } 349 if (!exists($propertiesUsingNewStyleBuilder{$name}{"Initial"})) { 350 $propertiesUsingNewStyleBuilder{$name}{"Initial"} = "initial" . $nameForMethods; 351 } 352 } 353 354 open STYLEBUILDER, ">StyleBuilder.cpp" || die "Could not open StyleBuilder.cpp for writing"; 355 print STYLEBUILDER << "EOF"; 356 /* This file is automatically generated from CSSPropertyNames.in by makeprop, do not edit */ 357 358 #include "config.h" 359 #include "StyleBuilder.h" 360 361 #include "CSSPrimitiveValueMappings.h" 362 #include "CSSProperty.h" 363 #include "RenderStyle.h" 364 #include "StyleResolver.h" 365 366 namespace WebCore { 367 368 class StyleBuilderFunctions { 369 public: 370 EOF 371 372 foreach my $name (@names) { 373 # Skip properties not using the new style builder yet. 374 next unless exists($propertiesUsingNewStyleBuilder{$name}); 375 376 my $setValue = "styleResolver.style()->" . $propertiesUsingNewStyleBuilder{$name}{"Setter"}; 377 print STYLEBUILDER " static void applyInitial" . $nameToId{$name} . "(StyleResolver& styleResolver)\n"; 378 print STYLEBUILDER " {\n"; 379 print STYLEBUILDER " " . $setValue . "(RenderStyle::" . $propertiesUsingNewStyleBuilder{$name}{"Initial"} . "());\n"; 380 print STYLEBUILDER " }\n"; 381 print STYLEBUILDER " static void applyInherit" . $nameToId{$name} . "(StyleResolver& styleResolver)\n"; 382 print STYLEBUILDER " {\n"; 383 print STYLEBUILDER " " . $setValue . "(styleResolver.parentStyle()->" . $propertiesUsingNewStyleBuilder{$name}{"Getter"} . "());\n"; 384 print STYLEBUILDER " }\n"; 385 print STYLEBUILDER " static void applyValue" . $nameToId{$name} . "(StyleResolver& styleResolver, CSSValue& value)\n"; 386 print STYLEBUILDER " {\n"; 387 print STYLEBUILDER " " . $setValue . "(static_cast<" . $propertiesUsingNewStyleBuilder{$name}{"TypeName"} . ">(static_cast<CSSPrimitiveValue&>(value)));\n"; 388 print STYLEBUILDER " }\n"; 389 } 390 391 print STYLEBUILDER << "EOF"; 392 }; 393 394 bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver& styleResolver, CSSValue* value, bool isInitial, bool isInherit) 395 { 396 switch (property) { 397 EOF 398 399 foreach my $name (@names) { 400 # Skip properties not using the new style builder yet. 401 next unless exists($propertiesUsingNewStyleBuilder{$name}); 402 403 print STYLEBUILDER " case CSSProperty" . $nameToId{$name} . ":\n"; 404 print STYLEBUILDER " if (isInitial)\n"; 405 print STYLEBUILDER " StyleBuilderFunctions::applyInitial" . $nameToId{$name} . "(styleResolver);\n"; 406 print STYLEBUILDER " else if (isInherit)\n"; 407 print STYLEBUILDER " StyleBuilderFunctions::applyInherit" . $nameToId{$name} . "(styleResolver);\n"; 408 print STYLEBUILDER " else\n"; 409 print STYLEBUILDER " StyleBuilderFunctions::applyValue" . $nameToId{$name} . "(styleResolver, *value);\n"; 410 print STYLEBUILDER " return true;\n"; 411 } 412 413 print STYLEBUILDER << "EOF"; 414 default: 415 return false; 416 }; 417 } 418 419 } // namespace WebCore 420 EOF 421 422 close STYLEBUILDER; 423 305 424 my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf"; 306 425 system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?"; -
trunk/Source/WebCore/rendering/style/RenderStyle.h
r174283 r175052 265 265 bool isLink() const { return getBoolean(isLinkOffset); } 266 266 void setIsLink(bool value) { updateBoolean(value, isLinkOffset); } 267 268 static EOverflow initialOverflowX() { return OVISIBLE; }269 static EOverflow initialOverflowY() { return OVISIBLE; }270 static EClear initialClear() { return CNONE; }271 static EDisplay initialDisplay() { return INLINE; }272 static EUnicodeBidi initialUnicodeBidi() { return UBNormal; }273 static EPosition initialPosition() { return StaticPosition; }274 static EVerticalAlign initialVerticalAlign() { return BASELINE; }275 static EFloat initialFloating() { return NoFloat; }276 static EPageBreak initialPageBreak() { return PBAUTO; }277 static ETableLayout initialTableLayout() { return TAUTO; }278 267 279 268 static ptrdiff_t flagsMemoryOffset() { return OBJECT_OFFSETOF(NonInheritedFlags, m_flags); } … … 1785 1774 1786 1775 // Initial values for all the properties 1776 static EOverflow initialOverflowX() { return OVISIBLE; } 1777 static EOverflow initialOverflowY() { return OVISIBLE; } 1778 static EClear initialClear() { return CNONE; } 1779 static EDisplay initialDisplay() { return INLINE; } 1780 static EUnicodeBidi initialUnicodeBidi() { return UBNormal; } 1781 static EPosition initialPosition() { return StaticPosition; } 1782 static EVerticalAlign initialVerticalAlign() { return BASELINE; } 1783 static EFloat initialFloating() { return NoFloat; } 1784 static EPageBreak initialPageBreak() { return PBAUTO; } 1785 static ETableLayout initialTableLayout() { return TAUTO; } 1787 1786 static EBorderCollapse initialBorderCollapse() { return BSEPARATE; } 1788 1787 static EBorderStyle initialBorderStyle() { return BNONE; } -
trunk/Source/WebCore/rendering/style/StyleMultiColData.cpp
r166465 r175052 36 36 , m_fill(RenderStyle::initialColumnFill()) 37 37 , m_columnSpan(false) 38 , m_breakBefore(RenderStyle:: NonInheritedFlags::initialPageBreak())39 , m_breakAfter(RenderStyle:: NonInheritedFlags::initialPageBreak())40 , m_breakInside(RenderStyle:: NonInheritedFlags::initialPageBreak())38 , m_breakBefore(RenderStyle::initialPageBreak()) 39 , m_breakAfter(RenderStyle::initialPageBreak()) 40 , m_breakInside(RenderStyle::initialPageBreak()) 41 41 , m_axis(RenderStyle::initialColumnAxis()) 42 42 , m_progression(RenderStyle::initialColumnProgression()) -
trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp
r173659 r175052 73 73 #endif 74 74 , m_regionFragment(RenderStyle::initialRegionFragment()) 75 , m_regionBreakAfter(RenderStyle:: NonInheritedFlags::initialPageBreak())76 , m_regionBreakBefore(RenderStyle:: NonInheritedFlags::initialPageBreak())77 , m_regionBreakInside(RenderStyle:: NonInheritedFlags::initialPageBreak())75 , m_regionBreakAfter(RenderStyle::initialPageBreak()) 76 , m_regionBreakBefore(RenderStyle::initialPageBreak()) 77 , m_regionBreakInside(RenderStyle::initialPageBreak()) 78 78 , m_pageSizeType(PAGE_SIZE_AUTO) 79 79 , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
Note: See TracChangeset
for help on using the changeset viewer.