Changeset 175052 in webkit


Ignore:
Timestamp:
Oct 22, 2014 9:56:36 AM (9 years ago)
Author:
Chris Dumez
Message:

Add initial support for generating the StyleBuilder from CSSPropertyNames.in
https://bugs.webkit.org/show_bug.cgi?id=137910

Reviewed by Andreas Kling.

Add initial support for generating the StyleBuilder from
CSSPropertyNames.in. This is a first step towards getting rid of the
legacy DeprecatedStyleBuilder class and having everything defined in one
place (CSSPropertyNames.in).

This patch updates makeprop.pl script to generate a StyleBuilder.cpp
file that generate a the StyleBuilder::applyProperty() method
implementation using a huge switch statement for all the CSS
properties. With this patch, we are now generating the new StyleBuilder
code for all the "simple" CSS properties (i.e. those that were using
ApplyPropertyDefault<> in DeprecatedStyleBuilder.cpp). I am using a
"NewStyleBuilder" option in CSSPropertyNames.in for properties that
we generate to help with improving incrementally the generator. Once
we are able to generate all properties, this transition option will
do away and become the default.

By default, the generator will make an educated guess for the type
name, the getter, the setter and the initial function of each property.
For example, for the border-collapse property, it will use:

  • TypeName: EBorderCollapse (i.e. 'E' + PropertyId)
  • Getter: borderCollapse() (i.e. PropertyId with first letter lowercased)
  • Setter: setBorderCollapse() (i.e. 'set' + PropertyId)
  • Initial: initialBorderCollapse() (i.e. 'initial' + PropertyId)

This works for most properties. For properties that need
special-casing, developers can use the following options in
CSSPropertyNames.in:

  • TypeName: Overrides the type name
  • Getter: Overrides the getter name
  • Setter: Overrides the setter name
  • Initial: Overrides the initial function name
  • NameForMethods: Overrides the Getter / Setter / Initial function names. For e.g. "NameForMethods=OverflowWrap" will use "overflowWrap() / setOverflowWrap() / initialOverflowWrap()".

The patch is inspired by the following Blink revision by
<timloh@chromium.org>:
https://src.chromium.org/viewvc/blink?view=rev&revision=150424

No new tests, no behavior change.

  • CMakeLists.txt:
  • DerivedSources.make:
  • WebCore.vcxproj/WebCore.vcxproj:
  • WebCore.vcxproj/WebCore.vcxproj.filters:
  • WebCore.xcodeproj/project.pbxproj:
  • css/CSSPropertyNames.in:
  • css/DeprecatedStyleBuilder.cpp:

(WebCore::ApplyPropertyVerticalAlign::createHandler):
(WebCore::ApplyPropertyDisplay::applyInitialValue):
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):

  • css/StyleBuilder.h: Added.
  • css/StyleResolver.cpp:

(WebCore::StyleResolver::adjustRenderStyle):
(WebCore::StyleResolver::applyProperty):

  • css/makeprop.pl:
  • rendering/style/RenderStyle.h:

Move the initialXXX() methods that were in NonInheritedFlags to
RenderStyle class, with the other initialXXX() methods to facilitate
code generation.

  • rendering/style/StyleMultiColData.cpp:

(WebCore::StyleMultiColData::StyleMultiColData):

  • rendering/style/StyleRareNonInheritedData.cpp:

(WebCore::StyleRareNonInheritedData::StyleRareNonInheritedData):

Location:
trunk/Source/WebCore
Files:
1 added
13 edited

Legend:

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

    r175050 r175052  
    32453245# Generate CSS property names
    32463246add_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
    32483248    MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
    32493249    DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
     
    32533253    VERBATIM)
    32543254list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
     3255list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
    32553256ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
    32563257ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
  • trunk/Source/WebCore/ChangeLog

    r175051 r175052  
     12014-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
    1742014-10-22  Carlos Garcia Campos  <cgarcia@igalia.com>
    275
  • trunk/Source/WebCore/DerivedSources.make

    r174892 r175052  
    785785    SelectorPseudoClassAndCompatibilityElementMap.cpp \
    786786    SelectorPseudoElementTypeMap.cpp \
     787    StyleBuilder.cpp \
    787788    UserAgentStyleSheets.h \
    788789    WebKitFontFamilyNames.cpp \
     
    821822WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
    822823
    823 CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
     824CSSPropertyNames.h StyleBuilder.cpp : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
    824825        $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
    825826        $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

    r175050 r175052  
    286286    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoClassAndCompatibilityElementMap.cpp" />
    287287    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoElementTypeMap.cpp" />
     288    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StyleBuilder.cpp" />
    288289    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSANGLEInstancedArrays.cpp">
    289290      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
  • trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

    r175050 r175052  
    51955195      <Filter>DerivedSources</Filter>
    51965196    </ClCompile>
     5197    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StyleBuilder.cpp">
     5198      <Filter>DerivedSources</Filter>
     5199    </ClCompile>
    51975200    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\EventFactory.cpp">
    51985201      <Filter>DerivedSources</Filter>
  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r175050 r175052  
    24832483                836FBCEA178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */; };
    24842484                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 */; };
    24852487                83C1D425178D5AB400141E68 /* SVGPathSegArcAbs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D413178D5AB400141E68 /* SVGPathSegArcAbs.h */; };
    24862488                83C1D426178D5AB400141E68 /* SVGPathSegArcRel.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D414178D5AB400141E68 /* SVGPathSegArcRel.h */; };
     
    96419643                836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTypeAnimator.cpp; sourceTree = "<group>"; };
    96429644                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>"; };
    96439647                83C1D413178D5AB400141E68 /* SVGPathSegArcAbs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegArcAbs.h; sourceTree = "<group>"; };
    96449648                83C1D414178D5AB400141E68 /* SVGPathSegArcRel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegArcRel.h; sourceTree = "<group>"; };
     
    1625216256                                656581E809D1508D000E61D7 /* SVGNames.cpp */,
    1625316257                                656581E909D1508D000E61D7 /* SVGNames.h */,
     16258                                8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */,
    1625416259                                CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */,
    1625516260                                CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */,
     
    2220722212                                3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
    2220822213                                3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
     22214                                8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */,
    2220922215                        );
    2221022216                        path = css;
     
    2336423370                                CD5596921475B678001D0BD0 /* AudioFileReaderIOS.h in Headers */,
    2336523371                                FD3160BF12B0272A00C1A359 /* AudioFileReaderMac.h in Headers */,
     23372                                8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */,
    2336623373                                FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */,
    2336723374                                FD31601012B0267600C1A359 /* AudioListener.h in Headers */,
     
    2739727404                                4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */,
    2739827405                                1AF4CEE918BC350100BC2D34 /* DefaultVisitedLinkStore.cpp in Sources */,
     27406                                8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */,
    2739927407                                FD31602B12B0267600C1A359 /* DelayDSPKernel.cpp in Sources */,
    2740027408                                FD31602D12B0267600C1A359 /* DelayNode.cpp in Sources */,
  • trunk/Source/WebCore/css/CSSPropertyNames.in

    r173579 r175052  
    4040
    4141// 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]
    4343
    4444// The remaining properties are listed in alphabetical order
     
    6464border-bottom-right-radius
    6565-webkit-border-bottom-right-radius = border-bottom-right-radius
    66 border-bottom-style
     66border-bottom-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
    6767border-bottom-width
    68 border-collapse [Inherited]
     68border-collapse [Inherited, NewStyleBuilder]
    6969border-color
    7070border-image
     
    7676border-left
    7777border-left-color
    78 border-left-style
     78border-left-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
    7979border-left-width
    8080border-radius
    8181border-right
    8282border-right-color
    83 border-right-style
     83border-right-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
    8484border-right-width
    8585border-spacing [Inherited]
     
    9191border-top-right-radius
    9292-webkit-border-top-right-radius = border-top-right-radius
    93 border-top-style
     93border-top-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
    9494border-top-width
    9595border-width
    9696bottom
    9797box-shadow
    98 box-sizing
     98box-sizing [NewStyleBuilder]
    9999// -webkit-box-sizing worked in Safari 4 and earlier.
    100100-webkit-box-sizing = box-sizing
    101 caption-side [Inherited]
     101caption-side [Inherited, NewStyleBuilder]
    102102-epub-caption-side = caption-side
    103 clear
     103clear [NewStyleBuilder]
    104104clip
    105105-webkit-clip-path
     
    109109cursor [Inherited]
    110110#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
     113empty-cells [Inherited, NewStyleBuilder, TypeName=EEmptyCell]
     114float [NewStyleBuilder, TypeName=EFloat, NameForMethods=Floating]
    115115font-stretch
    116116height
    117117#if defined(ENABLE_CSS_IMAGE_ORIENTATION) && ENABLE_CSS_IMAGE_ORIENTATION
    118 image-orientation [Inherited]
    119 #endif
    120 image-rendering [Inherited]
     118image-orientation [Inherited, NewStyleBuilder, TypeName=ImageOrientationEnum]
     119#endif
     120image-rendering [Inherited, NewStyleBuilder]
    121121#if defined(ENABLE_CSS_IMAGE_RESOLUTION) && ENABLE_CSS_IMAGE_RESOLUTION
    122122image-resolution [Inherited]
     
    126126list-style [Inherited]
    127127list-style-image [Inherited]
    128 list-style-position [Inherited]
    129 list-style-type [Inherited]
     128list-style-position [Inherited, NewStyleBuilder]
     129list-style-type [Inherited, NewStyleBuilder]
    130130margin
    131131margin-bottom
     
    137137min-height
    138138min-width
    139 object-fit
    140 opacity
     139object-fit [NewStyleBuilder, TypeName=ObjectFit]
     140opacity [NewStyleBuilder, TypeName=float]
    141141// Honor -webkit-opacity as a synonym for opacity. This was the only syntax that worked in Safari 1.1,
    142142// and may be in use on some websites and widgets.
     
    149149outline-width
    150150overflow
    151 overflow-wrap
    152 overflow-x
    153 overflow-y
     151overflow-wrap [NewStyleBuilder]
     152overflow-x [NewStyleBuilder, TypeName=EOverflow]
     153overflow-y [NewStyleBuilder, TypeName=EOverflow]
    154154padding
    155155padding-bottom
     
    158158padding-top
    159159page
    160 page-break-after
    161 page-break-before
    162 page-break-inside
     160page-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
     161page-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
     162page-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
    163163paint-order
    164 pointer-events [Inherited]
    165 position
     164pointer-events [Inherited, NewStyleBuilder]
     165position [NewStyleBuilder]
    166166quotes [Inherited]
    167167resize [Inherited]
     
    169169size
    170170src
    171 speak [Inherited]
    172 table-layout
    173 tab-size [Inherited]
     171speak [Inherited, NewStyleBuilder]
     172table-layout [NewStyleBuilder]
     173tab-size [Inherited, NewStyleBuilder, TypeName=unsigned]
    174174text-align [Inherited]
    175175text-decoration
     
    180180text-line-through-style
    181181text-line-through-width
    182 text-overflow
     182text-overflow [NewStyleBuilder, TypeName=TextOverflow]
    183183text-overline
    184184text-overline-color
     
    187187text-overline-width
    188188text-shadow [Inherited]
    189 text-transform [Inherited]
     189text-transform [Inherited, NewStyleBuilder]
    190190-epub-text-transform = text-transform
    191191text-underline
     
    201201transition-timing-function
    202202
    203 unicode-bidi
     203unicode-bidi [NewStyleBuilder]
    204204unicode-range
    205205vertical-align
    206 visibility [Inherited]
    207 white-space [Inherited]
     206visibility [Inherited, NewStyleBuilder]
     207white-space [Inherited, NewStyleBuilder]
    208208widows [Inherited]
    209209width
    210 word-break [Inherited]
     210word-break [Inherited, NewStyleBuilder]
    211211-epub-word-break = word-break
    212212word-spacing [Inherited]
    213 word-wrap [Inherited]
     213word-wrap [Inherited, NewStyleBuilder=EOverflowWrap, NameForMethods=OverflowWrap]
    214214z-index
    215215-webkit-alt
     
    223223-webkit-animation-play-state
    224224-webkit-animation-timing-function
    225 -webkit-appearance
     225-webkit-appearance [NewStyleBuilder, TypeName=ControlPart]
    226226-webkit-aspect-ratio [Inherited]
    227 -webkit-backface-visibility
     227-webkit-backface-visibility [NewStyleBuilder]
    228228-webkit-background-clip
    229229-webkit-background-composite
     
    245245-webkit-border-end-style
    246246-webkit-border-end-width
    247 -webkit-border-fit
     247-webkit-border-fit [NewStyleBuilder]
    248248-webkit-border-horizontal-spacing [Inherited]
    249249-webkit-border-image
     
    257257-webkit-border-start-width
    258258-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]
    267267-webkit-box-reflect
    268268// -webkit-box-shadow differs from box-shadow in its treatement of blur radii > 8px.
     
    270270// w_r > 8px, b_r = 8 + 4 * sqrt((w_r - 8) / 2).
    271271-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]
    277277-webkit-column-count
    278 -webkit-column-fill
     278-webkit-column-fill [NewStyleBuilder, TypeName=ColumnFill]
    279279-webkit-column-gap
    280 -webkit-column-progression
     280-webkit-column-progression [NewStyleBuilder, TypeName=ColumnProgression]
    281281-webkit-column-rule
    282282-webkit-column-rule-color
    283 -webkit-column-rule-style
     283-webkit-column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
    284284-webkit-column-rule-width
    285 -webkit-column-span
     285-webkit-column-span [NewStyleBuilder, TypeName=ColumnSpan]
    286286-webkit-column-width
    287287-webkit-columns
    288288#if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
    289 -webkit-box-decoration-break
     289-webkit-box-decoration-break [NewStyleBuilder]
    290290#endif
    291291#if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING
    292 mix-blend-mode
    293 isolation
     292mix-blend-mode [NewStyleBuilder, TypeName=BlendMode, NameForMethods=BlendMode]
     293isolation [NewStyleBuilder, TypeName=Isolation]
    294294#endif
    295295-webkit-filter
    296 align-content
     296align-content [NewStyleBuilder]
    297297-webkit-align-content = align-content
    298 align-items
     298align-items [NewStyleBuilder]
    299299-webkit-align-items = align-items
    300 align-self
     300align-self [NewStyleBuilder, TypeName=EAlignItems]
    301301-webkit-align-self = align-self
    302302flex
     
    304304flex-basis
    305305-webkit-flex-basis = flex-basis
    306 flex-direction
     306flex-direction [NewStyleBuilder]
    307307-webkit-flex-direction = flex-direction
    308308flex-flow
    309309-webkit-flex-flow = flex-flow
    310 flex-grow
     310flex-grow [NewStyleBuilder, TypeName=float]
    311311-webkit-flex-grow = flex-grow
    312 flex-shrink
     312flex-shrink [NewStyleBuilder, TypeName=float]
    313313-webkit-flex-shrink = flex-shrink
    314 flex-wrap
     314flex-wrap [NewStyleBuilder]
    315315-webkit-flex-wrap = flex-wrap
    316 justify-content
     316justify-content [NewStyleBuilder]
    317317-webkit-justify-content = justify-content
    318318-webkit-justify-self
     
    339339-webkit-hyphenate-limit-before [Inherited]
    340340-webkit-hyphenate-limit-lines [Inherited]
    341 -webkit-hyphens [Inherited]
     341-webkit-hyphens [Inherited, NewStyleBuilder, TypeName=Hyphens]
    342342-epub-hyphens = -webkit-hyphens
    343343-webkit-initial-letter
    344344-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]
    348348-webkit-line-grid [Inherited]
    349 -webkit-line-snap [Inherited]
     349-webkit-line-snap [Inherited, NewStyleBuilder, TypeName=LineSnap]
    350350-webkit-logical-width
    351351-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]
    356356-webkit-margin-collapse
    357357-webkit-margin-after
     
    360360-webkit-margin-start
    361361-webkit-marquee
    362 -webkit-marquee-direction
     362-webkit-marquee-direction [NewStyleBuilder]
    363363-webkit-marquee-increment
    364364-webkit-marquee-repetition
    365365-webkit-marquee-speed
    366 -webkit-marquee-style
     366-webkit-marquee-style [NewStyleBuilder, TypeName=EMarqueeBehavior, NameForMethods=MarqueeBehavior]
    367367-webkit-mask
    368368-webkit-mask-box-image
     
    388388-webkit-min-logical-width
    389389-webkit-min-logical-height
    390 -webkit-nbsp-mode [Inherited]
    391 order
     390-webkit-nbsp-mode [Inherited, NewStyleBuilder, TypeName=ENBSPMode, Setter=setNBSPMode, Initial=initialNBSPMode]
     391order [NewStyleBuilder, TypeName=int]
    392392-webkit-order = order
    393393-webkit-padding-after
     
    399399-webkit-perspective-origin-x
    400400-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]
    403403#if defined(ENABLE_CSS_SCROLL_SNAP)
    404404-webkit-scroll-snap-points-x
     
    408408-webkit-scroll-snap-coordinate
    409409#endif
    410 -webkit-text-combine [Inherited]
     410-webkit-text-combine [Inherited, NewStyleBuilder, TypeName=TextCombine]
    411411-epub-text-combine = -webkit-text-combine
    412412#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]
    415415#endif
    416416-webkit-text-decoration
    417417-webkit-text-decoration-line
    418 -webkit-text-decoration-style
     418-webkit-text-decoration-style [NewStyleBuilder, TypeName=TextDecorationStyle]
    419419-webkit-text-decoration-color
    420420-webkit-text-decoration-skip [Inherited]
     
    433433text-emphasis-style = -webkit-text-emphasis-style
    434434-webkit-text-fill-color [Inherited]
    435 -webkit-text-security [Inherited]
     435-webkit-text-security [Inherited, NewStyleBuilder]
    436436-webkit-text-stroke [Inherited]
    437437-webkit-text-stroke-color [Inherited]
     
    442442-webkit-transform-origin-y
    443443-webkit-transform-origin-z
    444 -webkit-transform-style
     444-webkit-transform-style [NewStyleBuilder, TypeName=ETransformStyle3D, NameForMethods=TransformStyle3D]
    445445-webkit-transition
    446446-webkit-transition-delay
     
    448448-webkit-transition-property
    449449-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]
    453453#if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
    454454-webkit-flow-into
    455455-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]
    460460#endif
    461461#if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
  • trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp

    r175043 r175052  
    19761976    static PropertyHandler createHandler()
    19771977    {
    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();
    19791979        return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
    19801980    }
     
    21002100    static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
    21012101    {
    2102         styleResolver->style()->setDisplay(RenderStyle::NonInheritedFlags::initialDisplay());
     2102        styleResolver->style()->setDisplay(RenderStyle::initialDisplay());
    21032103    }
    21042104
     
    23592359    setPropertyHandler(CSSPropertyBorderBottomLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomLeftRadius, &RenderStyle::setBorderBottomLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
    23602360    setPropertyHandler(CSSPropertyBorderBottomRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomRightRadius, &RenderStyle::setBorderBottomRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
    2361     setPropertyHandler(CSSPropertyBorderBottomStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderBottomStyle, EBorderStyle, &RenderStyle::setBorderBottomStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
    23622361    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());
    23642362    setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifier<BorderImage, Outset>::createHandler());
    23652363    setPropertyHandler(CSSPropertyBorderImageRepeat, ApplyPropertyBorderImageModifier<BorderImage, Repeat>::createHandler());
     
    23682366    setPropertyHandler(CSSPropertyBorderImageWidth, ApplyPropertyBorderImageModifier<BorderImage, Width>::createHandler());
    23692367    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());
    23712368    setPropertyHandler(CSSPropertyBorderLeftWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
    23722369    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());
    23742370    setPropertyHandler(CSSPropertyBorderRightWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
    23752371    setPropertyHandler(CSSPropertyBorderTopColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderTopColor, &RenderStyle::setBorderTopColor, &RenderStyle::setVisitedLinkBorderTopColor, &RenderStyle::color>::createHandler());
    23762372    setPropertyHandler(CSSPropertyBorderTopLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
    23772373    setPropertyHandler(CSSPropertyBorderTopRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
    2378     setPropertyHandler(CSSPropertyBorderTopStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderTopStyle, EBorderStyle, &RenderStyle::setBorderTopStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
    23792374    setPropertyHandler(CSSPropertyBorderTopWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
    23802375    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());
    23842376    setPropertyHandler(CSSPropertyClip, ApplyPropertyClip::createHandler());
    23852377    setPropertyHandler(CSSPropertyColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::color, &RenderStyle::setColor, &RenderStyle::setVisitedLinkColor, &RenderStyle::invalidColor, RenderStyle::initialColor>::createHandler());
     
    23892381    setPropertyHandler(CSSPropertyDirection, ApplyPropertyDirection<&RenderStyle::direction, &RenderStyle::setDirection, RenderStyle::initialDirection>::createHandler());
    23902382    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());
    23932383    setPropertyHandler(CSSPropertyFontFamily, ApplyPropertyFontFamily::createHandler());
    23942384    setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler());
     
    23972387    setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHandler());
    23982388    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 #endif
    2402     setPropertyHandler(CSSPropertyImageRendering, ApplyPropertyDefault<EImageRendering, &RenderStyle::imageRendering, EImageRendering, &RenderStyle::setImageRendering, EImageRendering, &RenderStyle::initialImageRendering>::createHandler());
    24032389#if ENABLE(CSS_IMAGE_RESOLUTION)
    24042390    setPropertyHandler(CSSPropertyImageResolution, ApplyPropertyImageResolution::createHandler());
     
    24132399#endif
    24142400    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());
    24172401    setPropertyHandler(CSSPropertyMarginBottom, ApplyPropertyLength<&RenderStyle::marginBottom, &RenderStyle::setMarginBottom, &RenderStyle::initialMargin, AutoEnabled>::createHandler());
    24182402    setPropertyHandler(CSSPropertyMarginLeft, ApplyPropertyLength<&RenderStyle::marginLeft, &RenderStyle::setMarginLeft, &RenderStyle::initialMargin, AutoEnabled>::createHandler());
     
    24232407    setPropertyHandler(CSSPropertyMinHeight, ApplyPropertyLength<&RenderStyle::minHeight, &RenderStyle::setMinHeight, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled>::createHandler());
    24242408    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());
    24272409    setPropertyHandler(CSSPropertyOrphans, ApplyPropertyAuto<short, &RenderStyle::orphans, &RenderStyle::setOrphans, &RenderStyle::hasAutoOrphans, &RenderStyle::setHasAutoOrphans>::createHandler());
    24282410    setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());
     
    24302412    setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::createHandler());
    24312413    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());
    24352414    setPropertyHandler(CSSPropertyPaddingBottom, ApplyPropertyLength<&RenderStyle::paddingBottom, &RenderStyle::setPaddingBottom, &RenderStyle::initialPadding>::createHandler());
    24362415    setPropertyHandler(CSSPropertyPaddingLeft, ApplyPropertyLength<&RenderStyle::paddingLeft, &RenderStyle::setPaddingLeft, &RenderStyle::initialPadding>::createHandler());
    24372416    setPropertyHandler(CSSPropertyPaddingRight, ApplyPropertyLength<&RenderStyle::paddingRight, &RenderStyle::setPaddingRight, &RenderStyle::initialPadding>::createHandler());
    24382417    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());
    24442418    setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
    24452419    setPropertyHandler(CSSPropertyRight, ApplyPropertyLength<&RenderStyle::right, &RenderStyle::setRight, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
    24462420    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());
    24502421    setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
    24512422    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_TEXT
    24562423    setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler());
    2457     setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler());
    24582424    setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
    24592425    setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler());
    24602426    setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler());
    24612427    setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyTextIndent::createHandler());
    2462     setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());
    24632428    setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
    2464     setPropertyHandler(CSSPropertyTextTransform, ApplyPropertyDefault<ETextTransform, &RenderStyle::textTransform, ETextTransform, &RenderStyle::setTextTransform, ETextTransform, &RenderStyle::initialTextTransform>::createHandler());
    24652429    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());
    24672430    setPropertyHandler(CSSPropertyVerticalAlign, ApplyPropertyVerticalAlign::createHandler());
    2468     setPropertyHandler(CSSPropertyVisibility, ApplyPropertyDefault<EVisibility, &RenderStyle::visibility, EVisibility, &RenderStyle::setVisibility, EVisibility, &RenderStyle::initialVisibility>::createHandler());
    24692431    setPropertyHandler(CSSPropertyWebkitAnimationDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
    24702432    setPropertyHandler(CSSPropertyWebkitAnimationDirection, ApplyPropertyAnimation<Animation::AnimationDirection, &Animation::direction, &Animation::setDirection, &Animation::isDirectionSet, &Animation::clearDirection, &Animation::initialAnimationDirection, &CSSToStyleMap::mapAnimationDirection, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
     
    24752437    setPropertyHandler(CSSPropertyWebkitAnimationPlayState, ApplyPropertyAnimation<EAnimPlayState, &Animation::playState, &Animation::setPlayState, &Animation::isPlayStateSet, &Animation::clearPlayState, &Animation::initialAnimationPlayState, &CSSToStyleMap::mapAnimationPlayState, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
    24762438    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());
    24782439    setPropertyHandler(CSSPropertyWebkitAspectRatio, ApplyPropertyAspectRatio::createHandler());
    2479     setPropertyHandler(CSSPropertyWebkitBackfaceVisibility, ApplyPropertyDefault<EBackfaceVisibility, &RenderStyle::backfaceVisibility, EBackfaceVisibility, &RenderStyle::setBackfaceVisibility, EBackfaceVisibility, &RenderStyle::initialBackfaceVisibility>::createHandler());
    24802440    setPropertyHandler(CSSPropertyWebkitBackgroundClip, CSSPropertyBackgroundClip);
    24812441    setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
    24822442    setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
    24832443    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 #endif
    2488     setPropertyHandler(CSSPropertyWebkitBorderFit, ApplyPropertyDefault<EBorderFit, &RenderStyle::borderFit, EBorderFit, &RenderStyle::setBorderFit, EBorderFit, &RenderStyle::initialBorderFit>::createHandler());
    24892444    setPropertyHandler(CSSPropertyWebkitBorderHorizontalSpacing, ApplyPropertyComputeLength<short, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing, &RenderStyle::initialHorizontalBorderSpacing>::createHandler());
    24902445    setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImage<BorderImage, CSSPropertyWebkitBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage>::createHandler());
    24912446    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 #endif
    2496     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());
    25082447    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());
    25102448    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());
    25122449    setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
    25132450    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());
    25162451    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 #endif
    2520     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());
    25232452    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());
    25302453#if ENABLE(CSS_REGIONS)
    25312454    setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
     
    25392462    setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitBefore, &RenderStyle::setHyphenationLimitBefore, &RenderStyle::initialHyphenationLimitBefore>::createHandler());
    25402463    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());
    25452464    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());
    25522465    setPropertyHandler(CSSPropertyWebkitMarqueeIncrement, ApplyPropertyMarqueeIncrement::createHandler());
    25532466    setPropertyHandler(CSSPropertyWebkitMarqueeRepetition, ApplyPropertyMarqueeRepetition::createHandler());
    25542467    setPropertyHandler(CSSPropertyWebkitMarqueeSpeed, ApplyPropertyMarqueeSpeed::createHandler());
    2555     setPropertyHandler(CSSPropertyWebkitMarqueeStyle, ApplyPropertyDefault<EMarqueeBehavior, &RenderStyle::marqueeBehavior, EMarqueeBehavior, &RenderStyle::setMarqueeBehavior, EMarqueeBehavior, &RenderStyle::initialMarqueeBehavior>::createHandler());
    25562468    setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImage<BorderMask, CSSPropertyWebkitMaskBoxImage, &RenderStyle::maskBoxImage, &RenderStyle::setMaskBoxImage>::createHandler());
    25572469    setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifier<BorderMask, Outset>::createHandler());
     
    25702482    setPropertyHandler(CSSPropertyWebkitMaskSize, ApplyPropertyFillLayer<FillSize, CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSToStyleMap::mapFillSize>::createHandler());
    25712483    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());
    25732484    setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler());
    25742485    setPropertyHandler(CSSPropertyWebkitPerspectiveOriginX, ApplyPropertyLength<&RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX, &RenderStyle::initialPerspectiveOriginX>::createHandler());
    25752486    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 #endif
    2583     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());
    25862487    setPropertyHandler(CSSPropertyWebkitTextEmphasisColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor, &RenderStyle::color>::createHandler());
    25872488    setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, ApplyPropertyTextEmphasisPosition::createHandler());
    25882489    setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler());
    25892490    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());
    25912491    setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler());
    25922492    setPropertyHandler(CSSPropertyWebkitTransformOriginX, ApplyPropertyLength<&RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX, &RenderStyle::initialTransformOriginX>::createHandler());
    25932493    setPropertyHandler(CSSPropertyWebkitTransformOriginY, ApplyPropertyLength<&RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY, &RenderStyle::initialTransformOriginY>::createHandler());
    25942494    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());
    25962495    setPropertyHandler(CSSPropertyWebkitTransitionDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
    25972496    setPropertyHandler(CSSPropertyWebkitTransitionDuration, ApplyPropertyAnimation<double, &Animation::duration, &Animation::setDuration, &Animation::isDurationSet, &Animation::clearDuration, &Animation::initialAnimationDuration, &CSSToStyleMap::mapAnimationDuration, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
    25982497    setPropertyHandler(CSSPropertyWebkitTransitionProperty, ApplyPropertyAnimation<CSSPropertyID, &Animation::property, &Animation::setProperty, &Animation::isPropertySet, &Animation::clearProperty, &Animation::initialAnimationProperty, &CSSToStyleMap::mapAnimationProperty, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
    25992498    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());
    26032499    setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
    26042500#if ENABLE(CSS_SHAPES)
     
    26072503    setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
    26082504#endif
    2609     setPropertyHandler(CSSPropertyWhiteSpace, ApplyPropertyDefault<EWhiteSpace, &RenderStyle::whiteSpace, EWhiteSpace, &RenderStyle::setWhiteSpace, EWhiteSpace, &RenderStyle::initialWhiteSpace>::createHandler());
    26102505    setPropertyHandler(CSSPropertyWidows, ApplyPropertyAuto<short, &RenderStyle::widows, &RenderStyle::setWidows, &RenderStyle::hasAutoWidows, &RenderStyle::setHasAutoWidows>::createHandler());
    26112506    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());
    26132507    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 
    26182508    setPropertyHandler(CSSPropertyCx, ApplyPropertyLength<&RenderStyle::cx, &RenderStyle::setCx, &RenderStyle::initialZeroLength>::createHandler());
    26192509    setPropertyHandler(CSSPropertyCy, ApplyPropertyLength<&RenderStyle::cy, &RenderStyle::setCy, &RenderStyle::initialZeroLength>::createHandler());
  • trunk/Source/WebCore/css/StyleResolver.cpp

    r174836 r175052  
    99 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
    1010 * 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.
    1212 * Copyright (C) 2014 Igalia S.L.
    1313 *
     
    114114#include "ShadowData.h"
    115115#include "ShadowRoot.h"
     116#include "StyleBuilder.h"
    116117#include "StyleCachedImage.h"
    117118#include "StyleFontSizeFunctions.h"
     
    13591360        // Only the root <svg> element in an SVG document fragment tree honors css position
    13601361        if (!(e->hasTagName(SVGNames::svgTag) && e->parentNode() && !e->parentNode()->isSVGElement()))
    1361             style.setPosition(RenderStyle::NonInheritedFlags::initialPosition());
     1362            style.setPosition(RenderStyle::initialPosition());
    13621363
    13631364        // RenderSVGRoot handles zooming for the whole SVG subtree, so foreignObject content should
     
    21272128        return;
    21282129    }
     2130
     2131    // Use the new StyleBuilder.
     2132    if (StyleBuilder::applyProperty(id, *this, value, isInitial, isInherit))
     2133        return;
    21292134
    21302135    CSSPrimitiveValue* primitiveValue = is<CSSPrimitiveValue>(*value) ? downcast<CSSPrimitiveValue>(value) : nullptr;
     
    29472952    case CSSPropertyTransitionTimingFunction:
    29482953        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.
    29502955    case CSSPropertyBackgroundAttachment:
    29512956    case CSSPropertyBackgroundClip:
  • trunk/Source/WebCore/css/makeprop.pl

    r162907 r175052  
    44#
    55#   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.
    77#   Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
    88#   Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged
     9#   Copyright (C) 2013 Google Inc. All rights reserved.
    910#
    1011#   This library is free software; you can redistribute it and/or
     
    4142my @names = ();
    4243my %nameIsInherited;
     44# FIXME: Eventually all properties should use the new style builder and the following
     45# variable should go away.
     46my %propertiesUsingNewStyleBuilder;
     47my %newStyleBuilderOptions = (
     48  Getter => 1,
     49  Initial => 1,
     50  NameForMethods => 1,
     51  Setter => 1,
     52  TypeName => 1,
     53);
    4354my %nameToId;
    4455my @aliases = ();
     
    6879    $nameIsInherited{$_} = 0;
    6980    foreach my $option (@options) {
    70       if ($option eq "Inherited") {
     81      my ($optionName, $optionValue) = split(/=/, $option);
     82      if ($optionName eq "Inherited") {
    7183        $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.";
    7293      }
    7394    }
     
    303324close HEADER;
    304325
     326#
     327# StyleBuilder.cpp generator.
     328#
     329
     330foreach 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
     354open STYLEBUILDER, ">StyleBuilder.cpp" || die "Could not open StyleBuilder.cpp for writing";
     355print 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
     366namespace WebCore {
     367
     368class StyleBuilderFunctions {
     369public:
     370EOF
     371
     372foreach 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
     391print STYLEBUILDER << "EOF";
     392};
     393
     394bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver& styleResolver, CSSValue* value, bool isInitial, bool isInherit)
     395{
     396    switch (property) {
     397EOF
     398
     399foreach 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
     413print STYLEBUILDER << "EOF";
     414        default:
     415            return false;
     416    };
     417}
     418
     419} // namespace WebCore
     420EOF
     421
     422close STYLEBUILDER;
     423
    305424my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
    306425system("\"$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  
    265265        bool isLink() const { return getBoolean(isLinkOffset); }
    266266        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; }
    278267
    279268        static ptrdiff_t flagsMemoryOffset() { return OBJECT_OFFSETOF(NonInheritedFlags, m_flags); }
     
    17851774   
    17861775    // 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; }
    17871786    static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
    17881787    static EBorderStyle initialBorderStyle() { return BNONE; }
  • trunk/Source/WebCore/rendering/style/StyleMultiColData.cpp

    r166465 r175052  
    3636    , m_fill(RenderStyle::initialColumnFill())
    3737    , 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())
    4141    , m_axis(RenderStyle::initialColumnAxis())
    4242    , m_progression(RenderStyle::initialColumnProgression())
  • trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp

    r173659 r175052  
    7373#endif
    7474    , 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())
    7878    , m_pageSizeType(PAGE_SIZE_AUTO)
    7979    , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
Note: See TracChangeset for help on using the changeset viewer.