<!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>[178251] 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/178251">178251</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-01-11 16:17:50 -0800 (Sun, 11 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Drop legacy SVGCSSStyleSelector.cpp
https://bugs.webkit.org/show_bug.cgi?id=140342
Reviewed by Antti Koivisto.
Drop legacy SVGCSSStyleSelector.cpp by porting the remaining SVG CSS
properties to the generated StyleBuilder. This patch also removes
support for the "LegacyStyleBuilder" option in CSSPropertyNames.in
as all properties have now been ported over.
* CMakeLists.txt:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
Drop SVGCSSStyleSelector.cpp file as it was removed.
* css/CSSPropertyNames.in:
* css/SVGCSSStyleSelector.cpp: Removed.
* css/StyleBuilder.h:
StyleBuilder::applyProperty() no longer need to return a boolean as
it now handles ALL CSS properties.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyValueBaselineShift):
(WebCore::StyleBuilderCustom::applyInitialFill):
(WebCore::StyleBuilderCustom::applyInheritFill):
(WebCore::StyleBuilderCustom::applyValueFill):
(WebCore::StyleBuilderCustom::applyInitialStroke):
(WebCore::StyleBuilderCustom::applyInheritStroke):
(WebCore::StyleBuilderCustom::applyValueStroke):
(WebCore::StyleBuilderCustom::applyInitialWebkitSvgShadow):
(WebCore::StyleBuilderCustom::applyInheritWebkitSvgShadow):
(WebCore::StyleBuilderCustom::applyValueWebkitSvgShadow):
Move 'fill', 'stroke' and '-webkit-svg-shadow' to the new
StyleBuilder.
* css/StyleResolver.cpp:
(WebCore::StyleResolver::applyProperty):
* css/makeprop.pl:</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="#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="#trunkSourceWebCorecssStyleBuilderh">trunk/Source/WebCore/css/StyleBuilder.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</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>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorecssSVGCSSStyleSelectorcpp">trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -1262,7 +1262,6 @@
</span><span class="cx"> css/RuleSet.cpp
</span><span class="cx"> css/SVGCSSComputedStyleDeclaration.cpp
</span><span class="cx"> css/SVGCSSParser.cpp
</span><del>- css/SVGCSSStyleSelector.cpp
</del><span class="cx"> css/SelectorChecker.cpp
</span><span class="cx"> css/SelectorFilter.cpp
</span><span class="cx"> css/SourceSizeList.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/ChangeLog 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-01-11 Chris Dumez <cdumez@apple.com>
+
+ Drop legacy SVGCSSStyleSelector.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=140342
+
+ Reviewed by Antti Koivisto.
+
+ Drop legacy SVGCSSStyleSelector.cpp by porting the remaining SVG CSS
+ properties to the generated StyleBuilder. This patch also removes
+ support for the "LegacyStyleBuilder" option in CSSPropertyNames.in
+ as all properties have now been ported over.
+
+ * CMakeLists.txt:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ Drop SVGCSSStyleSelector.cpp file as it was removed.
+
+ * css/CSSPropertyNames.in:
+ * css/SVGCSSStyleSelector.cpp: Removed.
+ * css/StyleBuilder.h:
+ StyleBuilder::applyProperty() no longer need to return a boolean as
+ it now handles ALL CSS properties.
+
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyValueBaselineShift):
+ (WebCore::StyleBuilderCustom::applyInitialFill):
+ (WebCore::StyleBuilderCustom::applyInheritFill):
+ (WebCore::StyleBuilderCustom::applyValueFill):
+ (WebCore::StyleBuilderCustom::applyInitialStroke):
+ (WebCore::StyleBuilderCustom::applyInheritStroke):
+ (WebCore::StyleBuilderCustom::applyValueStroke):
+ (WebCore::StyleBuilderCustom::applyInitialWebkitSvgShadow):
+ (WebCore::StyleBuilderCustom::applyInheritWebkitSvgShadow):
+ (WebCore::StyleBuilderCustom::applyValueWebkitSvgShadow):
+ Move 'fill', 'stroke' and '-webkit-svg-shadow' to the new
+ StyleBuilder.
+
+ * css/StyleResolver.cpp:
+ (WebCore::StyleResolver::applyProperty):
+ * css/makeprop.pl:
+
</ins><span class="cx"> 2015-01-11 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove FontCachePurgePreventer
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -9879,7 +9879,6 @@
</span><span class="cx"> <ClCompile Include="..\css\StyleSheetList.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\SVGCSSComputedStyleDeclaration.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\SVGCSSParser.cpp" />
</span><del>- <ClCompile Include="..\css\SVGCSSStyleSelector.cpp" />
</del><span class="cx"> <ClCompile Include="..\css\TransformFunctions.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\ViewportStyleResolver.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\WebKitCSSFilterValue.cpp" />
</span><span class="lines">@@ -21336,4 +21335,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -2304,9 +2304,6 @@
</span><span class="cx"> <ClCompile Include="..\css\SVGCSSParser.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\css\SVGCSSStyleSelector.cpp">
- <Filter>css</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\css\TransformFunctions.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -15326,4 +15323,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 (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -4596,7 +4596,6 @@
</span><span class="cx"> B2227AF60D00BF220071B782 /* SVGZoomAndPan.h in Headers */ = {isa = PBXBuildFile; fileRef = B22279600D00BF210071B782 /* SVGZoomAndPan.h */; };
</span><span class="cx"> B2227B050D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2227B000D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp */; };
</span><span class="cx"> B2227B060D00BFF10071B782 /* SVGCSSParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2227B010D00BFF10071B782 /* SVGCSSParser.cpp */; };
</span><del>- B2227B080D00BFF10071B782 /* SVGCSSStyleSelector.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2227B030D00BFF10071B782 /* SVGCSSStyleSelector.cpp */; };
</del><span class="cx"> B222F6980AB771950022EFAD /* JSSVGAngle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222F6960AB771950022EFAD /* JSSVGAngle.cpp */; };
</span><span class="cx"> B222F6990AB771950022EFAD /* JSSVGAngle.h in Headers */ = {isa = PBXBuildFile; fileRef = B222F6970AB771950022EFAD /* JSSVGAngle.h */; };
</span><span class="cx"> B222F69C0AB771B80022EFAD /* JSSVGElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B222F69A0AB771B80022EFAD /* JSSVGElement.cpp */; };
</span><span class="lines">@@ -11984,7 +11983,6 @@
</span><span class="cx"> B22279610D00BF210071B782 /* SVGZoomAndPan.idl */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGZoomAndPan.idl; sourceTree = "<group>"; };
</span><span class="cx"> B2227B000D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCSSComputedStyleDeclaration.cpp; sourceTree = "<group>"; };
</span><span class="cx"> B2227B010D00BFF10071B782 /* SVGCSSParser.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCSSParser.cpp; sourceTree = "<group>"; };
</span><del>- B2227B030D00BFF10071B782 /* SVGCSSStyleSelector.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGCSSStyleSelector.cpp; sourceTree = "<group>"; };
</del><span class="cx"> B2227B040D00BFF10071B782 /* SVGCSSValueKeywords.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = SVGCSSValueKeywords.in; sourceTree = "<group>"; };
</span><span class="cx"> B222F6960AB771950022EFAD /* JSSVGAngle.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSSVGAngle.cpp; sourceTree = "<group>"; };
</span><span class="cx"> B222F6970AB771950022EFAD /* JSSVGAngle.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSSVGAngle.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22269,7 +22267,6 @@
</span><span class="cx"> 93CA4CA209DF93FA00DF8677 /* svg.css */,
</span><span class="cx"> B2227B000D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp */,
</span><span class="cx"> B2227B010D00BFF10071B782 /* SVGCSSParser.cpp */,
</span><del>- B2227B030D00BFF10071B782 /* SVGCSSStyleSelector.cpp */,
</del><span class="cx"> B2227B040D00BFF10071B782 /* SVGCSSValueKeywords.in */,
</span><span class="cx"> FB484F4A171F821E00040755 /* TransformFunctions.cpp */,
</span><span class="cx"> FB484F4B171F821E00040755 /* TransformFunctions.h */,
</span><span class="lines">@@ -29655,7 +29652,6 @@
</span><span class="cx"> B22279A40D00BF220071B782 /* SVGComponentTransferFunctionElement.cpp in Sources */,
</span><span class="cx"> B2227B050D00BFF10071B782 /* SVGCSSComputedStyleDeclaration.cpp in Sources */,
</span><span class="cx"> B2227B060D00BFF10071B782 /* SVGCSSParser.cpp in Sources */,
</span><del>- B2227B080D00BFF10071B782 /* SVGCSSStyleSelector.cpp in Sources */,
</del><span class="cx"> B22279A70D00BF220071B782 /* SVGCursorElement.cpp in Sources */,
</span><span class="cx"> B22279AD0D00BF220071B782 /* SVGDefsElement.cpp in Sources */,
</span><span class="cx"> B22279B00D00BF220071B782 /* SVGDescElement.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -8,11 +8,6 @@
</span><span class="cx"> // http://msdn.microsoft.com/workshop/author/css/reference/attributes.asp
</span><span class="cx"> //
</span><span class="cx"> // StyleBuilder options:
</span><del>-// * LegacyStyleBuilder:
-// Indicates to makeprop.pl that this property should not be generated
-// in the new StyleBuilder.cpp. This option is temporary until all
-// CSS properties are generated.
-//
</del><span class="cx"> // * TypeName:
</span><span class="cx"> // Overrides the type of the setter method argument on RenderStyle. By
</span><span class="cx"> // default, 'E' + PropertyId is used (e.g. EBorderCollapse). This option
</span><span class="lines">@@ -162,7 +157,7 @@
</span><span class="cx"> background-repeat-x [FillLayerProperty, TypeName=EFillRepeat, NameForMethods=RepeatX]
</span><span class="cx"> background-repeat-y [FillLayerProperty, TypeName=EFillRepeat, NameForMethods=RepeatY]
</span><span class="cx"> background-size [FillLayerProperty, TypeName=EFillSize, NameForMethods=Size]
</span><del>-baseline-shift [LegacyStyleBuilder, SVG]
</del><ins>+baseline-shift [SVG, Custom=Value]
</ins><span class="cx"> border [Shorthand]
</span><span class="cx"> border-bottom [Shorthand]
</span><span class="cx"> border-bottom-color [VisitedLinkColorSupport, Initial=invalidColor]
</span><span class="lines">@@ -229,7 +224,7 @@
</span><span class="cx"> dominant-baseline [SVG]
</span><span class="cx"> empty-cells [Inherited, TypeName=EEmptyCell]
</span><span class="cx"> enable-background [SkipBuilder]
</span><del>-fill [Inherited, LegacyStyleBuilder, SVG]
</del><ins>+fill [Inherited, SVG, Custom=All]
</ins><span class="cx"> fill-opacity [Inherited, SVG, Converter=Opacity]
</span><span class="cx"> fill-rule [Inherited, SVG, TypeName=WindRule]
</span><span class="cx"> filter [SVG, Converter=SVGURIReference, NameForMethods=FilterResource]
</span><span class="lines">@@ -260,7 +255,7 @@
</span><span class="cx"> margin-left [Initial=initialMargin, Converter=LengthOrAuto]
</span><span class="cx"> margin-right [Initial=initialMargin, Converter=LengthOrAuto]
</span><span class="cx"> margin-top [Initial=initialMargin, Converter=LengthOrAuto]
</span><del>-marker [Inherited, LegacyStyleBuilder, SVG]
</del><ins>+marker [Inherited, Shorthand]
</ins><span class="cx"> marker-end [Inherited, SVG, Converter=SVGURIReference, NameForMethods=MarkerEndResource]
</span><span class="cx"> marker-mid [Inherited, SVG, Converter=SVGURIReference, NameForMethods=MarkerMidResource]
</span><span class="cx"> marker-start [Inherited, SVG, Converter=SVGURIReference, NameForMethods=MarkerStartResource]
</span><span class="lines">@@ -308,7 +303,7 @@
</span><span class="cx"> src [SkipBuilder]
</span><span class="cx"> stop-color [SVG, Converter=SVGColor]
</span><span class="cx"> stop-opacity [SVG, Converter=Opacity]
</span><del>-stroke [Inherited, LegacyStyleBuilder, SVG]
</del><ins>+stroke [Inherited, SVG, Custom=All]
</ins><span class="cx"> stroke-dasharray [Inherited, SVG, Converter=StrokeDashArray, NameForMethods=StrokeDashArray]
</span><span class="cx"> stroke-dashoffset [Inherited, NameForMethods=StrokeDashOffset, Initial=initialZeroLength, Converter=Length]
</span><span class="cx"> stroke-linecap [Inherited, SVG, NameForMethods=CapStyle, TypeName=LineCap]
</span><span class="lines">@@ -575,7 +570,7 @@
</span><span class="cx"> -webkit-scroll-snap-destination [Converter=SnapCoordinatePair]
</span><span class="cx"> -webkit-scroll-snap-coordinate [Converter=ScrollSnapCoordinates, NameForMethods=ScrollSnapCoordinates]
</span><span class="cx"> #endif
</span><del>--webkit-svg-shadow [LegacyStyleBuilder, SVG]
</del><ins>+-webkit-svg-shadow [SVG, Custom=All]
</ins><span class="cx"> -webkit-text-combine [Inherited, TypeName=TextCombine]
</span><span class="cx"> -epub-text-combine = -webkit-text-combine
</span><span class="cx"> #if defined(ENABLE_CSS3_TEXT) && ENABLE_CSS3_TEXT
</span></span></pre></div>
<a id="trunkSourceWebCorecssSVGCSSStyleSelectorcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/css/SVGCSSStyleSelector.cpp 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -1,188 +0,0 @@
</span><del>-/*
- Copyright (C) 2005 Apple Inc.
- Copyright (C) 2004, 2005, 2007 Nikolas Zimmermann <zimmermann@kde.org>
- 2004, 2005, 2008 Rob Buis <buis@kde.org>
- Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
-
- Based on khtml css code by:
- Copyright(C) 1999-2003 Lars Knoll(knoll@kde.org)
- (C) 2003 Apple Inc.
- (C) 2004 Allan Sandfeld Jensen(kde@carewolf.com)
- (C) 2004 Germain Garand(germain@ebooksfrance.org)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#include "config.h"
-#include "StyleResolver.h"
-
-#include "CSSPrimitiveValueMappings.h"
-#include "CSSPropertyNames.h"
-#include "CSSShadowValue.h"
-#include "CSSValueList.h"
-#include "Document.h"
-#include "SVGColor.h"
-#include "SVGElement.h"
-#include "SVGNames.h"
-#include "SVGPaint.h"
-#include "SVGRenderStyle.h"
-#include "SVGRenderStyleDefs.h"
-#include "SVGURIReference.h"
-#include "StyleBuilderConverter.h"
-#include <stdlib.h>
-#include <wtf/MathExtras.h>
-
-#define HANDLE_INHERIT(prop, Prop) \
-if (isInherit) \
-{ \
- svgStyle.set##Prop(state.parentStyle()->svgStyle().prop()); \
- return; \
-}
-
-#define HANDLE_INHERIT_AND_INITIAL(prop, Prop) \
-HANDLE_INHERIT(prop, Prop) \
-if (isInitial) { \
- svgStyle.set##Prop(SVGRenderStyle::initial##Prop()); \
- return; \
-}
-
-namespace WebCore {
-
-// FIXME: This method should go away once all SVG CSS properties have been
-// ported to the new generated StyleBuilder.
-void StyleResolver::applySVGProperty(CSSPropertyID id, CSSValue* value)
-{
- ASSERT(value);
- CSSPrimitiveValue* primitiveValue = nullptr;
- if (is<CSSPrimitiveValue>(*value))
- primitiveValue = downcast<CSSPrimitiveValue>(value);
-
- const State& state = m_state;
- SVGRenderStyle& svgStyle = state.style()->accessSVGStyle();
-
- bool isInherit = state.parentStyle() && value->isInheritedValue();
- bool isInitial = value->isInitialValue() || (!state.parentStyle() && value->isInheritedValue());
-
- // What follows is a list that maps the CSS properties into their
- // corresponding front-end RenderStyle values. Shorthands(e.g. border,
- // background) occur in this list as well and are only hit when mapping
- // "inherit" or "initial" into front-end values.
- switch (id)
- {
- // ident only properties
- case CSSPropertyBaselineShift:
- {
- HANDLE_INHERIT_AND_INITIAL(baselineShift, BaselineShift);
- if (!primitiveValue)
- break;
-
- if (primitiveValue->getValueID()) {
- switch (primitiveValue->getValueID()) {
- case CSSValueBaseline:
- svgStyle.setBaselineShift(BS_BASELINE);
- break;
- case CSSValueSub:
- svgStyle.setBaselineShift(BS_SUB);
- break;
- case CSSValueSuper:
- svgStyle.setBaselineShift(BS_SUPER);
- break;
- default:
- break;
- }
- } else {
- svgStyle.setBaselineShift(BS_LENGTH);
- svgStyle.setBaselineShiftValue(SVGLength::fromCSSPrimitiveValue(*primitiveValue));
- }
-
- break;
- }
- // end of ident only properties
- case CSSPropertyFill:
- {
- if (isInherit) {
- const SVGRenderStyle& svgParentStyle = state.parentStyle()->svgStyle();
- svgStyle.setFillPaint(svgParentStyle.fillPaintType(), svgParentStyle.fillPaintColor(), svgParentStyle.fillPaintUri(), applyPropertyToRegularStyle(), applyPropertyToVisitedLinkStyle());
- return;
- }
- if (isInitial) {
- svgStyle.setFillPaint(SVGRenderStyle::initialFillPaintType(), SVGRenderStyle::initialFillPaintColor(), SVGRenderStyle::initialFillPaintUri(), applyPropertyToRegularStyle(), applyPropertyToVisitedLinkStyle());
- return;
- }
- if (is<SVGPaint>(*value)) {
- SVGPaint& svgPaint = downcast<SVGPaint>(*value);
- svgStyle.setFillPaint(svgPaint.paintType(), StyleBuilderConverter::convertSVGColor(*this, svgPaint), svgPaint.uri(), applyPropertyToRegularStyle(), applyPropertyToVisitedLinkStyle());
- }
- break;
- }
- case CSSPropertyStroke:
- {
- if (isInherit) {
- const SVGRenderStyle& svgParentStyle = state.parentStyle()->svgStyle();
- svgStyle.setStrokePaint(svgParentStyle.strokePaintType(), svgParentStyle.strokePaintColor(), svgParentStyle.strokePaintUri(), applyPropertyToRegularStyle(), applyPropertyToVisitedLinkStyle());
- return;
- }
- if (isInitial) {
- svgStyle.setStrokePaint(SVGRenderStyle::initialStrokePaintType(), SVGRenderStyle::initialStrokePaintColor(), SVGRenderStyle::initialStrokePaintUri(), applyPropertyToRegularStyle(), applyPropertyToVisitedLinkStyle());
- return;
- }
- if (is<SVGPaint>(*value)) {
- SVGPaint& svgPaint = downcast<SVGPaint>(*value);
- svgStyle.setStrokePaint(svgPaint.paintType(), StyleBuilderConverter::convertSVGColor(*this, svgPaint), svgPaint.uri(), applyPropertyToRegularStyle(), applyPropertyToVisitedLinkStyle());
- }
- break;
- }
- case CSSPropertyWebkitSvgShadow: {
- if (isInherit)
- return svgStyle.setShadow(state.parentStyle()->svgStyle().shadow() ? std::make_unique<ShadowData>(*state.parentStyle()->svgStyle().shadow()) : nullptr);
- if (isInitial || primitiveValue) // initial | none
- return svgStyle.setShadow(nullptr);
-
- if (!is<CSSValueList>(*value))
- return;
-
- CSSValueList& list = downcast<CSSValueList>(*value);
- if (!list.length())
- return;
-
- CSSValue* firstValue = list.itemWithoutBoundsCheck(0);
- if (!is<CSSShadowValue>(*firstValue))
- return;
- CSSShadowValue& item = downcast<CSSShadowValue>(*firstValue);
- IntPoint location(item.x->computeLength<int>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f)),
- item.y->computeLength<int>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f)));
- int blur = item.blur ? item.blur->computeLength<int>(state.cssToLengthConversionData().copyWithAdjustedZoom(1.0f)) : 0;
- Color color;
- if (item.color)
- color = colorFromPrimitiveValue(*item.color);
-
- // -webkit-svg-shadow does should not have a spread or style
- ASSERT(!item.spread);
- ASSERT(!item.style);
-
- auto shadowData = std::make_unique<ShadowData>(location, blur, 0, Normal, false, color.isValid() ? color : Color::transparent);
- svgStyle.setShadow(WTF::move(shadowData));
- return;
- }
- default:
- // If you crash here, it's because you added a css property and are not handling it
- // in either this switch statement or the one in StyleResolver::applyProperty
- ASSERT_WITH_MESSAGE(0, "unimplemented propertyID: %d", id);
- return;
- }
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilder.h (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilder.h 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/css/StyleBuilder.h 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx">
</span><span class="cx"> class StyleBuilder {
</span><span class="cx"> public:
</span><del>- static bool applyProperty(CSSPropertyID, StyleResolver&, CSSValue&, bool isInitial, bool isInherit);
</del><ins>+ static void applyProperty(CSSPropertyID, StyleResolver&, CSSValue&, bool isInitial, bool isInherit);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "Rect.h"
</span><span class="cx"> #include "RenderTheme.h"
</span><span class="cx"> #include "SVGElement.h"
</span><ins>+#include "SVGRenderStyle.h"
</ins><span class="cx"> #include "StyleBuilderConverter.h"
</span><span class="cx"> #include "StyleFontSizeFunctions.h"
</span><span class="cx"> #include "StyleGeneratedImage.h"
</span><span class="lines">@@ -70,6 +71,7 @@
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(CounterIncrement);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(CounterReset);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Cursor);
</span><ins>+ DECLARE_PROPERTY_CUSTOM_HANDLERS(Fill);
</ins><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Font);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(FontFamily);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(FontSize);
</span><span class="lines">@@ -82,6 +84,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(OutlineStyle);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Size);
</span><ins>+ DECLARE_PROPERTY_CUSTOM_HANDLERS(Stroke);
</ins><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(TextIndent);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(TextShadow);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitAspectRatio);
</span><span class="lines">@@ -96,6 +99,7 @@
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitMaskBoxImageRepeat);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitMaskBoxImageSlice);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitMaskBoxImageWidth);
</span><ins>+ DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitSvgShadow);
</ins><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(WebkitTextEmphasisStyle);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Zoom);
</span><span class="cx">
</span><span class="lines">@@ -110,6 +114,7 @@
</span><span class="cx"> static void applyValueDisplay(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><span class="cx"> // Custom handling of value setting only.
</span><ins>+ static void applyValueBaselineShift(StyleResolver&, CSSValue&);
</ins><span class="cx"> static void applyValueDirection(StyleResolver&, CSSValue&);
</span><span class="cx"> #if !ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> static void applyValueLineHeight(StyleResolver&, CSSValue&);
</span><span class="lines">@@ -971,6 +976,30 @@
</span><span class="cx"> styleResolver.style()->setDisplay(display);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyValueBaselineShift(StyleResolver& styleResolver, CSSValue& value)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ if (primitiveValue.isValueID()) {
+ switch (primitiveValue.getValueID()) {
+ case CSSValueBaseline:
+ svgStyle.setBaselineShift(BS_BASELINE);
+ break;
+ case CSSValueSub:
+ svgStyle.setBaselineShift(BS_SUB);
+ break;
+ case CSSValueSuper:
+ svgStyle.setBaselineShift(BS_SUPER);
+ break;
+ default:
+ break;
+ }
+ } else {
+ svgStyle.setBaselineShift(BS_LENGTH);
+ svgStyle.setBaselineShiftValue(SVGLength::fromCSSPrimitiveValue(primitiveValue));
+ }
+}
+
</ins><span class="cx"> inline void StyleBuilderCustom::applyInitialWebkitAspectRatio(StyleResolver& styleResolver)
</span><span class="cx"> {
</span><span class="cx"> styleResolver.style()->setAspectRatioType(RenderStyle::initialAspectRatioType());
</span><span class="lines">@@ -1167,6 +1196,84 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyInitialFill(StyleResolver& styleResolver)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ svgStyle.setFillPaint(SVGRenderStyle::initialFillPaintType(), SVGRenderStyle::initialFillPaintColor(), SVGRenderStyle::initialFillPaintUri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
+}
+
+inline void StyleBuilderCustom::applyInheritFill(StyleResolver& styleResolver)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ const SVGRenderStyle& svgParentStyle = styleResolver.parentStyle()->svgStyle();
+ svgStyle.setFillPaint(svgParentStyle.fillPaintType(), svgParentStyle.fillPaintColor(), svgParentStyle.fillPaintUri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
+
+}
+
+inline void StyleBuilderCustom::applyValueFill(StyleResolver& styleResolver, CSSValue& value)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ SVGPaint& svgPaint = downcast<SVGPaint>(value);
+ svgStyle.setFillPaint(svgPaint.paintType(), StyleBuilderConverter::convertSVGColor(styleResolver, svgPaint), svgPaint.uri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
+}
+
+inline void StyleBuilderCustom::applyInitialStroke(StyleResolver& styleResolver)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ svgStyle.setStrokePaint(SVGRenderStyle::initialStrokePaintType(), SVGRenderStyle::initialStrokePaintColor(), SVGRenderStyle::initialStrokePaintUri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
+}
+
+inline void StyleBuilderCustom::applyInheritStroke(StyleResolver& styleResolver)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ const SVGRenderStyle& svgParentStyle = styleResolver.parentStyle()->svgStyle();
+ svgStyle.setStrokePaint(svgParentStyle.strokePaintType(), svgParentStyle.strokePaintColor(), svgParentStyle.strokePaintUri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
+}
+
+inline void StyleBuilderCustom::applyValueStroke(StyleResolver& styleResolver, CSSValue& value)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ SVGPaint& svgPaint = downcast<SVGPaint>(value);
+ svgStyle.setStrokePaint(svgPaint.paintType(), StyleBuilderConverter::convertSVGColor(styleResolver, svgPaint), svgPaint.uri(), styleResolver.applyPropertyToRegularStyle(), styleResolver.applyPropertyToVisitedLinkStyle());
+}
+
+inline void StyleBuilderCustom::applyInitialWebkitSvgShadow(StyleResolver& styleResolver)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ svgStyle.setShadow(nullptr);
+}
+
+inline void StyleBuilderCustom::applyInheritWebkitSvgShadow(StyleResolver& styleResolver)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ const SVGRenderStyle& svgParentStyle = styleResolver.parentStyle()->svgStyle();
+ svgStyle.setShadow(svgParentStyle.shadow() ? std::make_unique<ShadowData>(*svgParentStyle.shadow()) : nullptr);
+}
+
+inline void StyleBuilderCustom::applyValueWebkitSvgShadow(StyleResolver& styleResolver, CSSValue& value)
+{
+ SVGRenderStyle& svgStyle = styleResolver.style()->accessSVGStyle();
+ if (is<CSSPrimitiveValue>(value)) {
+ ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone);
+ svgStyle.setShadow(nullptr);
+ return;
+ }
+
+ auto& shadowValue = downcast<CSSShadowValue>(*downcast<CSSValueList>(value).itemWithoutBoundsCheck(0));
+ IntPoint location(shadowValue.x->computeLength<int>(styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)),
+ shadowValue.y->computeLength<int>(styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)));
+ int blur = shadowValue.blur ? shadowValue.blur->computeLength<int>(styleResolver.state().cssToLengthConversionData().copyWithAdjustedZoom(1.0f)) : 0;
+ Color color;
+ if (shadowValue.color)
+ color = styleResolver.colorFromPrimitiveValue(*shadowValue.color);
+
+ // -webkit-svg-shadow does should not have a spread or style
+ ASSERT(!shadowValue.spread);
+ ASSERT(!shadowValue.style);
+
+ svgStyle.setShadow(std::make_unique<ShadowData>(location, blur, 0, Normal, false, color.isValid() ? color : Color::transparent));
+}
+
</ins><span class="cx"> inline void StyleBuilderCustom::applyInitialFontWeight(StyleResolver& styleResolver)
</span><span class="cx"> {
</span><span class="cx"> FontDescription fontDescription = styleResolver.fontDescription();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -1987,11 +1987,7 @@
</span><span class="cx"> state.parentStyle()->setHasExplicitlyInheritedProperties();
</span><span class="cx">
</span><span class="cx"> // Use the generated StyleBuilder.
</span><del>- if (StyleBuilder::applyProperty(id, *this, *value, isInitial, isInherit))
- return;
-
- // Try the SVG properties that haven't been ported to the new StyleBuilder yet.
- applySVGProperty(id, value);
</del><ins>+ StyleBuilder::applyProperty(id, *this, *value, isInitial, isInherit);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleImage> StyleResolver::styleImage(CSSPropertyID property, CSSValue& value)
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (178250 => 178251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2015-01-11 22:58:09 UTC (rev 178250)
+++ trunk/Source/WebCore/css/makeprop.pl 2015-01-12 00:17:50 UTC (rev 178251)
</span><span class="lines">@@ -87,21 +87,12 @@
</span><span class="cx"> push @aliases, $_;
</span><span class="cx"> } else {
</span><span class="cx"> $nameIsInherited{$_} = 0;
</span><del>- my $isUsingLegacyStyleBuilder = 0;
</del><span class="cx"> $propertiesWithStyleBuilderOptions{$_} = {};
</span><span class="cx"> foreach my $option (@options) {
</span><span class="cx"> my ($optionName, $optionValue) = split(/=/, $option);
</span><span class="cx"> if ($optionName eq "Inherited") {
</span><span class="cx"> $nameIsInherited{$_} = 1;
</span><del>- } elsif ($optionName eq "LegacyStyleBuilder") {
- # FIXME: This is temporary. Eventually, all properties will use the new
- # style builder and this option will go away.
- $isUsingLegacyStyleBuilder = 1;
- delete $propertiesWithStyleBuilderOptions{$_};
</del><span class="cx"> } elsif ($styleBuilderOptions{$optionName}) {
</span><del>- # FIXME: Temporary until all SVG properties have been ported to the new StyleBuilder.
- next if ($optionName eq "SVG" && $isUsingLegacyStyleBuilder);
- die "\"" . $optionName . "\" option was used with \"LegacyStyleBuilder\" option for " . $_ . " property." if $isUsingLegacyStyleBuilder;
</del><span class="cx"> $propertiesWithStyleBuilderOptions{$_}{$optionName} = $optionValue;
</span><span class="cx"> } else {
</span><span class="cx"> die "Unrecognized \"" . $optionName . "\" option for " . $_ . " property.";
</span><span class="lines">@@ -446,9 +437,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><del>- # Skip properties still using the legacy style builder.
- next unless exists($propertiesWithStyleBuilderOptions{$name});
-
</del><span class="cx"> my $nameForMethods = getNameForMethods($name);
</span><span class="cx"> $nameForMethods =~ s/Webkit//g;
</span><span class="cx"> if (exists($propertiesWithStyleBuilderOptions{$name}{"NameForMethods"})) {
</span><span class="lines">@@ -858,9 +846,6 @@
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><del>- # Skip properties still using the legacy style builder.
- next unless exists($propertiesWithStyleBuilderOptions{$name});
-
</del><span class="cx"> # Skip Shorthand properties and properties that do not use the StyleBuilder.
</span><span class="cx"> next if (exists $propertiesWithStyleBuilderOptions{$name}{"Shorthand"});
</span><span class="cx"> next if (exists $propertiesWithStyleBuilderOptions{$name}{"SkipBuilder"});
</span><span class="lines">@@ -880,17 +865,14 @@
</span><span class="cx"> print STYLEBUILDER << "EOF";
</span><span class="cx"> };
</span><span class="cx">
</span><del>-bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver& styleResolver, CSSValue& value, bool isInitial, bool isInherit)
</del><ins>+void StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver& styleResolver, CSSValue& value, bool isInitial, bool isInherit)
</ins><span class="cx"> {
</span><span class="cx"> switch (property) {
</span><span class="cx"> case CSSPropertyInvalid:
</span><del>- return true;
</del><ins>+ break;
</ins><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><del>- # Skip properties still using the legacy style builder.
- next unless exists($propertiesWithStyleBuilderOptions{$name});
-
</del><span class="cx"> print STYLEBUILDER " case CSSProperty" . $nameToId{$name} . ":\n";
</span><span class="cx"> if (exists $propertiesWithStyleBuilderOptions{$name}{"Shorthand"}) {
</span><span class="cx"> print STYLEBUILDER " ASSERT(isExpandedShorthand(property));\n";
</span><span class="lines">@@ -903,12 +885,10 @@
</span><span class="cx"> print STYLEBUILDER " else\n";
</span><span class="cx"> print STYLEBUILDER " " . getScopeForFunction($name, "Value") . "::applyValue" . $nameToId{$name} . "(styleResolver, value);\n";
</span><span class="cx"> }
</span><del>- print STYLEBUILDER " return true;\n";
</del><ins>+ print STYLEBUILDER " break;\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> print STYLEBUILDER << "EOF";
</span><del>- default:
- return false;
</del><span class="cx"> };
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>