<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[175052] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/175052">175052</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-22 09:56:36 -0700 (Wed, 22 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleMultiColDatacpp">trunk/Source/WebCore/rendering/style/StyleMultiColData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp">trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssStyleBuilderh">trunk/Source/WebCore/css/StyleBuilder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -3244,7 +3244,7 @@
</span><span class="cx">
</span><span class="cx"> # Generate CSS property names
</span><span class="cx"> add_custom_command(
</span><del>- 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
</del><ins>+ 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
</ins><span class="cx"> MAIN_DEPENDENCY ${WEBCORE_DIR}/css/makeprop.pl
</span><span class="cx"> DEPENDS ${WebCore_CSS_PROPERTY_NAMES}
</span><span class="cx"> WORKING_DIRECTORY ${DERIVED_SOURCES_WEBCORE_DIR}
</span><span class="lines">@@ -3252,6 +3252,7 @@
</span><span class="cx"> COMMAND ${PERL_EXECUTABLE} -I${WEBCORE_DIR}/bindings/scripts ${WEBCORE_DIR}/css/makeprop.pl --defines "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}" --preprocessor "${CODE_GENERATOR_PREPROCESSOR}"
</span><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSPropertyNames.cpp)
</span><ins>+list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/StyleBuilder.cpp)
</ins><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/CSSParser.cpp CSSValueKeywords.h)
</span><span class="cx"> ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp CSSPropertyNames.h)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/ChangeLog 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -1,3 +1,76 @@
</span><ins>+2014-10-22 Chris Dumez <cdumez@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2014-10-22 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Fix GStreamer debug build after r175050.
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/DerivedSources.make 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/DerivedSources.make 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -784,6 +784,7 @@
</span><span class="cx"> SVGNames.cpp \
</span><span class="cx"> SelectorPseudoClassAndCompatibilityElementMap.cpp \
</span><span class="cx"> SelectorPseudoElementTypeMap.cpp \
</span><ins>+ StyleBuilder.cpp \
</ins><span class="cx"> UserAgentStyleSheets.h \
</span><span class="cx"> WebKitFontFamilyNames.cpp \
</span><span class="cx"> WebKitFontFamilyNames.h \
</span><span class="lines">@@ -820,7 +821,7 @@
</span><span class="cx"> WEBCORE_CSS_PROPERTY_NAMES := $(WEBCORE_CSS_PROPERTY_NAMES) $(WebCore)/css/SVGCSSPropertyNames.in
</span><span class="cx"> WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
</span><span class="cx">
</span><del>-CSSPropertyNames.h : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
</del><ins>+CSSPropertyNames.h StyleBuilder.cpp : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
</ins><span class="cx"> $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSPropertyNames.in
</span><span class="cx"> $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_DEFINES)"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -285,6 +285,7 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTTPHeaderNames.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoClassAndCompatibilityElementMap.cpp" />
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoElementTypeMap.cpp" />
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StyleBuilder.cpp" />
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSANGLEInstancedArrays.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -5194,6 +5194,9 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\SelectorPseudoElementTypeMap.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\StyleBuilder.cpp">
+ <Filter>DerivedSources</Filter>
+ </ClCompile>
</ins><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\EventFactory.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -15440,4 +15443,4 @@
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </MASM>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -2482,6 +2482,8 @@
</span><span class="cx"> 832B843619D8E57400B26055 /* SVGAnimateElementBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 832B843519D8E57400B26055 /* SVGAnimateElementBase.cpp */; };
</span><span class="cx"> 836FBCEA178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */; };
</span><span class="cx"> 836FBCEC178C117F00B21A15 /* SVGAnimatedProperty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */; };
</span><ins>+ 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */; };
+ 8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */; };
</ins><span class="cx"> 83C1D425178D5AB400141E68 /* SVGPathSegArcAbs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D413178D5AB400141E68 /* SVGPathSegArcAbs.h */; };
</span><span class="cx"> 83C1D426178D5AB400141E68 /* SVGPathSegArcRel.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D414178D5AB400141E68 /* SVGPathSegArcRel.h */; };
</span><span class="cx"> 83C1D427178D5AB400141E68 /* SVGPathSegCurvetoCubicAbs.h in Headers */ = {isa = PBXBuildFile; fileRef = 83C1D415178D5AB400141E68 /* SVGPathSegCurvetoCubicAbs.h */; };
</span><span class="lines">@@ -9640,6 +9642,8 @@
</span><span class="cx"> 832B843519D8E57400B26055 /* SVGAnimateElementBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimateElementBase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 836FBCE9178C113200B21A15 /* SVGAnimatedTypeAnimator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedTypeAnimator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 836FBCEB178C117F00B21A15 /* SVGAnimatedProperty.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGAnimatedProperty.cpp; sourceTree = "<group>"; };
</span><ins>+ 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleBuilder.h; sourceTree = "<group>"; };
+ 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StyleBuilder.cpp; path = StyleBuilder.cpp; sourceTree = "<group>"; };
</ins><span class="cx"> 83C1D413178D5AB400141E68 /* SVGPathSegArcAbs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegArcAbs.h; sourceTree = "<group>"; };
</span><span class="cx"> 83C1D414178D5AB400141E68 /* SVGPathSegArcRel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegArcRel.h; sourceTree = "<group>"; };
</span><span class="cx"> 83C1D415178D5AB400141E68 /* SVGPathSegCurvetoCubicAbs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGPathSegCurvetoCubicAbs.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16251,6 +16255,7 @@
</span><span class="cx"> B562DB5F17D3CD560010AF96 /* SVGElementTypeHelpers.h */,
</span><span class="cx"> 656581E809D1508D000E61D7 /* SVGNames.cpp */,
</span><span class="cx"> 656581E909D1508D000E61D7 /* SVGNames.h */,
</span><ins>+ 8386A96E19F61E4F00E1EC4A /* StyleBuilder.cpp */,
</ins><span class="cx"> CDAB6D2F17C9259500C60B34 /* UserAgentScripts.h */,
</span><span class="cx"> CDAB6D3017C9259500C60B34 /* UserAgentScriptsData.cpp */,
</span><span class="cx"> 656581AE09D14EE6000E61D7 /* UserAgentStyleSheets.h */,
</span><span class="lines">@@ -22206,6 +22211,7 @@
</span><span class="cx"> 3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */,
</span><span class="cx"> 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
</span><span class="cx"> 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
</span><ins>+ 8386A96C19F61B2E00E1EC4A /* StyleBuilder.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = css;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -23363,6 +23369,7 @@
</span><span class="cx"> A172182619DE183F00464D17 /* _UIHighlightViewSPI.h in Headers */,
</span><span class="cx"> CD5596921475B678001D0BD0 /* AudioFileReaderIOS.h in Headers */,
</span><span class="cx"> FD3160BF12B0272A00C1A359 /* AudioFileReaderMac.h in Headers */,
</span><ins>+ 8386A96D19F61B2E00E1EC4A /* StyleBuilder.h in Headers */,
</ins><span class="cx"> FDE2D55B159E66EB00DCCCF8 /* AudioIOCallback.h in Headers */,
</span><span class="cx"> FD31601012B0267600C1A359 /* AudioListener.h in Headers */,
</span><span class="cx"> FD31601312B0267600C1A359 /* AudioNode.h in Headers */,
</span><span class="lines">@@ -27396,6 +27403,7 @@
</span><span class="cx"> CD2F4A2718D8A3490063746D /* AudioHardwareListenerMac.cpp in Sources */,
</span><span class="cx"> 4167EBF5102962BA003D252A /* DefaultSharedWorkerRepository.cpp in Sources */,
</span><span class="cx"> 1AF4CEE918BC350100BC2D34 /* DefaultVisitedLinkStore.cpp in Sources */,
</span><ins>+ 8386A97019F61E4F00E1EC4A /* StyleBuilder.cpp in Sources */,
</ins><span class="cx"> FD31602B12B0267600C1A359 /* DelayDSPKernel.cpp in Sources */,
</span><span class="cx"> FD31602D12B0267600C1A359 /* DelayNode.cpp in Sources */,
</span><span class="cx"> FD31603012B0267600C1A359 /* DelayProcessor.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> line-height [Inherited]
</span><span class="cx">
</span><span class="cx"> // Keep this in between the highest priority props and the lower ones.
</span><del>--webkit-ruby-position [Inherited]
</del><ins>+-webkit-ruby-position [Inherited, NewStyleBuilder, TypeName=RubyPosition]
</ins><span class="cx">
</span><span class="cx"> // The remaining properties are listed in alphabetical order
</span><span class="cx"> background
</span><span class="lines">@@ -63,9 +63,9 @@
</span><span class="cx"> -webkit-border-bottom-left-radius = border-bottom-left-radius
</span><span class="cx"> border-bottom-right-radius
</span><span class="cx"> -webkit-border-bottom-right-radius = border-bottom-right-radius
</span><del>-border-bottom-style
</del><ins>+border-bottom-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</ins><span class="cx"> border-bottom-width
</span><del>-border-collapse [Inherited]
</del><ins>+border-collapse [Inherited, NewStyleBuilder]
</ins><span class="cx"> border-color
</span><span class="cx"> border-image
</span><span class="cx"> border-image-outset
</span><span class="lines">@@ -75,12 +75,12 @@
</span><span class="cx"> border-image-width
</span><span class="cx"> border-left
</span><span class="cx"> border-left-color
</span><del>-border-left-style
</del><ins>+border-left-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</ins><span class="cx"> border-left-width
</span><span class="cx"> border-radius
</span><span class="cx"> border-right
</span><span class="cx"> border-right-color
</span><del>-border-right-style
</del><ins>+border-right-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</ins><span class="cx"> border-right-width
</span><span class="cx"> border-spacing [Inherited]
</span><span class="cx"> border-style
</span><span class="lines">@@ -90,17 +90,17 @@
</span><span class="cx"> -webkit-border-top-left-radius = border-top-left-radius
</span><span class="cx"> border-top-right-radius
</span><span class="cx"> -webkit-border-top-right-radius = border-top-right-radius
</span><del>-border-top-style
</del><ins>+border-top-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</ins><span class="cx"> border-top-width
</span><span class="cx"> border-width
</span><span class="cx"> bottom
</span><span class="cx"> box-shadow
</span><del>-box-sizing
</del><ins>+box-sizing [NewStyleBuilder]
</ins><span class="cx"> // -webkit-box-sizing worked in Safari 4 and earlier.
</span><span class="cx"> -webkit-box-sizing = box-sizing
</span><del>-caption-side [Inherited]
</del><ins>+caption-side [Inherited, NewStyleBuilder]
</ins><span class="cx"> -epub-caption-side = caption-side
</span><del>-clear
</del><ins>+clear [NewStyleBuilder]
</ins><span class="cx"> clip
</span><span class="cx"> -webkit-clip-path
</span><span class="cx"> content
</span><span class="lines">@@ -108,16 +108,16 @@
</span><span class="cx"> counter-reset
</span><span class="cx"> cursor [Inherited]
</span><span class="cx"> #if defined(ENABLE_CURSOR_VISIBILITY) && ENABLE_CURSOR_VISIBILITY
</span><del>--webkit-cursor-visibility [Inherited]
</del><ins>+-webkit-cursor-visibility [Inherited, NewStyleBuilder, TypeName=CursorVisibility]
</ins><span class="cx"> #endif
</span><del>-empty-cells [Inherited]
-float
</del><ins>+empty-cells [Inherited, NewStyleBuilder, TypeName=EEmptyCell]
+float [NewStyleBuilder, TypeName=EFloat, NameForMethods=Floating]
</ins><span class="cx"> font-stretch
</span><span class="cx"> height
</span><span class="cx"> #if defined(ENABLE_CSS_IMAGE_ORIENTATION) && ENABLE_CSS_IMAGE_ORIENTATION
</span><del>-image-orientation [Inherited]
</del><ins>+image-orientation [Inherited, NewStyleBuilder, TypeName=ImageOrientationEnum]
</ins><span class="cx"> #endif
</span><del>-image-rendering [Inherited]
</del><ins>+image-rendering [Inherited, NewStyleBuilder]
</ins><span class="cx"> #if defined(ENABLE_CSS_IMAGE_RESOLUTION) && ENABLE_CSS_IMAGE_RESOLUTION
</span><span class="cx"> image-resolution [Inherited]
</span><span class="cx"> #endif
</span><span class="lines">@@ -125,8 +125,8 @@
</span><span class="cx"> letter-spacing [Inherited]
</span><span class="cx"> list-style [Inherited]
</span><span class="cx"> list-style-image [Inherited]
</span><del>-list-style-position [Inherited]
-list-style-type [Inherited]
</del><ins>+list-style-position [Inherited, NewStyleBuilder]
+list-style-type [Inherited, NewStyleBuilder]
</ins><span class="cx"> margin
</span><span class="cx"> margin-bottom
</span><span class="cx"> margin-left
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx"> max-width
</span><span class="cx"> min-height
</span><span class="cx"> min-width
</span><del>-object-fit
-opacity
</del><ins>+object-fit [NewStyleBuilder, TypeName=ObjectFit]
+opacity [NewStyleBuilder, TypeName=float]
</ins><span class="cx"> // Honor -webkit-opacity as a synonym for opacity. This was the only syntax that worked in Safari 1.1,
</span><span class="cx"> // and may be in use on some websites and widgets.
</span><span class="cx"> -webkit-opacity = opacity
</span><span class="lines">@@ -148,29 +148,29 @@
</span><span class="cx"> outline-style
</span><span class="cx"> outline-width
</span><span class="cx"> overflow
</span><del>-overflow-wrap
-overflow-x
-overflow-y
</del><ins>+overflow-wrap [NewStyleBuilder]
+overflow-x [NewStyleBuilder, TypeName=EOverflow]
+overflow-y [NewStyleBuilder, TypeName=EOverflow]
</ins><span class="cx"> padding
</span><span class="cx"> padding-bottom
</span><span class="cx"> padding-left
</span><span class="cx"> padding-right
</span><span class="cx"> padding-top
</span><span class="cx"> page
</span><del>-page-break-after
-page-break-before
-page-break-inside
</del><ins>+page-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
+page-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
+page-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</ins><span class="cx"> paint-order
</span><del>-pointer-events [Inherited]
-position
</del><ins>+pointer-events [Inherited, NewStyleBuilder]
+position [NewStyleBuilder]
</ins><span class="cx"> quotes [Inherited]
</span><span class="cx"> resize [Inherited]
</span><span class="cx"> right
</span><span class="cx"> size
</span><span class="cx"> src
</span><del>-speak [Inherited]
-table-layout
-tab-size [Inherited]
</del><ins>+speak [Inherited, NewStyleBuilder]
+table-layout [NewStyleBuilder]
+tab-size [Inherited, NewStyleBuilder, TypeName=unsigned]
</ins><span class="cx"> text-align [Inherited]
</span><span class="cx"> text-decoration
</span><span class="cx"> text-indent [Inherited]
</span><span class="lines">@@ -179,14 +179,14 @@
</span><span class="cx"> text-line-through-mode
</span><span class="cx"> text-line-through-style
</span><span class="cx"> text-line-through-width
</span><del>-text-overflow
</del><ins>+text-overflow [NewStyleBuilder, TypeName=TextOverflow]
</ins><span class="cx"> text-overline
</span><span class="cx"> text-overline-color
</span><span class="cx"> text-overline-mode
</span><span class="cx"> text-overline-style
</span><span class="cx"> text-overline-width
</span><span class="cx"> text-shadow [Inherited]
</span><del>-text-transform [Inherited]
</del><ins>+text-transform [Inherited, NewStyleBuilder]
</ins><span class="cx"> -epub-text-transform = text-transform
</span><span class="cx"> text-underline
</span><span class="cx"> text-underline-color
</span><span class="lines">@@ -200,17 +200,17 @@
</span><span class="cx"> transition-property
</span><span class="cx"> transition-timing-function
</span><span class="cx">
</span><del>-unicode-bidi
</del><ins>+unicode-bidi [NewStyleBuilder]
</ins><span class="cx"> unicode-range
</span><span class="cx"> vertical-align
</span><del>-visibility [Inherited]
-white-space [Inherited]
</del><ins>+visibility [Inherited, NewStyleBuilder]
+white-space [Inherited, NewStyleBuilder]
</ins><span class="cx"> widows [Inherited]
</span><span class="cx"> width
</span><del>-word-break [Inherited]
</del><ins>+word-break [Inherited, NewStyleBuilder]
</ins><span class="cx"> -epub-word-break = word-break
</span><span class="cx"> word-spacing [Inherited]
</span><del>-word-wrap [Inherited]
</del><ins>+word-wrap [Inherited, NewStyleBuilder=EOverflowWrap, NameForMethods=OverflowWrap]
</ins><span class="cx"> z-index
</span><span class="cx"> -webkit-alt
</span><span class="cx"> -webkit-animation
</span><span class="lines">@@ -222,9 +222,9 @@
</span><span class="cx"> -webkit-animation-name
</span><span class="cx"> -webkit-animation-play-state
</span><span class="cx"> -webkit-animation-timing-function
</span><del>--webkit-appearance
</del><ins>+-webkit-appearance [NewStyleBuilder, TypeName=ControlPart]
</ins><span class="cx"> -webkit-aspect-ratio [Inherited]
</span><del>--webkit-backface-visibility
</del><ins>+-webkit-backface-visibility [NewStyleBuilder]
</ins><span class="cx"> -webkit-background-clip
</span><span class="cx"> -webkit-background-composite
</span><span class="cx"> -webkit-background-origin
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> -webkit-border-end-color
</span><span class="cx"> -webkit-border-end-style
</span><span class="cx"> -webkit-border-end-width
</span><del>--webkit-border-fit
</del><ins>+-webkit-border-fit [NewStyleBuilder]
</ins><span class="cx"> -webkit-border-horizontal-spacing [Inherited]
</span><span class="cx"> -webkit-border-image
</span><span class="cx"> // -webkit-border-radius differs from border-radius only in the interpretation of
</span><span class="lines">@@ -256,64 +256,64 @@
</span><span class="cx"> -webkit-border-start-style
</span><span class="cx"> -webkit-border-start-width
</span><span class="cx"> -webkit-border-vertical-spacing [Inherited]
</span><del>--webkit-box-align
--webkit-box-direction [Inherited]
--webkit-box-flex
--webkit-box-flex-group
--webkit-box-lines
--webkit-box-ordinal-group
--webkit-box-orient
--webkit-box-pack
</del><ins>+-webkit-box-align [NewStyleBuilder, TypeName=EBoxAlignment]
+-webkit-box-direction [Inherited, NewStyleBuilder]
+-webkit-box-flex [NewStyleBuilder, TypeName=float]
+-webkit-box-flex-group [NewStyleBuilder, TypeName=unsigned]
+-webkit-box-lines [NewStyleBuilder]
+-webkit-box-ordinal-group [NewStyleBuilder, TypeName=unsigned]
+-webkit-box-orient [NewStyleBuilder]
+-webkit-box-pack [NewStyleBuilder]
</ins><span class="cx"> -webkit-box-reflect
</span><span class="cx"> // -webkit-box-shadow differs from box-shadow in its treatement of blur radii > 8px.
</span><span class="cx"> // Let -webkit-box-shadow blur radius be w_r and box-shadow blur radius be b_r. For
</span><span class="cx"> // w_r > 8px, b_r = 8 + 4 * sqrt((w_r - 8) / 2).
</span><span class="cx"> -webkit-box-shadow
</span><del>--webkit-color-correction [Inherited]
--webkit-column-axis
--webkit-column-break-after
--webkit-column-break-before
--webkit-column-break-inside
</del><ins>+-webkit-color-correction [Inherited, NewStyleBuilder, TypeName=ColorSpace, NameForMethods=ColorSpace]
+-webkit-column-axis [NewStyleBuilder, TypeName=ColumnAxis]
+-webkit-column-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-column-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-column-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</ins><span class="cx"> -webkit-column-count
</span><del>--webkit-column-fill
</del><ins>+-webkit-column-fill [NewStyleBuilder, TypeName=ColumnFill]
</ins><span class="cx"> -webkit-column-gap
</span><del>--webkit-column-progression
</del><ins>+-webkit-column-progression [NewStyleBuilder, TypeName=ColumnProgression]
</ins><span class="cx"> -webkit-column-rule
</span><span class="cx"> -webkit-column-rule-color
</span><del>--webkit-column-rule-style
</del><ins>+-webkit-column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</ins><span class="cx"> -webkit-column-rule-width
</span><del>--webkit-column-span
</del><ins>+-webkit-column-span [NewStyleBuilder, TypeName=ColumnSpan]
</ins><span class="cx"> -webkit-column-width
</span><span class="cx"> -webkit-columns
</span><span class="cx"> #if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
</span><del>--webkit-box-decoration-break
</del><ins>+-webkit-box-decoration-break [NewStyleBuilder]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING
</span><del>-mix-blend-mode
-isolation
</del><ins>+mix-blend-mode [NewStyleBuilder, TypeName=BlendMode, NameForMethods=BlendMode]
+isolation [NewStyleBuilder, TypeName=Isolation]
</ins><span class="cx"> #endif
</span><span class="cx"> -webkit-filter
</span><del>-align-content
</del><ins>+align-content [NewStyleBuilder]
</ins><span class="cx"> -webkit-align-content = align-content
</span><del>-align-items
</del><ins>+align-items [NewStyleBuilder]
</ins><span class="cx"> -webkit-align-items = align-items
</span><del>-align-self
</del><ins>+align-self [NewStyleBuilder, TypeName=EAlignItems]
</ins><span class="cx"> -webkit-align-self = align-self
</span><span class="cx"> flex
</span><span class="cx"> -webkit-flex = flex
</span><span class="cx"> flex-basis
</span><span class="cx"> -webkit-flex-basis = flex-basis
</span><del>-flex-direction
</del><ins>+flex-direction [NewStyleBuilder]
</ins><span class="cx"> -webkit-flex-direction = flex-direction
</span><span class="cx"> flex-flow
</span><span class="cx"> -webkit-flex-flow = flex-flow
</span><del>-flex-grow
</del><ins>+flex-grow [NewStyleBuilder, TypeName=float]
</ins><span class="cx"> -webkit-flex-grow = flex-grow
</span><del>-flex-shrink
</del><ins>+flex-shrink [NewStyleBuilder, TypeName=float]
</ins><span class="cx"> -webkit-flex-shrink = flex-shrink
</span><del>-flex-wrap
</del><ins>+flex-wrap [NewStyleBuilder]
</ins><span class="cx"> -webkit-flex-wrap = flex-wrap
</span><del>-justify-content
</del><ins>+justify-content [NewStyleBuilder]
</ins><span class="cx"> -webkit-justify-content = justify-content
</span><span class="cx"> -webkit-justify-self
</span><span class="cx"> -webkit-font-size-delta
</span><span class="lines">@@ -338,32 +338,32 @@
</span><span class="cx"> -webkit-hyphenate-limit-after [Inherited]
</span><span class="cx"> -webkit-hyphenate-limit-before [Inherited]
</span><span class="cx"> -webkit-hyphenate-limit-lines [Inherited]
</span><del>--webkit-hyphens [Inherited]
</del><ins>+-webkit-hyphens [Inherited, NewStyleBuilder, TypeName=Hyphens]
</ins><span class="cx"> -epub-hyphens = -webkit-hyphens
</span><span class="cx"> -webkit-initial-letter
</span><span class="cx"> -webkit-line-box-contain [Inherited]
</span><del>--webkit-line-align [Inherited]
--webkit-line-break [Inherited]
--webkit-line-clamp
</del><ins>+-webkit-line-align [Inherited, NewStyleBuilder, TypeName=LineAlign]
+-webkit-line-break [Inherited, NewStyleBuilder, TypeName=LineBreak]
+-webkit-line-clamp [NewStyleBuilder, TypeName=LineClampValue]
</ins><span class="cx"> -webkit-line-grid [Inherited]
</span><del>--webkit-line-snap [Inherited]
</del><ins>+-webkit-line-snap [Inherited, NewStyleBuilder, TypeName=LineSnap]
</ins><span class="cx"> -webkit-logical-width
</span><span class="cx"> -webkit-logical-height
</span><del>--webkit-margin-after-collapse
--webkit-margin-before-collapse
--webkit-margin-bottom-collapse
--webkit-margin-top-collapse
</del><ins>+-webkit-margin-after-collapse [NewStyleBuilder, TypeName=EMarginCollapse]
+-webkit-margin-before-collapse [NewStyleBuilder, TypeName=EMarginCollapse]
+-webkit-margin-bottom-collapse [NewStyleBuilder, TypeName=EMarginCollapse, NameForMethods=MarginAfterCollapse]
+-webkit-margin-top-collapse [NewStyleBuilder, TypeName=EMarginCollapse, NameForMethods=MarginBeforeCollapse]
</ins><span class="cx"> -webkit-margin-collapse
</span><span class="cx"> -webkit-margin-after
</span><span class="cx"> -webkit-margin-before
</span><span class="cx"> -webkit-margin-end
</span><span class="cx"> -webkit-margin-start
</span><span class="cx"> -webkit-marquee
</span><del>--webkit-marquee-direction
</del><ins>+-webkit-marquee-direction [NewStyleBuilder]
</ins><span class="cx"> -webkit-marquee-increment
</span><span class="cx"> -webkit-marquee-repetition
</span><span class="cx"> -webkit-marquee-speed
</span><del>--webkit-marquee-style
</del><ins>+-webkit-marquee-style [NewStyleBuilder, TypeName=EMarqueeBehavior, NameForMethods=MarqueeBehavior]
</ins><span class="cx"> -webkit-mask
</span><span class="cx"> -webkit-mask-box-image
</span><span class="cx"> -webkit-mask-box-image-outset
</span><span class="lines">@@ -387,8 +387,8 @@
</span><span class="cx"> -webkit-max-logical-height
</span><span class="cx"> -webkit-min-logical-width
</span><span class="cx"> -webkit-min-logical-height
</span><del>--webkit-nbsp-mode [Inherited]
-order
</del><ins>+-webkit-nbsp-mode [Inherited, NewStyleBuilder, TypeName=ENBSPMode, Setter=setNBSPMode, Initial=initialNBSPMode]
+order [NewStyleBuilder, TypeName=int]
</ins><span class="cx"> -webkit-order = order
</span><span class="cx"> -webkit-padding-after
</span><span class="cx"> -webkit-padding-before
</span><span class="lines">@@ -398,8 +398,8 @@
</span><span class="cx"> -webkit-perspective-origin
</span><span class="cx"> -webkit-perspective-origin-x
</span><span class="cx"> -webkit-perspective-origin-y
</span><del>--webkit-print-color-adjust [Inherited]
--webkit-rtl-ordering [Inherited]
</del><ins>+-webkit-print-color-adjust [Inherited, NewStyleBuilder, TypeName=PrintColorAdjust]
+-webkit-rtl-ordering [Inherited, NewStyleBuilder, TypeName=Order, Setter=setRTLOrdering, Initial=initialRTLOrdering]
</ins><span class="cx"> #if defined(ENABLE_CSS_SCROLL_SNAP)
</span><span class="cx"> -webkit-scroll-snap-points-x
</span><span class="cx"> -webkit-scroll-snap-points-y
</span><span class="lines">@@ -407,15 +407,15 @@
</span><span class="cx"> -webkit-scroll-snap-destination
</span><span class="cx"> -webkit-scroll-snap-coordinate
</span><span class="cx"> #endif
</span><del>--webkit-text-combine [Inherited]
</del><ins>+-webkit-text-combine [Inherited, NewStyleBuilder, TypeName=TextCombine]
</ins><span class="cx"> -epub-text-combine = -webkit-text-combine
</span><span class="cx"> #if defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT
</span><del>--webkit-text-align-last [Inherited]
--webkit-text-justify [Inherited]
</del><ins>+-webkit-text-align-last [Inherited, NewStyleBuilder, TypeName=TextAlignLast]
+-webkit-text-justify [Inherited, NewStyleBuilder, TypeName=TextJustify]
</ins><span class="cx"> #endif
</span><span class="cx"> -webkit-text-decoration
</span><span class="cx"> -webkit-text-decoration-line
</span><del>--webkit-text-decoration-style
</del><ins>+-webkit-text-decoration-style [NewStyleBuilder, TypeName=TextDecorationStyle]
</ins><span class="cx"> -webkit-text-decoration-color
</span><span class="cx"> -webkit-text-decoration-skip [Inherited]
</span><span class="cx"> -webkit-text-underline-position [Inherited]
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> -epub-text-emphasis-style = -webkit-text-emphasis-style
</span><span class="cx"> text-emphasis-style = -webkit-text-emphasis-style
</span><span class="cx"> -webkit-text-fill-color [Inherited]
</span><del>--webkit-text-security [Inherited]
</del><ins>+-webkit-text-security [Inherited, NewStyleBuilder]
</ins><span class="cx"> -webkit-text-stroke [Inherited]
</span><span class="cx"> -webkit-text-stroke-color [Inherited]
</span><span class="cx"> -webkit-text-stroke-width [Inherited]
</span><span class="lines">@@ -441,22 +441,22 @@
</span><span class="cx"> -webkit-transform-origin-x
</span><span class="cx"> -webkit-transform-origin-y
</span><span class="cx"> -webkit-transform-origin-z
</span><del>--webkit-transform-style
</del><ins>+-webkit-transform-style [NewStyleBuilder, TypeName=ETransformStyle3D, NameForMethods=TransformStyle3D]
</ins><span class="cx"> -webkit-transition
</span><span class="cx"> -webkit-transition-delay
</span><span class="cx"> -webkit-transition-duration
</span><span class="cx"> -webkit-transition-property
</span><span class="cx"> -webkit-transition-timing-function
</span><del>--webkit-user-drag
--webkit-user-modify [Inherited]
--webkit-user-select [Inherited]
</del><ins>+-webkit-user-drag [NewStyleBuilder]
+-webkit-user-modify [Inherited, NewStyleBuilder]
+-webkit-user-select [Inherited, NewStyleBuilder]
</ins><span class="cx"> #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
</span><span class="cx"> -webkit-flow-into
</span><span class="cx"> -webkit-flow-from
</span><del>--webkit-region-fragment
--webkit-region-break-after
--webkit-region-break-before
--webkit-region-break-inside
</del><ins>+-webkit-region-fragment [NewStyleBuilder, TypeName=RegionFragment]
+-webkit-region-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-region-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-region-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
</span><span class="cx"> -webkit-shape-outside
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -1975,7 +1975,7 @@
</span><span class="cx">
</span><span class="cx"> static PropertyHandler createHandler()
</span><span class="cx"> {
</span><del>- PropertyHandler handler = ApplyPropertyDefaultBase<EVerticalAlign, &RenderStyle::verticalAlign, EVerticalAlign, &RenderStyle::setVerticalAlign, EVerticalAlign, &RenderStyle::NonInheritedFlags::initialVerticalAlign>::createHandler();
</del><ins>+ PropertyHandler handler = ApplyPropertyDefaultBase<EVerticalAlign, &RenderStyle::verticalAlign, EVerticalAlign, &RenderStyle::setVerticalAlign, EVerticalAlign, &RenderStyle::initialVerticalAlign>::createHandler();
</ins><span class="cx"> return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="lines">@@ -2099,7 +2099,7 @@
</span><span class="cx">
</span><span class="cx"> static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
</span><span class="cx"> {
</span><del>- styleResolver->style()->setDisplay(RenderStyle::NonInheritedFlags::initialDisplay());
</del><ins>+ styleResolver->style()->setDisplay(RenderStyle::initialDisplay());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
</span><span class="lines">@@ -2358,29 +2358,21 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderBottomColor, &RenderStyle::setBorderBottomColor, &RenderStyle::setVisitedLinkBorderBottomColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomLeftRadius, &RenderStyle::setBorderBottomLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomRightRadius, &RenderStyle::setBorderBottomRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderBottomStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderBottomStyle, EBorderStyle, &RenderStyle::setBorderBottomStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderBottomWidth, &RenderStyle::setBorderBottomWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderCollapse, ApplyPropertyDefault<EBorderCollapse, &RenderStyle::borderCollapse, EBorderCollapse, &RenderStyle::setBorderCollapse, EBorderCollapse, &RenderStyle::initialBorderCollapse>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifier<BorderImage, Outset>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageRepeat, ApplyPropertyBorderImageModifier<BorderImage, Repeat>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageSlice, ApplyPropertyBorderImageModifier<BorderImage, Slice>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageSource, ApplyPropertyBorderImageSource<CSSPropertyBorderImageSource, &RenderStyle::borderImageSource, &RenderStyle::setBorderImageSource, &RenderStyle::initialBorderImageSource>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageWidth, ApplyPropertyBorderImageModifier<BorderImage, Width>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderLeftColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor, &RenderStyle::color>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderLeftStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderLeftStyle, EBorderStyle, &RenderStyle::setBorderLeftStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBorderLeftWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderLeftWidth, &RenderStyle::setBorderLeftWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderRightColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderRightColor, &RenderStyle::setBorderRightColor, &RenderStyle::setVisitedLinkBorderRightColor, &RenderStyle::color>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderRightStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderRightStyle, EBorderStyle, &RenderStyle::setBorderRightStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBorderRightWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderRightWidth, &RenderStyle::setBorderRightWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderTopColor, &RenderStyle::setBorderTopColor, &RenderStyle::setVisitedLinkBorderTopColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderTopStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::borderTopStyle, EBorderStyle, &RenderStyle::setBorderTopStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBorderTopWidth, ApplyPropertyComputeLength<float, &RenderStyle::borderTopWidth, &RenderStyle::setBorderTopWidth, &RenderStyle::initialBorderWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBottom, ApplyPropertyLength<&RenderStyle::bottom, &RenderStyle::setBottom, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBoxSizing, ApplyPropertyDefault<EBoxSizing, &RenderStyle::boxSizing, EBoxSizing, &RenderStyle::setBoxSizing, EBoxSizing, &RenderStyle::initialBoxSizing>::createHandler());
- setPropertyHandler(CSSPropertyCaptionSide, ApplyPropertyDefault<ECaptionSide, &RenderStyle::captionSide, ECaptionSide, &RenderStyle::setCaptionSide, ECaptionSide, &RenderStyle::initialCaptionSide>::createHandler());
- setPropertyHandler(CSSPropertyClear, ApplyPropertyDefault<EClear, &RenderStyle::clear, EClear, &RenderStyle::setClear, EClear, &RenderStyle::NonInheritedFlags::initialClear>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyClip, ApplyPropertyClip::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::color, &RenderStyle::setColor, &RenderStyle::setVisitedLinkColor, &RenderStyle::invalidColor, RenderStyle::initialColor>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyCounterIncrement, ApplyPropertyCounter<Increment>::createHandler());
</span><span class="lines">@@ -2388,18 +2380,12 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyCursor, ApplyPropertyCursor::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyDirection, ApplyPropertyDirection<&RenderStyle::direction, &RenderStyle::setDirection, RenderStyle::initialDirection>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler());
</span><del>- setPropertyHandler(CSSPropertyEmptyCells, ApplyPropertyDefault<EEmptyCell, &RenderStyle::emptyCells, EEmptyCell, &RenderStyle::setEmptyCells, EEmptyCell, &RenderStyle::initialEmptyCells>::createHandler());
- setPropertyHandler(CSSPropertyFloat, ApplyPropertyDefault<EFloat, &RenderStyle::floating, EFloat, &RenderStyle::setFloating, EFloat, &RenderStyle::NonInheritedFlags::initialFloating>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyFontFamily, ApplyPropertyFontFamily::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont<FontItalic, &FontDescription::italic, &FontDescription::setItalic, FontItalicOff>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont<FontSmallCaps, &FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyHeight, ApplyPropertyLength<&RenderStyle::height, &RenderStyle::setHeight, &RenderStyle::initialSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled, NoneDisabled, UndefinedDisabled>::createHandler());
</span><del>-#if ENABLE(CSS_IMAGE_ORIENTATION)
- setPropertyHandler(CSSPropertyImageOrientation, ApplyPropertyDefault<ImageOrientationEnum, &RenderStyle::imageOrientation, ImageOrientationEnum, &RenderStyle::setImageOrientation, ImageOrientationEnum, &RenderStyle::initialImageOrientation>::createHandler());
-#endif
- setPropertyHandler(CSSPropertyImageRendering, ApplyPropertyDefault<EImageRendering, &RenderStyle::imageRendering, EImageRendering, &RenderStyle::setImageRendering, EImageRendering, &RenderStyle::initialImageRendering>::createHandler());
</del><span class="cx"> #if ENABLE(CSS_IMAGE_RESOLUTION)
</span><span class="cx"> setPropertyHandler(CSSPropertyImageResolution, ApplyPropertyImageResolution::createHandler());
</span><span class="cx"> #endif
</span><span class="lines">@@ -2412,8 +2398,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyLineHeight, ApplyPropertyLineHeight::createHandler());
</span><span class="cx"> #endif
</span><span class="cx"> setPropertyHandler(CSSPropertyListStyleImage, ApplyPropertyStyleImage<&RenderStyle::listStyleImage, &RenderStyle::setListStyleImage, &RenderStyle::initialListStyleImage, CSSPropertyListStyleImage>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyListStylePosition, ApplyPropertyDefault<EListStylePosition, &RenderStyle::listStylePosition, EListStylePosition, &RenderStyle::setListStylePosition, EListStylePosition, &RenderStyle::initialListStylePosition>::createHandler());
- setPropertyHandler(CSSPropertyListStyleType, ApplyPropertyDefault<EListStyleType, &RenderStyle::listStyleType, EListStyleType, &RenderStyle::setListStyleType, EListStyleType, &RenderStyle::initialListStyleType>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyMarginBottom, ApplyPropertyLength<&RenderStyle::marginBottom, &RenderStyle::setMarginBottom, &RenderStyle::initialMargin, AutoEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyMarginLeft, ApplyPropertyLength<&RenderStyle::marginLeft, &RenderStyle::setMarginLeft, &RenderStyle::initialMargin, AutoEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyMarginRight, ApplyPropertyLength<&RenderStyle::marginRight, &RenderStyle::setMarginRight, &RenderStyle::initialMargin, AutoEnabled>::createHandler());
</span><span class="lines">@@ -2422,50 +2406,28 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyMaxWidth, ApplyPropertyLength<&RenderStyle::maxWidth, &RenderStyle::setMaxWidth, &RenderStyle::initialMaxSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled, NoneEnabled, UndefinedEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyMinHeight, ApplyPropertyLength<&RenderStyle::minHeight, &RenderStyle::setMinHeight, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicDisabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyMinWidth, ApplyPropertyLength<&RenderStyle::minWidth, &RenderStyle::setMinWidth, &RenderStyle::initialMinSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyObjectFit, ApplyPropertyDefault<ObjectFit, &RenderStyle::objectFit, ObjectFit, &RenderStyle::setObjectFit, ObjectFit, &RenderStyle::initialObjectFit>::createHandler());
- setPropertyHandler(CSSPropertyOpacity, ApplyPropertyDefault<float, &RenderStyle::opacity, float, &RenderStyle::setOpacity, float, &RenderStyle::initialOpacity>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyOrphans, ApplyPropertyAuto<short, &RenderStyle::orphans, &RenderStyle::setOrphans, &RenderStyle::hasAutoOrphans, &RenderStyle::setHasAutoOrphans>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineOffset, ApplyPropertyComputeLength<int, &RenderStyle::outlineOffset, &RenderStyle::setOutlineOffset, &RenderStyle::initialOutlineOffset>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineStyle, ApplyPropertyOutlineStyle::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineWidth, ApplyPropertyComputeLength<unsigned short, &RenderStyle::outlineWidth, &RenderStyle::setOutlineWidth, &RenderStyle::initialOutlineWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyOverflowWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());
- setPropertyHandler(CSSPropertyOverflowX, ApplyPropertyDefault<EOverflow, &RenderStyle::overflowX, EOverflow, &RenderStyle::setOverflowX, EOverflow, &RenderStyle::NonInheritedFlags::initialOverflowX>::createHandler());
- setPropertyHandler(CSSPropertyOverflowY, ApplyPropertyDefault<EOverflow, &RenderStyle::overflowY, EOverflow, &RenderStyle::setOverflowY, EOverflow, &RenderStyle::NonInheritedFlags::initialOverflowY>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyPaddingBottom, ApplyPropertyLength<&RenderStyle::paddingBottom, &RenderStyle::setPaddingBottom, &RenderStyle::initialPadding>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyPaddingLeft, ApplyPropertyLength<&RenderStyle::paddingLeft, &RenderStyle::setPaddingLeft, &RenderStyle::initialPadding>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyPaddingRight, ApplyPropertyLength<&RenderStyle::paddingRight, &RenderStyle::setPaddingRight, &RenderStyle::initialPadding>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyPaddingTop, ApplyPropertyLength<&RenderStyle::paddingTop, &RenderStyle::setPaddingTop, &RenderStyle::initialPadding>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyPageBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakAfter, EPageBreak, &RenderStyle::setPageBreakAfter, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyPageBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakBefore, EPageBreak, &RenderStyle::setPageBreakBefore, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyPageBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::pageBreakInside, EPageBreak, &RenderStyle::setPageBreakInside, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyPointerEvents, ApplyPropertyDefault<EPointerEvents, &RenderStyle::pointerEvents, EPointerEvents, &RenderStyle::setPointerEvents, EPointerEvents, &RenderStyle::initialPointerEvents>::createHandler());
- setPropertyHandler(CSSPropertyPosition, ApplyPropertyDefault<EPosition, &RenderStyle::position, EPosition, &RenderStyle::setPosition, EPosition, &RenderStyle::NonInheritedFlags::initialPosition>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyResize, ApplyPropertyResize::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyRight, ApplyPropertyLength<&RenderStyle::right, &RenderStyle::setRight, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertySize, ApplyPropertyPageSize::createHandler());
</span><del>- setPropertyHandler(CSSPropertySpeak, ApplyPropertyDefault<ESpeak, &RenderStyle::speak, ESpeak, &RenderStyle::setSpeak, ESpeak, &RenderStyle::initialSpeak>::createHandler());
- setPropertyHandler(CSSPropertyTableLayout, ApplyPropertyDefault<ETableLayout, &RenderStyle::tableLayout, ETableLayout, &RenderStyle::setTableLayout, ETableLayout, &RenderStyle::NonInheritedFlags::initialTableLayout>::createHandler());
- setPropertyHandler(CSSPropertyTabSize, ApplyPropertyDefault<unsigned, &RenderStyle::tabSize, unsigned, &RenderStyle::setTabSize, unsigned, &RenderStyle::initialTabSize>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyTextAlign, ApplyPropertyTextAlign::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyTextDecoration, ApplyPropertyTextDecoration::createHandler());
</span><del>-#if ENABLE(CSS3_TEXT)
- setPropertyHandler(CSSPropertyWebkitTextAlignLast, ApplyPropertyDefault<TextAlignLast, &RenderStyle::textAlignLast, TextAlignLast, &RenderStyle::setTextAlignLast, TextAlignLast, &RenderStyle::initialTextAlignLast>::createHandler());
- setPropertyHandler(CSSPropertyWebkitTextJustify, ApplyPropertyDefault<TextJustify, &RenderStyle::textJustify, TextJustify, &RenderStyle::setTextJustify, TextJustify, &RenderStyle::initialTextJustify>::createHandler());
-#endif // CSS3_TEXT
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationLine, ApplyPropertyTextDecoration::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitTextDecorationStyle, ApplyPropertyDefault<TextDecorationStyle, &RenderStyle::textDecorationStyle, TextDecorationStyle, &RenderStyle::setTextDecorationStyle, TextDecorationStyle, &RenderStyle::initialTextDecorationStyle>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyTextIndent::createHandler());
</span><del>- setPropertyHandler(CSSPropertyTextOverflow, ApplyPropertyDefault<TextOverflow, &RenderStyle::textOverflow, TextOverflow, &RenderStyle::setTextOverflow, TextOverflow, &RenderStyle::initialTextOverflow>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyTextTransform, ApplyPropertyDefault<ETextTransform, &RenderStyle::textTransform, ETextTransform, &RenderStyle::setTextTransform, ETextTransform, &RenderStyle::initialTextTransform>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyTop, ApplyPropertyLength<&RenderStyle::top, &RenderStyle::setTop, &RenderStyle::initialOffset, AutoEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyUnicodeBidi, ApplyPropertyDefault<EUnicodeBidi, &RenderStyle::unicodeBidi, EUnicodeBidi, &RenderStyle::setUnicodeBidi, EUnicodeBidi, &RenderStyle::NonInheritedFlags::initialUnicodeBidi>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyVerticalAlign, ApplyPropertyVerticalAlign::createHandler());
</span><del>- setPropertyHandler(CSSPropertyVisibility, ApplyPropertyDefault<EVisibility, &RenderStyle::visibility, EVisibility, &RenderStyle::setVisibility, EVisibility, &RenderStyle::initialVisibility>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationDirection, ApplyPropertyAnimation<Animation::AnimationDirection, &Animation::direction, &Animation::setDirection, &Animation::isDirectionSet, &Animation::clearDirection, &Animation::initialAnimationDirection, &CSSToStyleMap::mapAnimationDirection, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationDuration, ApplyPropertyAnimation<double, &Animation::duration, &Animation::setDuration, &Animation::isDurationSet, &Animation::clearDuration, &Animation::initialAnimationDuration, &CSSToStyleMap::mapAnimationDuration, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="lines">@@ -2474,59 +2436,20 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationName, ApplyPropertyAnimation<const String&, &Animation::name, &Animation::setName, &Animation::isNameSet, &Animation::clearName, &Animation::initialAnimationName, &CSSToStyleMap::mapAnimationName, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationPlayState, ApplyPropertyAnimation<EAnimPlayState, &Animation::playState, &Animation::setPlayState, &Animation::isPlayStateSet, &Animation::clearPlayState, &Animation::initialAnimationPlayState, &CSSToStyleMap::mapAnimationPlayState, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationTimingFunction, ApplyPropertyAnimation<const PassRefPtr<TimingFunction>, &Animation::timingFunction, &Animation::setTimingFunction, &Animation::isTimingFunctionSet, &Animation::clearTimingFunction, &Animation::initialAnimationTimingFunction, &CSSToStyleMap::mapAnimationTimingFunction, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitAppearance, ApplyPropertyDefault<ControlPart, &RenderStyle::appearance, ControlPart, &RenderStyle::setAppearance, ControlPart, &RenderStyle::initialAppearance>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitAspectRatio, ApplyPropertyAspectRatio::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitBackfaceVisibility, ApplyPropertyDefault<EBackfaceVisibility, &RenderStyle::backfaceVisibility, EBackfaceVisibility, &RenderStyle::setBackfaceVisibility, EBackfaceVisibility, &RenderStyle::initialBackfaceVisibility>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundClip, CSSPropertyBackgroundClip);
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
</span><del>-#if ENABLE(CSS_COMPOSITING)
- setPropertyHandler(CSSPropertyMixBlendMode, ApplyPropertyDefault<BlendMode, &RenderStyle::blendMode, BlendMode, &RenderStyle::setBlendMode, BlendMode, &RenderStyle::initialBlendMode>::createHandler());
- setPropertyHandler(CSSPropertyIsolation, ApplyPropertyDefault<Isolation, &RenderStyle::isolation, Isolation, &RenderStyle::setIsolation, Isolation, &RenderStyle::initialIsolation>::createHandler());
-#endif
- setPropertyHandler(CSSPropertyWebkitBorderFit, ApplyPropertyDefault<EBorderFit, &RenderStyle::borderFit, EBorderFit, &RenderStyle::setBorderFit, EBorderFit, &RenderStyle::initialBorderFit>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitBorderHorizontalSpacing, ApplyPropertyComputeLength<short, &RenderStyle::horizontalBorderSpacing, &RenderStyle::setHorizontalBorderSpacing, &RenderStyle::initialHorizontalBorderSpacing>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBorderImage, ApplyPropertyBorderImage<BorderImage, CSSPropertyWebkitBorderImage, &RenderStyle::borderImage, &RenderStyle::setBorderImage>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBorderVerticalSpacing, ApplyPropertyComputeLength<short, &RenderStyle::verticalBorderSpacing, &RenderStyle::setVerticalBorderSpacing, &RenderStyle::initialVerticalBorderSpacing>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitBoxAlign, ApplyPropertyDefault<EBoxAlignment, &RenderStyle::boxAlign, EBoxAlignment, &RenderStyle::setBoxAlign, EBoxAlignment, &RenderStyle::initialBoxAlign>::createHandler());
-#if ENABLE(CSS_BOX_DECORATION_BREAK)
- setPropertyHandler(CSSPropertyWebkitBoxDecorationBreak, ApplyPropertyDefault<EBoxDecorationBreak, &RenderStyle::boxDecorationBreak, EBoxDecorationBreak, &RenderStyle::setBoxDecorationBreak, EBoxDecorationBreak, &RenderStyle::initialBoxDecorationBreak>::createHandler());
-#endif
- setPropertyHandler(CSSPropertyWebkitBoxDirection, ApplyPropertyDefault<EBoxDirection, &RenderStyle::boxDirection, EBoxDirection, &RenderStyle::setBoxDirection, EBoxDirection, &RenderStyle::initialBoxDirection>::createHandler());
- setPropertyHandler(CSSPropertyWebkitBoxFlex, ApplyPropertyDefault<float, &RenderStyle::boxFlex, float, &RenderStyle::setBoxFlex, float, &RenderStyle::initialBoxFlex>::createHandler());
- setPropertyHandler(CSSPropertyWebkitBoxFlexGroup, ApplyPropertyDefault<unsigned, &RenderStyle::boxFlexGroup, unsigned, &RenderStyle::setBoxFlexGroup, unsigned, &RenderStyle::initialBoxFlexGroup>::createHandler());
- setPropertyHandler(CSSPropertyWebkitBoxLines, ApplyPropertyDefault<EBoxLines, &RenderStyle::boxLines, EBoxLines, &RenderStyle::setBoxLines, EBoxLines, &RenderStyle::initialBoxLines>::createHandler());
- setPropertyHandler(CSSPropertyWebkitBoxOrdinalGroup, ApplyPropertyDefault<unsigned, &RenderStyle::boxOrdinalGroup, unsigned, &RenderStyle::setBoxOrdinalGroup, unsigned, &RenderStyle::initialBoxOrdinalGroup>::createHandler());
- setPropertyHandler(CSSPropertyWebkitBoxOrient, ApplyPropertyDefault<EBoxOrient, &RenderStyle::boxOrient, EBoxOrient, &RenderStyle::setBoxOrient, EBoxOrient, &RenderStyle::initialBoxOrient>::createHandler());
- setPropertyHandler(CSSPropertyWebkitBoxPack, ApplyPropertyDefault<EBoxPack, &RenderStyle::boxPack, EBoxPack, &RenderStyle::setBoxPack, EBoxPack, &RenderStyle::initialBoxPack>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColorCorrection, ApplyPropertyDefault<ColorSpace, &RenderStyle::colorSpace, ColorSpace, &RenderStyle::setColorSpace, ColorSpace, &RenderStyle::initialColorSpace>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnAxis, ApplyPropertyDefault<ColumnAxis, &RenderStyle::columnAxis, ColumnAxis, &RenderStyle::setColumnAxis, ColumnAxis, &RenderStyle::initialColumnAxis>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::columnBreakAfter, EPageBreak, &RenderStyle::setColumnBreakAfter, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::columnBreakBefore, EPageBreak, &RenderStyle::setColumnBreakBefore, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::columnBreakInside, EPageBreak, &RenderStyle::setColumnBreakInside, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitColumnCount, ApplyPropertyAuto<unsigned short, &RenderStyle::columnCount, &RenderStyle::setColumnCount, &RenderStyle::hasAutoColumnCount, &RenderStyle::setHasAutoColumnCount>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitColumnFill, ApplyPropertyDefault<ColumnFill, &RenderStyle::columnFill, ColumnFill, &RenderStyle::setColumnFill, ColumnFill, &RenderStyle::initialColumnFill>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitColumnProgression, ApplyPropertyDefault<ColumnProgression, &RenderStyle::columnProgression, ColumnProgression, &RenderStyle::setColumnProgression, ColumnProgression, &RenderStyle::initialColumnProgression>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitColumnRuleWidth, ApplyPropertyComputeLength<unsigned short, &RenderStyle::columnRuleWidth, &RenderStyle::setColumnRuleWidth, &RenderStyle::initialColumnRuleWidth, NormalDisabled, ThicknessEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitColumnSpan, ApplyPropertyDefault<ColumnSpan, &RenderStyle::columnSpan, ColumnSpan, &RenderStyle::setColumnSpan, ColumnSpan, &RenderStyle::initialColumnSpan>::createHandler());
- setPropertyHandler(CSSPropertyWebkitColumnRuleStyle, ApplyPropertyDefault<EBorderStyle, &RenderStyle::columnRuleStyle, EBorderStyle, &RenderStyle::setColumnRuleStyle, EBorderStyle, &RenderStyle::initialBorderStyle>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
</span><del>-#if ENABLE(CURSOR_VISIBILITY)
- setPropertyHandler(CSSPropertyWebkitCursorVisibility, ApplyPropertyDefault<CursorVisibility, &RenderStyle::cursorVisibility, CursorVisibility, &RenderStyle::setCursorVisibility, CursorVisibility, &RenderStyle::initialCursorVisibility>::createHandler());
-#endif
- setPropertyHandler(CSSPropertyAlignContent, ApplyPropertyDefault<EAlignContent, &RenderStyle::alignContent, EAlignContent, &RenderStyle::setAlignContent, EAlignContent, &RenderStyle::initialAlignContent>::createHandler());
- setPropertyHandler(CSSPropertyAlignItems, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignItems, EAlignItems, &RenderStyle::setAlignItems, EAlignItems, &RenderStyle::initialAlignItems>::createHandler());
- setPropertyHandler(CSSPropertyAlignSelf, ApplyPropertyDefault<EAlignItems, &RenderStyle::alignSelf, EAlignItems, &RenderStyle::setAlignSelf, EAlignItems, &RenderStyle::initialAlignSelf>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyFlexBasis, ApplyPropertyLength<&RenderStyle::flexBasis, &RenderStyle::setFlexBasis, &RenderStyle::initialFlexBasis, AutoEnabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyFlexDirection, ApplyPropertyDefault<EFlexDirection, &RenderStyle::flexDirection, EFlexDirection, &RenderStyle::setFlexDirection, EFlexDirection, &RenderStyle::initialFlexDirection>::createHandler());
- setPropertyHandler(CSSPropertyFlexGrow, ApplyPropertyDefault<float, &RenderStyle::flexGrow, float, &RenderStyle::setFlexGrow, float, &RenderStyle::initialFlexGrow>::createHandler());
- setPropertyHandler(CSSPropertyFlexShrink, ApplyPropertyDefault<float, &RenderStyle::flexShrink, float, &RenderStyle::setFlexShrink, float, &RenderStyle::initialFlexShrink>::createHandler());
- setPropertyHandler(CSSPropertyFlexWrap, ApplyPropertyDefault<EFlexWrap, &RenderStyle::flexWrap, EFlexWrap, &RenderStyle::setFlexWrap, EFlexWrap, &RenderStyle::initialFlexWrap>::createHandler());
- setPropertyHandler(CSSPropertyJustifyContent, ApplyPropertyDefault<EJustifyContent, &RenderStyle::justifyContent, EJustifyContent, &RenderStyle::setJustifyContent, EJustifyContent, &RenderStyle::initialJustifyContent>::createHandler());
- setPropertyHandler(CSSPropertyOrder, ApplyPropertyDefault<int, &RenderStyle::order, int, &RenderStyle::setOrder, int, &RenderStyle::initialOrder>::createHandler());
</del><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
</span><span class="lines">@@ -2538,21 +2461,10 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitHyphenateLimitAfter, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitAfter, &RenderStyle::setHyphenationLimitAfter, &RenderStyle::initialHyphenationLimitAfter>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitHyphenateLimitBefore, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitBefore, &RenderStyle::setHyphenationLimitBefore, &RenderStyle::initialHyphenationLimitBefore>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitHyphenateLimitLines, ApplyPropertyNumber<short, &RenderStyle::hyphenationLimitLines, &RenderStyle::setHyphenationLimitLines, &RenderStyle::initialHyphenationLimitLines, CSSValueNoLimit>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitHyphens, ApplyPropertyDefault<Hyphens, &RenderStyle::hyphens, Hyphens, &RenderStyle::setHyphens, Hyphens, &RenderStyle::initialHyphens>::createHandler());
- setPropertyHandler(CSSPropertyWebkitLineAlign, ApplyPropertyDefault<LineAlign, &RenderStyle::lineAlign, LineAlign, &RenderStyle::setLineAlign, LineAlign, &RenderStyle::initialLineAlign>::createHandler());
- setPropertyHandler(CSSPropertyWebkitLineBreak, ApplyPropertyDefault<LineBreak, &RenderStyle::lineBreak, LineBreak, &RenderStyle::setLineBreak, LineBreak, &RenderStyle::initialLineBreak>::createHandler());
- setPropertyHandler(CSSPropertyWebkitLineClamp, ApplyPropertyDefault<const LineClampValue&, &RenderStyle::lineClamp, LineClampValue, &RenderStyle::setLineClamp, LineClampValue, &RenderStyle::initialLineClamp>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitLineSnap, ApplyPropertyDefault<LineSnap, &RenderStyle::lineSnap, LineSnap, &RenderStyle::setLineSnap, LineSnap, &RenderStyle::initialLineSnap>::createHandler());
- setPropertyHandler(CSSPropertyWebkitMarginAfterCollapse, ApplyPropertyDefault<EMarginCollapse, &RenderStyle::marginAfterCollapse, EMarginCollapse, &RenderStyle::setMarginAfterCollapse, EMarginCollapse, &RenderStyle::initialMarginAfterCollapse>::createHandler());
- setPropertyHandler(CSSPropertyWebkitMarginBeforeCollapse, ApplyPropertyDefault<EMarginCollapse, &RenderStyle::marginBeforeCollapse, EMarginCollapse, &RenderStyle::setMarginBeforeCollapse, EMarginCollapse, &RenderStyle::initialMarginBeforeCollapse>::createHandler());
- setPropertyHandler(CSSPropertyWebkitMarginBottomCollapse, CSSPropertyWebkitMarginAfterCollapse);
- setPropertyHandler(CSSPropertyWebkitMarginTopCollapse, CSSPropertyWebkitMarginBeforeCollapse);
- setPropertyHandler(CSSPropertyWebkitMarqueeDirection, ApplyPropertyDefault<EMarqueeDirection, &RenderStyle::marqueeDirection, EMarqueeDirection, &RenderStyle::setMarqueeDirection, EMarqueeDirection, &RenderStyle::initialMarqueeDirection>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitMarqueeIncrement, ApplyPropertyMarqueeIncrement::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMarqueeRepetition, ApplyPropertyMarqueeRepetition::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMarqueeSpeed, ApplyPropertyMarqueeSpeed::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitMarqueeStyle, ApplyPropertyDefault<EMarqueeBehavior, &RenderStyle::marqueeBehavior, EMarqueeBehavior, &RenderStyle::setMarqueeBehavior, EMarqueeBehavior, &RenderStyle::initialMarqueeBehavior>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskBoxImage, ApplyPropertyBorderImage<BorderMask, CSSPropertyWebkitMaskBoxImage, &RenderStyle::maskBoxImage, &RenderStyle::setMaskBoxImage>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifier<BorderMask, Outset>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskBoxImageRepeat, ApplyPropertyBorderImageModifier<BorderMask, Repeat>::createHandler());
</span><span class="lines">@@ -2569,52 +2481,30 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskRepeatY, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyWebkitMaskRepeatY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &CSSToStyleMap::mapFillRepeatY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskSize, ApplyPropertyFillLayer<FillSize, CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSToStyleMap::mapFillSize>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskSourceType, ApplyPropertyFillLayer<EMaskSourceType, CSSPropertyWebkitMaskSourceType, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isMaskSourceTypeSet, &FillLayer::maskSourceType, &FillLayer::setMaskSourceType, &FillLayer::clearMaskSourceType, &FillLayer::initialMaskSourceType, &CSSToStyleMap::mapFillMaskSourceType>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitNbspMode, ApplyPropertyDefault<ENBSPMode, &RenderStyle::nbspMode, ENBSPMode, &RenderStyle::setNBSPMode, ENBSPMode, &RenderStyle::initialNBSPMode>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitPerspectiveOriginX, ApplyPropertyLength<&RenderStyle::perspectiveOriginX, &RenderStyle::setPerspectiveOriginX, &RenderStyle::initialPerspectiveOriginX>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitPerspectiveOriginY, ApplyPropertyLength<&RenderStyle::perspectiveOriginY, &RenderStyle::setPerspectiveOriginY, &RenderStyle::initialPerspectiveOriginY>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitPrintColorAdjust, ApplyPropertyDefault<PrintColorAdjust, &RenderStyle::printColorAdjust, PrintColorAdjust, &RenderStyle::setPrintColorAdjust, PrintColorAdjust, &RenderStyle::initialPrintColorAdjust>::createHandler());
-#if ENABLE(CSS_REGIONS)
- setPropertyHandler(CSSPropertyWebkitRegionBreakAfter, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakAfter, EPageBreak, &RenderStyle::setRegionBreakAfter, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyWebkitRegionBreakBefore, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakBefore, EPageBreak, &RenderStyle::setRegionBreakBefore, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyWebkitRegionBreakInside, ApplyPropertyDefault<EPageBreak, &RenderStyle::regionBreakInside, EPageBreak, &RenderStyle::setRegionBreakInside, EPageBreak, &RenderStyle::NonInheritedFlags::initialPageBreak>::createHandler());
- setPropertyHandler(CSSPropertyWebkitRegionFragment, ApplyPropertyDefault<RegionFragment, &RenderStyle::regionFragment, RegionFragment, &RenderStyle::setRegionFragment, RegionFragment, &RenderStyle::initialRegionFragment>::createHandler());
-#endif
- setPropertyHandler(CSSPropertyWebkitRtlOrdering, ApplyPropertyDefault<Order, &RenderStyle::rtlOrdering, Order, &RenderStyle::setRTLOrdering, Order, &RenderStyle::initialRTLOrdering>::createHandler());
- setPropertyHandler(CSSPropertyWebkitRubyPosition, ApplyPropertyDefault<RubyPosition, &RenderStyle::rubyPosition, RubyPosition, &RenderStyle::setRubyPosition, RubyPosition, &RenderStyle::initialRubyPosition>::createHandler());
- setPropertyHandler(CSSPropertyWebkitTextCombine, ApplyPropertyDefault<TextCombine, &RenderStyle::textCombine, TextCombine, &RenderStyle::setTextCombine, TextCombine, &RenderStyle::initialTextCombine>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextEmphasisColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextEmphasisPosition, ApplyPropertyTextEmphasisPosition::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextFillColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::setVisitedLinkTextFillColor, &RenderStyle::color>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitTextSecurity, ApplyPropertyDefault<ETextSecurity, &RenderStyle::textSecurity, ETextSecurity, &RenderStyle::setTextSecurity, ETextSecurity, &RenderStyle::initialTextSecurity>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransformOriginX, ApplyPropertyLength<&RenderStyle::transformOriginX, &RenderStyle::setTransformOriginX, &RenderStyle::initialTransformOriginX>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransformOriginY, ApplyPropertyLength<&RenderStyle::transformOriginY, &RenderStyle::setTransformOriginY, &RenderStyle::initialTransformOriginY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransformOriginZ, ApplyPropertyComputeLength<float, &RenderStyle::transformOriginZ, &RenderStyle::setTransformOriginZ, &RenderStyle::initialTransformOriginZ>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitTransformStyle, ApplyPropertyDefault<ETransformStyle3D, &RenderStyle::transformStyle3D, ETransformStyle3D, &RenderStyle::setTransformStyle3D, ETransformStyle3D, &RenderStyle::initialTransformStyle3D>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionDuration, ApplyPropertyAnimation<double, &Animation::duration, &Animation::setDuration, &Animation::isDurationSet, &Animation::clearDuration, &Animation::initialAnimationDuration, &CSSToStyleMap::mapAnimationDuration, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionProperty, ApplyPropertyAnimation<CSSPropertyID, &Animation::property, &Animation::setProperty, &Animation::isPropertySet, &Animation::clearProperty, &Animation::initialAnimationProperty, &CSSToStyleMap::mapAnimationProperty, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionTimingFunction, ApplyPropertyAnimation<const PassRefPtr<TimingFunction>, &Animation::timingFunction, &Animation::setTimingFunction, &Animation::isTimingFunctionSet, &Animation::clearTimingFunction, &Animation::initialAnimationTimingFunction, &CSSToStyleMap::mapAnimationTimingFunction, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitUserDrag, ApplyPropertyDefault<EUserDrag, &RenderStyle::userDrag, EUserDrag, &RenderStyle::setUserDrag, EUserDrag, &RenderStyle::initialUserDrag>::createHandler());
- setPropertyHandler(CSSPropertyWebkitUserModify, ApplyPropertyDefault<EUserModify, &RenderStyle::userModify, EUserModify, &RenderStyle::setUserModify, EUserModify, &RenderStyle::initialUserModify>::createHandler());
- setPropertyHandler(CSSPropertyWebkitUserSelect, ApplyPropertyDefault<EUserSelect, &RenderStyle::userSelect, EUserSelect, &RenderStyle::setUserSelect, EUserSelect, &RenderStyle::initialUserSelect>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitClipPath, ApplyPropertyClipPath<&RenderStyle::clipPath, &RenderStyle::setClipPath, &RenderStyle::initialClipPath>::createHandler());
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeMargin, ApplyPropertyLength<&RenderStyle::shapeMargin, &RenderStyle::setShapeMargin, &RenderStyle::initialShapeMargin>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeImageThreshold, ApplyPropertyNumber<float, &RenderStyle::shapeImageThreshold, &RenderStyle::setShapeImageThreshold, &RenderStyle::initialShapeImageThreshold>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitShapeOutside, ApplyPropertyShape<&RenderStyle::shapeOutside, &RenderStyle::setShapeOutside, &RenderStyle::initialShapeOutside>::createHandler());
</span><span class="cx"> #endif
</span><del>- setPropertyHandler(CSSPropertyWhiteSpace, ApplyPropertyDefault<EWhiteSpace, &RenderStyle::whiteSpace, EWhiteSpace, &RenderStyle::setWhiteSpace, EWhiteSpace, &RenderStyle::initialWhiteSpace>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWidows, ApplyPropertyAuto<short, &RenderStyle::widows, &RenderStyle::setWidows, &RenderStyle::hasAutoWidows, &RenderStyle::setHasAutoWidows>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWidth, ApplyPropertyLength<&RenderStyle::width, &RenderStyle::setWidth, &RenderStyle::initialSize, AutoEnabled, LegacyIntrinsicEnabled, IntrinsicEnabled, NoneDisabled, UndefinedDisabled>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWordBreak, ApplyPropertyDefault<EWordBreak, &RenderStyle::wordBreak, EWordBreak, &RenderStyle::setWordBreak, EWordBreak, &RenderStyle::initialWordBreak>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWordSpacing, ApplyPropertyWordSpacing::createHandler());
</span><del>-
- // UAs must treat 'word-wrap' as an alternate name for the 'overflow-wrap' property. So using the same handlers.
- setPropertyHandler(CSSPropertyWordWrap, ApplyPropertyDefault<EOverflowWrap, &RenderStyle::overflowWrap, EOverflowWrap, &RenderStyle::setOverflowWrap, EOverflowWrap, &RenderStyle::initialOverflowWrap>::createHandler());
-
</del><span class="cx"> setPropertyHandler(CSSPropertyCx, ApplyPropertyLength<&RenderStyle::cx, &RenderStyle::setCx, &RenderStyle::initialZeroLength>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyCy, ApplyPropertyLength<&RenderStyle::cy, &RenderStyle::setCy, &RenderStyle::initialZeroLength>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyR, ApplyPropertyLength<&RenderStyle::r, &RenderStyle::setR, &RenderStyle::initialZeroLength>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/StyleBuilder.h (0 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilder.h (rev 0)
+++ trunk/Source/WebCore/css/StyleBuilder.h 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+/*
+ * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef StyleBuilder_h
+#define StyleBuilder_h
+
+#include "CSSPropertyNames.h"
+
+namespace WebCore {
+
+class CSSValue;
+class StyleResolver;
+
+class StyleBuilder {
+public:
+ static bool applyProperty(CSSPropertyID, StyleResolver&, CSSValue*, bool isInitial, bool isInherit);
+};
+
+} // namespace WebCore
+
+#endif // StyleBuilder_h
</ins></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
</span><span class="cx"> * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
</span><span class="cx"> * Copyright (C) Research In Motion Limited 2011. All rights reserved.
</span><del>- * Copyright (C) 2012 Google Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2012, 2013 Google Inc. All rights reserved.
</ins><span class="cx"> * Copyright (C) 2014 Igalia S.L.
</span><span class="cx"> *
</span><span class="cx"> * This library is free software; you can redistribute it and/or
</span><span class="lines">@@ -113,6 +113,7 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "ShadowData.h"
</span><span class="cx"> #include "ShadowRoot.h"
</span><ins>+#include "StyleBuilder.h"
</ins><span class="cx"> #include "StyleCachedImage.h"
</span><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><span class="cx"> #include "StyleGeneratedImage.h"
</span><span class="lines">@@ -1358,7 +1359,7 @@
</span><span class="cx"> if (e && e->isSVGElement()) {
</span><span class="cx"> // Only the root <svg> element in an SVG document fragment tree honors css position
</span><span class="cx"> if (!(e->hasTagName(SVGNames::svgTag) && e->parentNode() && !e->parentNode()->isSVGElement()))
</span><del>- style.setPosition(RenderStyle::NonInheritedFlags::initialPosition());
</del><ins>+ style.setPosition(RenderStyle::initialPosition());
</ins><span class="cx">
</span><span class="cx"> // RenderSVGRoot handles zooming for the whole SVG subtree, so foreignObject content should
</span><span class="cx"> // not be scaled again.
</span><span class="lines">@@ -2127,6 +2128,10 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Use the new StyleBuilder.
+ if (StyleBuilder::applyProperty(id, *this, value, isInitial, isInherit))
+ return;
+
</ins><span class="cx"> CSSPrimitiveValue* primitiveValue = is<CSSPrimitiveValue>(*value) ? downcast<CSSPrimitiveValue>(value) : nullptr;
</span><span class="cx">
</span><span class="cx"> // What follows is a list that maps the CSS properties into their corresponding front-end
</span><span class="lines">@@ -2946,7 +2951,7 @@
</span><span class="cx"> case CSSPropertyTransitionProperty:
</span><span class="cx"> case CSSPropertyTransitionTimingFunction:
</span><span class="cx"> return;
</span><del>- // These properties are implemented in the DeprecatedStyleBuilder lookup table.
</del><ins>+ // These properties are implemented in the DeprecatedStyleBuilder lookup table or in the new StyleBuilder.
</ins><span class="cx"> case CSSPropertyBackgroundAttachment:
</span><span class="cx"> case CSSPropertyBackgroundClip:
</span><span class="cx"> case CSSPropertyBackgroundColor:
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/css/makeprop.pl 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -3,9 +3,10 @@
</span><span class="cx"> # This file is part of the WebKit project
</span><span class="cx"> #
</span><span class="cx"> # Copyright (C) 1999 Waldo Bastian (bastian@kde.org)
</span><del>-# Copyright (C) 2007, 2008, 2012 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2007, 2008, 2012, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
</span><span class="cx"> # Copyright (C) 2010 Andras Becsi (abecsi@inf.u-szeged.hu), University of Szeged
</span><ins>+# Copyright (C) 2013 Google Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # This library is free software; you can redistribute it and/or
</span><span class="cx"> # modify it under the terms of the GNU Library General Public
</span><span class="lines">@@ -40,6 +41,16 @@
</span><span class="cx"> my $numPredefinedProperties = 1;
</span><span class="cx"> my @names = ();
</span><span class="cx"> my %nameIsInherited;
</span><ins>+# FIXME: Eventually all properties should use the new style builder and the following
+# variable should go away.
+my %propertiesUsingNewStyleBuilder;
+my %newStyleBuilderOptions = (
+ Getter => 1,
+ Initial => 1,
+ NameForMethods => 1,
+ Setter => 1,
+ TypeName => 1,
+);
</ins><span class="cx"> my %nameToId;
</span><span class="cx"> my @aliases = ();
</span><span class="cx"> foreach (@NAMES) {
</span><span class="lines">@@ -67,8 +78,18 @@
</span><span class="cx"> } else {
</span><span class="cx"> $nameIsInherited{$_} = 0;
</span><span class="cx"> foreach my $option (@options) {
</span><del>- if ($option eq "Inherited") {
</del><ins>+ my ($optionName, $optionValue) = split(/=/, $option);
+ if ($optionName eq "Inherited") {
</ins><span class="cx"> $nameIsInherited{$_} = 1;
</span><ins>+ } elsif ($optionName eq "NewStyleBuilder") {
+ # FIXME: This is temporary. Eventually, all properties will use the new
+ # style builder and this option will go away.
+ $propertiesUsingNewStyleBuilder{$_} = {};
+ } elsif ($newStyleBuilderOptions{$optionName}) {
+ die "\"" . $optionName . "\" option was used without \"NewStyleBuilder\" option for " . $_ . " property." if not exists($propertiesUsingNewStyleBuilder{$_});
+ $propertiesUsingNewStyleBuilder{$_}{$optionName} = $optionValue;
+ } else {
+ die "Unrecognized \"" . $optionName . "\" option for " . $_ . " property.";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -302,5 +323,103 @@
</span><span class="cx">
</span><span class="cx"> close HEADER;
</span><span class="cx">
</span><ins>+#
+# StyleBuilder.cpp generator.
+#
+
+foreach my $name (@names) {
+ # Skip properties not using the new style builder yet.
+ next unless exists($propertiesUsingNewStyleBuilder{$name});
+
+ my $nameForMethods = $nameToId{$name};
+ $nameForMethods =~ s/Webkit//g;
+ if (exists($propertiesUsingNewStyleBuilder{$name}{"NameForMethods"})) {
+ $nameForMethods = $propertiesUsingNewStyleBuilder{$name}{"NameForMethods"};
+ }
+
+ if (!exists($propertiesUsingNewStyleBuilder{$name}{"TypeName"})) {
+ $propertiesUsingNewStyleBuilder{$name}{"TypeName"} = "E" . $nameForMethods;
+ }
+ if (!exists($propertiesUsingNewStyleBuilder{$name}{"Getter"})) {
+ $propertiesUsingNewStyleBuilder{$name}{"Getter"} = lcfirst($nameForMethods);
+ }
+ if (!exists($propertiesUsingNewStyleBuilder{$name}{"Setter"})) {
+ $propertiesUsingNewStyleBuilder{$name}{"Setter"} = "set" . $nameForMethods;
+ }
+ if (!exists($propertiesUsingNewStyleBuilder{$name}{"Initial"})) {
+ $propertiesUsingNewStyleBuilder{$name}{"Initial"} = "initial" . $nameForMethods;
+ }
+}
+
+open STYLEBUILDER, ">StyleBuilder.cpp" || die "Could not open StyleBuilder.cpp for writing";
+print STYLEBUILDER << "EOF";
+/* This file is automatically generated from CSSPropertyNames.in by makeprop, do not edit */
+
+#include "config.h"
+#include "StyleBuilder.h"
+
+#include "CSSPrimitiveValueMappings.h"
+#include "CSSProperty.h"
+#include "RenderStyle.h"
+#include "StyleResolver.h"
+
+namespace WebCore {
+
+class StyleBuilderFunctions {
+public:
+EOF
+
+foreach my $name (@names) {
+ # Skip properties not using the new style builder yet.
+ next unless exists($propertiesUsingNewStyleBuilder{$name});
+
+ my $setValue = "styleResolver.style()->" . $propertiesUsingNewStyleBuilder{$name}{"Setter"};
+ print STYLEBUILDER " static void applyInitial" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
+ print STYLEBUILDER " {\n";
+ print STYLEBUILDER " " . $setValue . "(RenderStyle::" . $propertiesUsingNewStyleBuilder{$name}{"Initial"} . "());\n";
+ print STYLEBUILDER " }\n";
+ print STYLEBUILDER " static void applyInherit" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
+ print STYLEBUILDER " {\n";
+ print STYLEBUILDER " " . $setValue . "(styleResolver.parentStyle()->" . $propertiesUsingNewStyleBuilder{$name}{"Getter"} . "());\n";
+ print STYLEBUILDER " }\n";
+ print STYLEBUILDER " static void applyValue" . $nameToId{$name} . "(StyleResolver& styleResolver, CSSValue& value)\n";
+ print STYLEBUILDER " {\n";
+ print STYLEBUILDER " " . $setValue . "(static_cast<" . $propertiesUsingNewStyleBuilder{$name}{"TypeName"} . ">(static_cast<CSSPrimitiveValue&>(value)));\n";
+ print STYLEBUILDER " }\n";
+}
+
+print STYLEBUILDER << "EOF";
+};
+
+bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver& styleResolver, CSSValue* value, bool isInitial, bool isInherit)
+{
+ switch (property) {
+EOF
+
+foreach my $name (@names) {
+ # Skip properties not using the new style builder yet.
+ next unless exists($propertiesUsingNewStyleBuilder{$name});
+
+ print STYLEBUILDER " case CSSProperty" . $nameToId{$name} . ":\n";
+ print STYLEBUILDER " if (isInitial)\n";
+ print STYLEBUILDER " StyleBuilderFunctions::applyInitial" . $nameToId{$name} . "(styleResolver);\n";
+ print STYLEBUILDER " else if (isInherit)\n";
+ print STYLEBUILDER " StyleBuilderFunctions::applyInherit" . $nameToId{$name} . "(styleResolver);\n";
+ print STYLEBUILDER " else\n";
+ print STYLEBUILDER " StyleBuilderFunctions::applyValue" . $nameToId{$name} . "(styleResolver, *value);\n";
+ print STYLEBUILDER " return true;\n";
+}
+
+print STYLEBUILDER << "EOF";
+ default:
+ return false;
+ };
+}
+
+} // namespace WebCore
+EOF
+
+close STYLEBUILDER;
+
</ins><span class="cx"> my $gperf = $ENV{GPERF} ? $ENV{GPERF} : "gperf";
</span><span class="cx"> system("\"$gperf\" --key-positions=\"*\" -D -n -s 2 CSSPropertyNames.gperf --output-file=CSSPropertyNames.cpp") == 0 || die "calling gperf failed: $?";
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -265,17 +265,6 @@
</span><span class="cx"> bool isLink() const { return getBoolean(isLinkOffset); }
</span><span class="cx"> void setIsLink(bool value) { updateBoolean(value, isLinkOffset); }
</span><span class="cx">
</span><del>- static EOverflow initialOverflowX() { return OVISIBLE; }
- static EOverflow initialOverflowY() { return OVISIBLE; }
- static EClear initialClear() { return CNONE; }
- static EDisplay initialDisplay() { return INLINE; }
- static EUnicodeBidi initialUnicodeBidi() { return UBNormal; }
- static EPosition initialPosition() { return StaticPosition; }
- static EVerticalAlign initialVerticalAlign() { return BASELINE; }
- static EFloat initialFloating() { return NoFloat; }
- static EPageBreak initialPageBreak() { return PBAUTO; }
- static ETableLayout initialTableLayout() { return TAUTO; }
-
</del><span class="cx"> static ptrdiff_t flagsMemoryOffset() { return OBJECT_OFFSETOF(NonInheritedFlags, m_flags); }
</span><span class="cx"> static uint64_t flagIsaffectedByActive() { return oneBitMask << affectedByActiveOffset; }
</span><span class="cx"> static uint64_t flagIsaffectedByHover() { return oneBitMask << affectedByHoverOffset; }
</span><span class="lines">@@ -1784,6 +1773,16 @@
</span><span class="cx"> bool hasExplicitlyInheritedProperties() const { return noninherited_flags.hasExplicitlyInheritedProperties(); }
</span><span class="cx">
</span><span class="cx"> // Initial values for all the properties
</span><ins>+ static EOverflow initialOverflowX() { return OVISIBLE; }
+ static EOverflow initialOverflowY() { return OVISIBLE; }
+ static EClear initialClear() { return CNONE; }
+ static EDisplay initialDisplay() { return INLINE; }
+ static EUnicodeBidi initialUnicodeBidi() { return UBNormal; }
+ static EPosition initialPosition() { return StaticPosition; }
+ static EVerticalAlign initialVerticalAlign() { return BASELINE; }
+ static EFloat initialFloating() { return NoFloat; }
+ static EPageBreak initialPageBreak() { return PBAUTO; }
+ static ETableLayout initialTableLayout() { return TAUTO; }
</ins><span class="cx"> static EBorderCollapse initialBorderCollapse() { return BSEPARATE; }
</span><span class="cx"> static EBorderStyle initialBorderStyle() { return BNONE; }
</span><span class="cx"> static OutlineIsAuto initialOutlineStyleIsAuto() { return AUTO_OFF; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleMultiColDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleMultiColData.cpp (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleMultiColData.cpp 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/rendering/style/StyleMultiColData.cpp 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx"> , m_normalGap(true)
</span><span class="cx"> , m_fill(RenderStyle::initialColumnFill())
</span><span class="cx"> , m_columnSpan(false)
</span><del>- , m_breakBefore(RenderStyle::NonInheritedFlags::initialPageBreak())
- , m_breakAfter(RenderStyle::NonInheritedFlags::initialPageBreak())
- , m_breakInside(RenderStyle::NonInheritedFlags::initialPageBreak())
</del><ins>+ , m_breakBefore(RenderStyle::initialPageBreak())
+ , m_breakAfter(RenderStyle::initialPageBreak())
+ , m_breakInside(RenderStyle::initialPageBreak())
</ins><span class="cx"> , m_axis(RenderStyle::initialColumnAxis())
</span><span class="cx"> , m_progression(RenderStyle::initialColumnProgression())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleStyleRareNonInheritedDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp (175051 => 175052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-10-22 15:56:24 UTC (rev 175051)
+++ trunk/Source/WebCore/rendering/style/StyleRareNonInheritedData.cpp 2014-10-22 16:56:36 UTC (rev 175052)
</span><span class="lines">@@ -72,9 +72,9 @@
</span><span class="cx"> , m_scrollSnapType(static_cast<unsigned>(RenderStyle::initialScrollSnapType()))
</span><span class="cx"> #endif
</span><span class="cx"> , m_regionFragment(RenderStyle::initialRegionFragment())
</span><del>- , m_regionBreakAfter(RenderStyle::NonInheritedFlags::initialPageBreak())
- , m_regionBreakBefore(RenderStyle::NonInheritedFlags::initialPageBreak())
- , m_regionBreakInside(RenderStyle::NonInheritedFlags::initialPageBreak())
</del><ins>+ , m_regionBreakAfter(RenderStyle::initialPageBreak())
+ , m_regionBreakBefore(RenderStyle::initialPageBreak())
+ , m_regionBreakInside(RenderStyle::initialPageBreak())
</ins><span class="cx"> , m_pageSizeType(PAGE_SIZE_AUTO)
</span><span class="cx"> , m_transformStyle3D(RenderStyle::initialTransformStyle3D())
</span><span class="cx"> , m_backfaceVisibility(RenderStyle::initialBackfaceVisibility())
</span></span></pre>
</div>
</div>
</body>
</html>