<!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>[176491] 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/176491">176491</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-21 17:26:46 -0800 (Fri, 21 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properties in CSSPropertyNames.in should use the new StyleBuilder by default
https://bugs.webkit.org/show_bug.cgi?id=138983
Reviewed by Andreas Kling.
This patch makes using the new StyleBuilder the default and drops the
[NewStyleBuilder] option as a result. A new [LegacyStyleBuilder] option
is introduced for CSS properties that are not generated in the new
StyleBuilder yet.
* css/CSSPropertyNames.in:
* css/SVGCSSPropertyNames.in:
* css/makeprop.pl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertyNamesin">trunk/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssSVGCSSPropertyNamesin">trunk/Source/WebCore/css/SVGCSSPropertyNames.in</a></li>
<li><a href="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176490 => 176491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-22 01:22:41 UTC (rev 176490)
+++ trunk/Source/WebCore/ChangeLog 2014-11-22 01:26:46 UTC (rev 176491)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2014-11-21 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Properties in CSSPropertyNames.in should use the new StyleBuilder by default
+ https://bugs.webkit.org/show_bug.cgi?id=138983
+
+ Reviewed by Andreas Kling.
+
+ This patch makes using the new StyleBuilder the default and drops the
+ [NewStyleBuilder] option as a result. A new [LegacyStyleBuilder] option
+ is introduced for CSS properties that are not generated in the new
+ StyleBuilder yet.
+
+ * css/CSSPropertyNames.in:
+ * css/SVGCSSPropertyNames.in:
+ * css/makeprop.pl:
+
+2014-11-21 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [iOS] Regression(r176202): line-height is wrong on marco.org
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=138970
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (176490 => 176491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-22 01:22:41 UTC (rev 176490)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-22 01:26:46 UTC (rev 176491)
</span><span class="lines">@@ -6,10 +6,10 @@
</span><span class="cx"> //
</span><span class="cx"> // Microsoft extensions are documented here:
</span><span class="cx"> // http://msdn.microsoft.com/workshop/author/css/reference/attributes.asp
</span><del>-//
</del><ins>+//
</ins><span class="cx"> // StyleBuilder options:
</span><del>-// * NewStyleBuilder:
-// Indicates to makeprop.pl that this property should be generated
</del><ins>+// * LegacyStyleBuilder:
+// Indicates to makeprop.pl that this property should not be generated
</ins><span class="cx"> // in the new StyleBuilder.cpp. This option is temporary until all
</span><span class="cx"> // CSS properties are generated.
</span><span class="cx"> //
</span><span class="lines">@@ -55,501 +55,501 @@
</span><span class="cx">
</span><span class="cx"> // high-priority property names have to be listed first, to simplify the check
</span><span class="cx"> // for applying them first.
</span><del>-color [Inherited]
-direction [Inherited, NewStyleBuilder, Custom=Value]
-display
-font [Inherited]
-font-family [Inherited]
-font-size [Inherited]
-font-style [Inherited]
-font-variant [Inherited]
-font-weight [Inherited]
-text-rendering [Inherited]
--webkit-font-feature-settings [Inherited]
--webkit-font-kerning [Inherited]
--webkit-font-smoothing [Inherited]
--webkit-font-variant-ligatures [Inherited]
--webkit-locale [Inherited]
--webkit-text-orientation [Inherited]
</del><ins>+color [Inherited, LegacyStyleBuilder]
+direction [Inherited, Custom=Value]
+display [LegacyStyleBuilder]
+font [Inherited, LegacyStyleBuilder]
+font-family [Inherited, LegacyStyleBuilder]
+font-size [Inherited, LegacyStyleBuilder]
+font-style [Inherited, LegacyStyleBuilder]
+font-variant [Inherited, LegacyStyleBuilder]
+font-weight [Inherited, LegacyStyleBuilder]
+text-rendering [Inherited, LegacyStyleBuilder]
+-webkit-font-feature-settings [Inherited, LegacyStyleBuilder]
+-webkit-font-kerning [Inherited, LegacyStyleBuilder]
+-webkit-font-smoothing [Inherited, LegacyStyleBuilder]
+-webkit-font-variant-ligatures [Inherited, LegacyStyleBuilder]
+-webkit-locale [Inherited, LegacyStyleBuilder]
+-webkit-text-orientation [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> -epub-text-orientation = -webkit-text-orientation
</span><span class="cx"> #if defined(ENABLE_IOS_TEXT_AUTOSIZING) && ENABLE_IOS_TEXT_AUTOSIZING
</span><del>--webkit-text-size-adjust [Inherited]
</del><ins>+-webkit-text-size-adjust [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><del>--webkit-writing-mode [Inherited]
</del><ins>+-webkit-writing-mode [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> -epub-writing-mode = -webkit-writing-mode
</span><del>-zoom [NewStyleBuilder, Custom=All]
</del><ins>+zoom [Custom=All]
</ins><span class="cx">
</span><span class="cx"> // line height needs to be right after the above high-priority properties
</span><span class="cx"> #if defined(ENABLE_IOS_TEXT_AUTOSIZING) && ENABLE_IOS_TEXT_AUTOSIZING
</span><del>-line-height [Inherited, NewStyleBuilder, Custom=All]
</del><ins>+line-height [Inherited, Custom=All]
</ins><span class="cx"> #else
</span><del>-line-height [Inherited, NewStyleBuilder, Getter=specifiedLineHeight, Custom=Value]
</del><ins>+line-height [Inherited, Getter=specifiedLineHeight, Custom=Value]
</ins><span class="cx"> #endif
</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, NewStyleBuilder, TypeName=RubyPosition]
</del><ins>+-webkit-ruby-position [Inherited, TypeName=RubyPosition]
</ins><span class="cx">
</span><span class="cx"> // The remaining properties are listed in alphabetical order
</span><del>-animation
-animation-delay
-animation-direction
-animation-duration
-animation-fill-mode
-animation-iteration-count
-animation-name
-animation-play-state
-animation-timing-function
-background
-background-attachment
-background-blend-mode
-background-clip
-background-color
-background-image
-background-origin
-background-position
-background-position-x
-background-position-y
-background-repeat
-background-repeat-x
-background-repeat-y
-background-size
-border
-border-bottom
-border-bottom-color
-border-bottom-left-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</del><ins>+animation [LegacyStyleBuilder]
+animation-delay [LegacyStyleBuilder]
+animation-direction [LegacyStyleBuilder]
+animation-duration [LegacyStyleBuilder]
+animation-fill-mode [LegacyStyleBuilder]
+animation-iteration-count [LegacyStyleBuilder]
+animation-name [LegacyStyleBuilder]
+animation-play-state [LegacyStyleBuilder]
+animation-timing-function [LegacyStyleBuilder]
+background [LegacyStyleBuilder]
+background-attachment [LegacyStyleBuilder]
+background-blend-mode [LegacyStyleBuilder]
+background-clip [LegacyStyleBuilder]
+background-color [LegacyStyleBuilder]
+background-image [LegacyStyleBuilder]
+background-origin [LegacyStyleBuilder]
+background-position [LegacyStyleBuilder]
+background-position-x [LegacyStyleBuilder]
+background-position-y [LegacyStyleBuilder]
+background-repeat [LegacyStyleBuilder]
+background-repeat-x [LegacyStyleBuilder]
+background-repeat-y [LegacyStyleBuilder]
+background-size [LegacyStyleBuilder]
+border [LegacyStyleBuilder]
+border-bottom [LegacyStyleBuilder]
+border-bottom-color [LegacyStyleBuilder]
+border-bottom-left-radius [Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-bottom-left-radius = border-bottom-left-radius
</span><del>-border-bottom-right-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</del><ins>+border-bottom-right-radius [Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-bottom-right-radius = border-bottom-right-radius
</span><del>-border-bottom-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
-border-bottom-width [NewStyleBuilder, Initial=initialBorderWidth, Converter=LineWidth<float>]
-border-collapse [Inherited, NewStyleBuilder]
-border-color
-border-image
-border-image-outset [NewStyleBuilder, Custom=All]
-border-image-repeat [NewStyleBuilder, Custom=All]
-border-image-slice [NewStyleBuilder, Custom=All]
-border-image-source [NewStyleBuilder, Converter=BorderImageSource<CSSPropertyBorderImageSource>]
-border-image-width [NewStyleBuilder, Custom=All]
-border-left
-border-left-color
-border-left-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
-border-left-width [NewStyleBuilder, Initial=initialBorderWidth, Converter=LineWidth<float>]
-border-radius
-border-right
-border-right-color
-border-right-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
-border-right-width [NewStyleBuilder, Initial=initialBorderWidth, Converter=LineWidth<float>]
-border-spacing [Inherited]
-border-style
-border-top
-border-top-color
-border-top-left-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</del><ins>+border-bottom-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
+border-bottom-width [Initial=initialBorderWidth, Converter=LineWidth<float>]
+border-collapse [Inherited]
+border-color [LegacyStyleBuilder]
+border-image [LegacyStyleBuilder]
+border-image-outset [Custom=All]
+border-image-repeat [Custom=All]
+border-image-slice [Custom=All]
+border-image-source [Converter=BorderImageSource<CSSPropertyBorderImageSource>]
+border-image-width [Custom=All]
+border-left [LegacyStyleBuilder]
+border-left-color [LegacyStyleBuilder]
+border-left-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
+border-left-width [Initial=initialBorderWidth, Converter=LineWidth<float>]
+border-radius [LegacyStyleBuilder]
+border-right [LegacyStyleBuilder]
+border-right-color [LegacyStyleBuilder]
+border-right-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
+border-right-width [Initial=initialBorderWidth, Converter=LineWidth<float>]
+border-spacing [Inherited, LegacyStyleBuilder]
+border-style [LegacyStyleBuilder]
+border-top [LegacyStyleBuilder]
+border-top-color [LegacyStyleBuilder]
+border-top-left-radius [Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-top-left-radius = border-top-left-radius
</span><del>-border-top-right-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</del><ins>+border-top-right-radius [Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-top-right-radius = border-top-right-radius
</span><del>-border-top-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
-border-top-width [NewStyleBuilder, Initial=initialBorderWidth, Converter=LineWidth<float>]
-border-width
-bottom [NewStyleBuilder, Initial=initialOffset, Converter=LengthOrAuto]
-box-shadow
-box-sizing [NewStyleBuilder]
</del><ins>+border-top-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
+border-top-width [Initial=initialBorderWidth, Converter=LineWidth<float>]
+border-width [LegacyStyleBuilder]
+bottom [Initial=initialOffset, Converter=LengthOrAuto]
+box-shadow [LegacyStyleBuilder]
+box-sizing
</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, NewStyleBuilder]
</del><ins>+caption-side [Inherited]
</ins><span class="cx"> -epub-caption-side = caption-side
</span><del>-clear [NewStyleBuilder]
-clip [NewStyleBuilder, Custom=All]
--webkit-clip-path [NewStyleBuilder, Converter=ClipPath]
-content
-counter-increment
-counter-reset
-cursor [Inherited]
</del><ins>+clear
+clip [Custom=All]
+-webkit-clip-path [Converter=ClipPath]
+content [LegacyStyleBuilder]
+counter-increment [LegacyStyleBuilder]
+counter-reset [LegacyStyleBuilder]
+cursor [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> #if defined(ENABLE_CURSOR_VISIBILITY) && ENABLE_CURSOR_VISIBILITY
</span><del>--webkit-cursor-visibility [Inherited, NewStyleBuilder, TypeName=CursorVisibility]
</del><ins>+-webkit-cursor-visibility [Inherited, TypeName=CursorVisibility]
</ins><span class="cx"> #endif
</span><del>-empty-cells [Inherited, NewStyleBuilder, TypeName=EEmptyCell]
-float [NewStyleBuilder, TypeName=EFloat, NameForMethods=Floating]
-font-stretch
-height [NewStyleBuilder, Initial=initialSize, Converter=LengthSizing]
</del><ins>+empty-cells [Inherited, TypeName=EEmptyCell]
+float [TypeName=EFloat, NameForMethods=Floating]
+font-stretch [LegacyStyleBuilder]
+height [Initial=initialSize, Converter=LengthSizing]
</ins><span class="cx"> #if defined(ENABLE_CSS_IMAGE_ORIENTATION) && ENABLE_CSS_IMAGE_ORIENTATION
</span><del>-image-orientation [Inherited, NewStyleBuilder, TypeName=ImageOrientationEnum]
</del><ins>+image-orientation [Inherited, TypeName=ImageOrientationEnum]
</ins><span class="cx"> #endif
</span><del>-image-rendering [Inherited, NewStyleBuilder]
</del><ins>+image-rendering [Inherited]
</ins><span class="cx"> #if defined(ENABLE_CSS_IMAGE_RESOLUTION) && ENABLE_CSS_IMAGE_RESOLUTION
</span><del>-image-resolution [Inherited, NewStyleBuilder, Custom=All]
</del><ins>+image-resolution [Inherited, Custom=All]
</ins><span class="cx"> #endif
</span><del>-left [NewStyleBuilder, Initial=initialOffset, Converter=LengthOrAuto]
-letter-spacing [Inherited, NewStyleBuilder, Converter=Spacing]
-list-style [Inherited]
-list-style-image [Inherited]
-list-style-position [Inherited, NewStyleBuilder]
-list-style-type [Inherited, NewStyleBuilder]
-margin
-margin-bottom [NewStyleBuilder, Initial=initialMargin, Converter=LengthOrAuto]
-margin-left [NewStyleBuilder, Initial=initialMargin, Converter=LengthOrAuto]
-margin-right [NewStyleBuilder, Initial=initialMargin, Converter=LengthOrAuto]
-margin-top [NewStyleBuilder, Initial=initialMargin, Converter=LengthOrAuto]
-max-height [NewStyleBuilder, Initial=initialMaxSize, Converter=LengthMaxSizing]
-max-width [NewStyleBuilder, Initial=initialMaxSize, Converter=LengthMaxSizing]
-min-height [NewStyleBuilder, Initial=initialMinSize, Converter=LengthSizing]
-min-width [NewStyleBuilder, Initial=initialMinSize, Converter=LengthSizing]
-object-fit [NewStyleBuilder, TypeName=ObjectFit]
-opacity [NewStyleBuilder, TypeName=float]
</del><ins>+left [Initial=initialOffset, Converter=LengthOrAuto]
+letter-spacing [Inherited, Converter=Spacing]
+list-style [Inherited, LegacyStyleBuilder]
+list-style-image [Inherited, LegacyStyleBuilder]
+list-style-position [Inherited]
+list-style-type [Inherited]
+margin [LegacyStyleBuilder]
+margin-bottom [Initial=initialMargin, Converter=LengthOrAuto]
+margin-left [Initial=initialMargin, Converter=LengthOrAuto]
+margin-right [Initial=initialMargin, Converter=LengthOrAuto]
+margin-top [Initial=initialMargin, Converter=LengthOrAuto]
+max-height [Initial=initialMaxSize, Converter=LengthMaxSizing]
+max-width [Initial=initialMaxSize, Converter=LengthMaxSizing]
+min-height [Initial=initialMinSize, Converter=LengthSizing]
+min-width [Initial=initialMinSize, Converter=LengthSizing]
+object-fit [TypeName=ObjectFit]
+opacity [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><del>-orphans [Inherited]
-outline
-outline-color
-outline-offset [NewStyleBuilder, Converter=ComputedLength<int>]
-outline-style [NewStyleBuilder, Custom=All]
-outline-width [NewStyleBuilder, Converter=LineWidth<unsigned short>]
-overflow
-overflow-wrap [NewStyleBuilder]
-overflow-x [NewStyleBuilder, TypeName=EOverflow]
-overflow-y [NewStyleBuilder, TypeName=EOverflow]
-padding
-padding-bottom [NewStyleBuilder, Initial=initialPadding, Converter=Length]
-padding-left [NewStyleBuilder, Initial=initialPadding, Converter=Length]
-padding-right [NewStyleBuilder, Initial=initialPadding, Converter=Length]
-padding-top [NewStyleBuilder, Initial=initialPadding, Converter=Length]
-page
-page-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
-page-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
-page-break-inside [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
-paint-order
-pointer-events [Inherited, NewStyleBuilder]
-position [NewStyleBuilder]
-quotes [Inherited, NewStyleBuilder, Converter=Quotes]
-resize [Inherited, NewStyleBuilder, Converter=Resize]
-right [NewStyleBuilder, Initial=initialOffset, Converter=LengthOrAuto]
-size [NewStyleBuilder, Custom=All]
-src
-speak [Inherited, NewStyleBuilder]
-table-layout [NewStyleBuilder]
-tab-size [Inherited, NewStyleBuilder, TypeName=unsigned]
-text-align [Inherited, NewStyleBuilder, Converter=TextAlign]
-text-decoration [NewStyleBuilder, Converter=TextDecoration]
-text-indent [Inherited, NewStyleBuilder, Custom=All]
-text-line-through
-text-line-through-color
-text-line-through-mode
-text-line-through-style
-text-line-through-width
-text-overflow [NewStyleBuilder, TypeName=TextOverflow]
-text-overline
-text-overline-color
-text-overline-mode
-text-overline-style
-text-overline-width
-text-shadow [Inherited]
-text-transform [Inherited, NewStyleBuilder]
</del><ins>+orphans [Inherited, LegacyStyleBuilder]
+outline [LegacyStyleBuilder]
+outline-color [LegacyStyleBuilder]
+outline-offset [Converter=ComputedLength<int>]
+outline-style [Custom=All]
+outline-width [Converter=LineWidth<unsigned short>]
+overflow [LegacyStyleBuilder]
+overflow-wrap
+overflow-x [TypeName=EOverflow]
+overflow-y [TypeName=EOverflow]
+padding [LegacyStyleBuilder]
+padding-bottom [Initial=initialPadding, Converter=Length]
+padding-left [Initial=initialPadding, Converter=Length]
+padding-right [Initial=initialPadding, Converter=Length]
+padding-top [Initial=initialPadding, Converter=Length]
+page [LegacyStyleBuilder]
+page-break-after [TypeName=EPageBreak, Initial=initialPageBreak]
+page-break-before [TypeName=EPageBreak, Initial=initialPageBreak]
+page-break-inside [TypeName=EPageBreak, Initial=initialPageBreak]
+paint-order [LegacyStyleBuilder]
+pointer-events [Inherited]
+position
+quotes [Inherited, Converter=Quotes]
+resize [Inherited, Converter=Resize]
+right [Initial=initialOffset, Converter=LengthOrAuto]
+size [Custom=All]
+src [LegacyStyleBuilder]
+speak [Inherited]
+table-layout
+tab-size [Inherited, TypeName=unsigned]
+text-align [Inherited, Converter=TextAlign]
+text-decoration [Converter=TextDecoration]
+text-indent [Inherited, Custom=All]
+text-line-through [LegacyStyleBuilder]
+text-line-through-color [LegacyStyleBuilder]
+text-line-through-mode [LegacyStyleBuilder]
+text-line-through-style [LegacyStyleBuilder]
+text-line-through-width [LegacyStyleBuilder]
+text-overflow [TypeName=TextOverflow]
+text-overline [LegacyStyleBuilder]
+text-overline-color [LegacyStyleBuilder]
+text-overline-mode [LegacyStyleBuilder]
+text-overline-style [LegacyStyleBuilder]
+text-overline-width [LegacyStyleBuilder]
+text-shadow [Inherited, LegacyStyleBuilder]
+text-transform [Inherited]
</ins><span class="cx"> -epub-text-transform = text-transform
</span><del>-text-underline
-text-underline-color
-text-underline-mode
-text-underline-style
-text-underline-width
-top [NewStyleBuilder, Initial=initialOffset, Converter=LengthOrAuto]
-transition
-transition-delay
-transition-duration
-transition-property
-transition-timing-function
</del><ins>+text-underline [LegacyStyleBuilder]
+text-underline-color [LegacyStyleBuilder]
+text-underline-mode [LegacyStyleBuilder]
+text-underline-style [LegacyStyleBuilder]
+text-underline-width [LegacyStyleBuilder]
+top [Initial=initialOffset, Converter=LengthOrAuto]
+transition [LegacyStyleBuilder]
+transition-delay [LegacyStyleBuilder]
+transition-duration [LegacyStyleBuilder]
+transition-property [LegacyStyleBuilder]
+transition-timing-function [LegacyStyleBuilder]
</ins><span class="cx">
</span><del>-unicode-bidi [NewStyleBuilder]
-unicode-range
-vertical-align [NewStyleBuilder, Custom=Value]
-visibility [Inherited, NewStyleBuilder]
-white-space [Inherited, NewStyleBuilder]
-widows [Inherited]
-width [NewStyleBuilder, Initial=initialSize, Converter=LengthSizing]
-word-break [Inherited, NewStyleBuilder]
</del><ins>+unicode-bidi
+unicode-range [LegacyStyleBuilder]
+vertical-align [Custom=Value]
+visibility [Inherited]
+white-space [Inherited]
+widows [Inherited, LegacyStyleBuilder]
+width [Initial=initialSize, Converter=LengthSizing]
+word-break [Inherited]
</ins><span class="cx"> -epub-word-break = word-break
</span><del>-word-spacing [Inherited, NewStyleBuilder, Custom=Value]
-word-wrap [Inherited, NewStyleBuilder=EOverflowWrap, NameForMethods=OverflowWrap]
-z-index
-alt
</del><ins>+word-spacing [Inherited, Custom=Value]
+word-wrap [Inherited=EOverflowWrap, NameForMethods=OverflowWrap]
+z-index [LegacyStyleBuilder]
+alt [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-alt = alt
</span><del>--webkit-animation
--webkit-animation-delay
--webkit-animation-direction
--webkit-animation-duration
--webkit-animation-fill-mode
--webkit-animation-iteration-count
--webkit-animation-name
--webkit-animation-play-state
--webkit-animation-timing-function
--webkit-appearance [NewStyleBuilder, TypeName=ControlPart]
--webkit-aspect-ratio [Inherited]
--webkit-backface-visibility [NewStyleBuilder]
--webkit-background-clip
--webkit-background-composite
--webkit-background-origin
</del><ins>+-webkit-animation [LegacyStyleBuilder]
+-webkit-animation-delay [LegacyStyleBuilder]
+-webkit-animation-direction [LegacyStyleBuilder]
+-webkit-animation-duration [LegacyStyleBuilder]
+-webkit-animation-fill-mode [LegacyStyleBuilder]
+-webkit-animation-iteration-count [LegacyStyleBuilder]
+-webkit-animation-name [LegacyStyleBuilder]
+-webkit-animation-play-state [LegacyStyleBuilder]
+-webkit-animation-timing-function [LegacyStyleBuilder]
+-webkit-appearance [TypeName=ControlPart]
+-webkit-aspect-ratio [Inherited, LegacyStyleBuilder]
+-webkit-backface-visibility
+-webkit-background-clip [LegacyStyleBuilder]
+-webkit-background-composite [LegacyStyleBuilder]
+-webkit-background-origin [LegacyStyleBuilder]
</ins><span class="cx"> // -webkit-background-size differs from background-size only in the interpretation of
</span><span class="cx"> // a single value: -webkit-background-size: l; is equivalent to background-size: l l;
</span><span class="cx"> // whereas background-size: l; is equivalent to background-size: l auto;
</span><del>--webkit-background-size
--webkit-border-after
--webkit-border-after-color
--webkit-border-after-style
--webkit-border-after-width
--webkit-border-before
--webkit-border-before-color
--webkit-border-before-style
--webkit-border-before-width
--webkit-border-end
--webkit-border-end-color
--webkit-border-end-style
--webkit-border-end-width
--webkit-border-fit [NewStyleBuilder]
--webkit-border-horizontal-spacing [Inherited, NewStyleBuilder, NameForMethods=HorizontalBorderSpacing, Converter=ComputedLength<short>]
--webkit-border-image [NewStyleBuilder, Initial=initialNinePieceImage, Converter=BorderImage<CSSPropertyWebkitBorderImage>]
</del><ins>+-webkit-background-size [LegacyStyleBuilder]
+-webkit-border-after [LegacyStyleBuilder]
+-webkit-border-after-color [LegacyStyleBuilder]
+-webkit-border-after-style [LegacyStyleBuilder]
+-webkit-border-after-width [LegacyStyleBuilder]
+-webkit-border-before [LegacyStyleBuilder]
+-webkit-border-before-color [LegacyStyleBuilder]
+-webkit-border-before-style [LegacyStyleBuilder]
+-webkit-border-before-width [LegacyStyleBuilder]
+-webkit-border-end [LegacyStyleBuilder]
+-webkit-border-end-color [LegacyStyleBuilder]
+-webkit-border-end-style [LegacyStyleBuilder]
+-webkit-border-end-width [LegacyStyleBuilder]
+-webkit-border-fit
+-webkit-border-horizontal-spacing [Inherited, NameForMethods=HorizontalBorderSpacing, Converter=ComputedLength<short>]
+-webkit-border-image [Initial=initialNinePieceImage, Converter=BorderImage<CSSPropertyWebkitBorderImage>]
</ins><span class="cx"> // -webkit-border-radius differs from border-radius only in the interpretation of
</span><span class="cx"> // a value consisting of two lengths: "-webkit-border-radius: l1 l2;" is equivalent
</span><span class="cx"> // to "border-radius: l1 / l2;"
</span><del>--webkit-border-radius
--webkit-border-start
--webkit-border-start-color
--webkit-border-start-style
--webkit-border-start-width
--webkit-border-vertical-spacing [Inherited, NewStyleBuilder, NameForMethods=VerticalBorderSpacing, Converter=ComputedLength<short>]
--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]
--webkit-box-reflect
</del><ins>+-webkit-border-radius [LegacyStyleBuilder]
+-webkit-border-start [LegacyStyleBuilder]
+-webkit-border-start-color [LegacyStyleBuilder]
+-webkit-border-start-style [LegacyStyleBuilder]
+-webkit-border-start-width [LegacyStyleBuilder]
+-webkit-border-vertical-spacing [Inherited, NameForMethods=VerticalBorderSpacing, Converter=ComputedLength<short>]
+-webkit-box-align [TypeName=EBoxAlignment]
+-webkit-box-direction [Inherited]
+-webkit-box-flex [TypeName=float]
+-webkit-box-flex-group [TypeName=unsigned]
+-webkit-box-lines
+-webkit-box-ordinal-group [TypeName=unsigned]
+-webkit-box-orient
+-webkit-box-pack
+-webkit-box-reflect [LegacyStyleBuilder]
</ins><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><del>--webkit-box-shadow
--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]
-column-count
</del><ins>+-webkit-box-shadow [LegacyStyleBuilder]
+-webkit-color-correction [Inherited, TypeName=ColorSpace, NameForMethods=ColorSpace]
+-webkit-column-axis [TypeName=ColumnAxis]
+-webkit-column-break-after [TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-column-break-before [TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-column-break-inside [TypeName=EPageBreak, Initial=initialPageBreak]
+column-count [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-column-count = column-count
</span><del>-column-fill [NewStyleBuilder, TypeName=ColumnFill]
</del><ins>+column-fill [TypeName=ColumnFill]
</ins><span class="cx"> -webkit-column-fill = column-fill
</span><del>-column-gap
</del><ins>+column-gap [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-column-gap = column-gap
</span><del>-column-progression [NewStyleBuilder, TypeName=ColumnProgression]
</del><ins>+column-progression [TypeName=ColumnProgression]
</ins><span class="cx"> -webkit-column-progression = column-progression
</span><del>-column-rule
</del><ins>+column-rule [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-column-rule = column-rule
</span><del>-column-rule-color
</del><ins>+column-rule-color [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-column-rule-color = column-rule-color
</span><del>-column-rule-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</del><ins>+column-rule-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
</ins><span class="cx"> -webkit-column-rule-style = column-rule-style
</span><del>-column-rule-width [NewStyleBuilder, Converter=LineWidth<unsigned short>]
</del><ins>+column-rule-width [Converter=LineWidth<unsigned short>]
</ins><span class="cx"> -webkit-column-rule-width = column-rule-width
</span><del>-column-span [NewStyleBuilder, TypeName=ColumnSpan]
</del><ins>+column-span [TypeName=ColumnSpan]
</ins><span class="cx"> -webkit-column-span = column-span
</span><del>-column-width
</del><ins>+column-width [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-column-width = column-width
</span><del>-columns
</del><ins>+columns [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-columns = columns
</span><span class="cx"> #if defined(ENABLE_CSS_BOX_DECORATION_BREAK) && ENABLE_CSS_BOX_DECORATION_BREAK
</span><del>--webkit-box-decoration-break [NewStyleBuilder]
</del><ins>+-webkit-box-decoration-break
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_COMPOSITING) && ENABLE_CSS_COMPOSITING
</span><del>-mix-blend-mode [NewStyleBuilder, TypeName=BlendMode, NameForMethods=BlendMode]
-isolation [NewStyleBuilder, TypeName=Isolation]
</del><ins>+mix-blend-mode [TypeName=BlendMode, NameForMethods=BlendMode]
+isolation [TypeName=Isolation]
</ins><span class="cx"> #endif
</span><del>--webkit-filter
-align-content [NewStyleBuilder]
</del><ins>+-webkit-filter [LegacyStyleBuilder]
+align-content
</ins><span class="cx"> -webkit-align-content = align-content
</span><del>-align-items [NewStyleBuilder]
</del><ins>+align-items
</ins><span class="cx"> -webkit-align-items = align-items
</span><del>-align-self [NewStyleBuilder, TypeName=EAlignItems]
</del><ins>+align-self [TypeName=EAlignItems]
</ins><span class="cx"> -webkit-align-self = align-self
</span><del>-flex
</del><ins>+flex [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-flex = flex
</span><del>-flex-basis [NewStyleBuilder, Converter=LengthOrAuto]
</del><ins>+flex-basis [Converter=LengthOrAuto]
</ins><span class="cx"> -webkit-flex-basis = flex-basis
</span><del>-flex-direction [NewStyleBuilder]
</del><ins>+flex-direction
</ins><span class="cx"> -webkit-flex-direction = flex-direction
</span><del>-flex-flow
</del><ins>+flex-flow [LegacyStyleBuilder]
</ins><span class="cx"> -webkit-flex-flow = flex-flow
</span><del>-flex-grow [NewStyleBuilder, TypeName=float]
</del><ins>+flex-grow [TypeName=float]
</ins><span class="cx"> -webkit-flex-grow = flex-grow
</span><del>-flex-shrink [NewStyleBuilder, TypeName=float]
</del><ins>+flex-shrink [TypeName=float]
</ins><span class="cx"> -webkit-flex-shrink = flex-shrink
</span><del>-flex-wrap [NewStyleBuilder]
</del><ins>+flex-wrap
</ins><span class="cx"> -webkit-flex-wrap = flex-wrap
</span><del>-justify-content [NewStyleBuilder]
</del><ins>+justify-content
</ins><span class="cx"> -webkit-justify-content = justify-content
</span><span class="cx"> #if defined(ENABLE_FILTERS_LEVEL_2) && ENABLE_FILTERS_LEVEL_2
</span><del>--webkit-backdrop-filter
</del><ins>+-webkit-backdrop-filter [LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><del>--webkit-justify-self
--webkit-font-size-delta
</del><ins>+-webkit-justify-self [LegacyStyleBuilder]
+-webkit-font-size-delta [LegacyStyleBuilder]
</ins><span class="cx"> #if defined(ENABLE_CSS_GRID_LAYOUT) && ENABLE_CSS_GRID_LAYOUT
</span><del>--webkit-grid
--webkit-grid-area
--webkit-grid-auto-columns
--webkit-grid-auto-rows
--webkit-grid-column-end
--webkit-grid-column-start
--webkit-grid-template
--webkit-grid-template-columns
--webkit-grid-template-rows
--webkit-grid-row-end
--webkit-grid-row-start
--webkit-grid-column
--webkit-grid-row
--webkit-grid-template-areas
--webkit-grid-auto-flow
</del><ins>+-webkit-grid [LegacyStyleBuilder]
+-webkit-grid-area [LegacyStyleBuilder]
+-webkit-grid-auto-columns [LegacyStyleBuilder]
+-webkit-grid-auto-rows [LegacyStyleBuilder]
+-webkit-grid-column-end [LegacyStyleBuilder]
+-webkit-grid-column-start [LegacyStyleBuilder]
+-webkit-grid-template [LegacyStyleBuilder]
+-webkit-grid-template-columns [LegacyStyleBuilder]
+-webkit-grid-template-rows [LegacyStyleBuilder]
+-webkit-grid-row-end [LegacyStyleBuilder]
+-webkit-grid-row-start [LegacyStyleBuilder]
+-webkit-grid-column [LegacyStyleBuilder]
+-webkit-grid-row [LegacyStyleBuilder]
+-webkit-grid-template-areas [LegacyStyleBuilder]
+-webkit-grid-auto-flow [LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><del>--webkit-hyphenate-character [Inherited, NewStyleBuilder, NameForMethods=HyphenationString, Converter=StringOrAuto]
--webkit-hyphenate-limit-after [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitAfter, Converter=Number<short>]
--webkit-hyphenate-limit-before [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitBefore, Converter=Number<short>]
--webkit-hyphenate-limit-lines [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitLines, Converter=WebkitHyphenateLimitLines]
--webkit-hyphens [Inherited, NewStyleBuilder, TypeName=Hyphens]
</del><ins>+-webkit-hyphenate-character [Inherited, NameForMethods=HyphenationString, Converter=StringOrAuto]
+-webkit-hyphenate-limit-after [Inherited, NameForMethods=HyphenationLimitAfter, Converter=Number<short>]
+-webkit-hyphenate-limit-before [Inherited, NameForMethods=HyphenationLimitBefore, Converter=Number<short>]
+-webkit-hyphenate-limit-lines [Inherited, NameForMethods=HyphenationLimitLines, Converter=WebkitHyphenateLimitLines]
+-webkit-hyphens [Inherited, TypeName=Hyphens]
</ins><span class="cx"> -epub-hyphens = -webkit-hyphens
</span><del>--webkit-initial-letter
--webkit-line-box-contain [Inherited]
--webkit-line-align [Inherited, NewStyleBuilder, TypeName=LineAlign]
--webkit-line-break [Inherited, NewStyleBuilder, TypeName=LineBreak]
--webkit-line-clamp [NewStyleBuilder, TypeName=LineClampValue]
--webkit-line-grid [Inherited, NewStyleBuilder, Converter=StringOrNone]
--webkit-line-snap [Inherited, NewStyleBuilder, TypeName=LineSnap]
--webkit-logical-width
--webkit-logical-height
--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]
--webkit-margin-collapse
--webkit-margin-after
--webkit-margin-before
--webkit-margin-end
--webkit-margin-start
--webkit-marquee
--webkit-marquee-direction [NewStyleBuilder]
--webkit-marquee-increment [NewStyleBuilder, Custom=Value]
--webkit-marquee-repetition [NewStyleBuilder, NameForMethods=MarqueeLoopCount, Converter=MarqueeRepetition]
--webkit-marquee-speed [NewStyleBuilder, Converter=MarqueeSpeed]
--webkit-marquee-style [NewStyleBuilder, TypeName=EMarqueeBehavior, NameForMethods=MarqueeBehavior]
--webkit-mask
--webkit-mask-box-image [NewStyleBuilder, Initial=initialNinePieceImage, Converter=BorderMask<CSSPropertyWebkitMaskBoxImage>]
--webkit-mask-box-image-outset [NewStyleBuilder, Custom=All]
--webkit-mask-box-image-repeat [NewStyleBuilder, Custom=All]
--webkit-mask-box-image-slice [NewStyleBuilder, Custom=All]
--webkit-mask-box-image-source [NewStyleBuilder, Converter=BorderImageSource<CSSPropertyWebkitMaskBoxImageSource>]
--webkit-mask-box-image-width [NewStyleBuilder, Custom=All]
--webkit-mask-clip
--webkit-mask-composite
--webkit-mask-image
--webkit-mask-origin
--webkit-mask-position
--webkit-mask-position-x
--webkit-mask-position-y
--webkit-mask-repeat
--webkit-mask-repeat-x
--webkit-mask-repeat-y
--webkit-mask-size
--webkit-mask-source-type
--webkit-max-logical-width
--webkit-max-logical-height
--webkit-min-logical-width
--webkit-min-logical-height
--webkit-nbsp-mode [Inherited, NewStyleBuilder, TypeName=ENBSPMode, Setter=setNBSPMode, Initial=initialNBSPMode]
-order [NewStyleBuilder, TypeName=int]
</del><ins>+-webkit-initial-letter [LegacyStyleBuilder]
+-webkit-line-box-contain [Inherited, LegacyStyleBuilder]
+-webkit-line-align [Inherited, TypeName=LineAlign]
+-webkit-line-break [Inherited, TypeName=LineBreak]
+-webkit-line-clamp [TypeName=LineClampValue]
+-webkit-line-grid [Inherited, Converter=StringOrNone]
+-webkit-line-snap [Inherited, TypeName=LineSnap]
+-webkit-logical-width [LegacyStyleBuilder]
+-webkit-logical-height [LegacyStyleBuilder]
+-webkit-margin-after-collapse [TypeName=EMarginCollapse]
+-webkit-margin-before-collapse [TypeName=EMarginCollapse]
+-webkit-margin-bottom-collapse [TypeName=EMarginCollapse, NameForMethods=MarginAfterCollapse]
+-webkit-margin-top-collapse [TypeName=EMarginCollapse, NameForMethods=MarginBeforeCollapse]
+-webkit-margin-collapse [LegacyStyleBuilder]
+-webkit-margin-after [LegacyStyleBuilder]
+-webkit-margin-before [LegacyStyleBuilder]
+-webkit-margin-end [LegacyStyleBuilder]
+-webkit-margin-start [LegacyStyleBuilder]
+-webkit-marquee [LegacyStyleBuilder]
+-webkit-marquee-direction
+-webkit-marquee-increment [Custom=Value]
+-webkit-marquee-repetition [NameForMethods=MarqueeLoopCount, Converter=MarqueeRepetition]
+-webkit-marquee-speed [Converter=MarqueeSpeed]
+-webkit-marquee-style [TypeName=EMarqueeBehavior, NameForMethods=MarqueeBehavior]
+-webkit-mask [LegacyStyleBuilder]
+-webkit-mask-box-image [Initial=initialNinePieceImage, Converter=BorderMask<CSSPropertyWebkitMaskBoxImage>]
+-webkit-mask-box-image-outset [Custom=All]
+-webkit-mask-box-image-repeat [Custom=All]
+-webkit-mask-box-image-slice [Custom=All]
+-webkit-mask-box-image-source [Converter=BorderImageSource<CSSPropertyWebkitMaskBoxImageSource>]
+-webkit-mask-box-image-width [Custom=All]
+-webkit-mask-clip [LegacyStyleBuilder]
+-webkit-mask-composite [LegacyStyleBuilder]
+-webkit-mask-image [LegacyStyleBuilder]
+-webkit-mask-origin [LegacyStyleBuilder]
+-webkit-mask-position [LegacyStyleBuilder]
+-webkit-mask-position-x [LegacyStyleBuilder]
+-webkit-mask-position-y [LegacyStyleBuilder]
+-webkit-mask-repeat [LegacyStyleBuilder]
+-webkit-mask-repeat-x [LegacyStyleBuilder]
+-webkit-mask-repeat-y [LegacyStyleBuilder]
+-webkit-mask-size [LegacyStyleBuilder]
+-webkit-mask-source-type [LegacyStyleBuilder]
+-webkit-max-logical-width [LegacyStyleBuilder]
+-webkit-max-logical-height [LegacyStyleBuilder]
+-webkit-min-logical-width [LegacyStyleBuilder]
+-webkit-min-logical-height [LegacyStyleBuilder]
+-webkit-nbsp-mode [Inherited, TypeName=ENBSPMode, Setter=setNBSPMode, Initial=initialNBSPMode]
+order [TypeName=int]
</ins><span class="cx"> -webkit-order = order
</span><del>--webkit-padding-after
--webkit-padding-before
--webkit-padding-end
--webkit-padding-start
--webkit-perspective
--webkit-perspective-origin
--webkit-perspective-origin-x [NewStyleBuilder, Converter=Length]
--webkit-perspective-origin-y [NewStyleBuilder, Converter=Length]
--webkit-print-color-adjust [Inherited, NewStyleBuilder, TypeName=PrintColorAdjust]
--webkit-rtl-ordering [Inherited, NewStyleBuilder, TypeName=Order, Setter=setRTLOrdering, Initial=initialRTLOrdering]
</del><ins>+-webkit-padding-after [LegacyStyleBuilder]
+-webkit-padding-before [LegacyStyleBuilder]
+-webkit-padding-end [LegacyStyleBuilder]
+-webkit-padding-start [LegacyStyleBuilder]
+-webkit-perspective [LegacyStyleBuilder]
+-webkit-perspective-origin [LegacyStyleBuilder]
+-webkit-perspective-origin-x [Converter=Length]
+-webkit-perspective-origin-y [Converter=Length]
+-webkit-print-color-adjust [Inherited, TypeName=PrintColorAdjust]
+-webkit-rtl-ordering [Inherited, TypeName=Order, Setter=setRTLOrdering, Initial=initialRTLOrdering]
</ins><span class="cx"> #if defined(ENABLE_CSS_SCROLL_SNAP)
</span><del>--webkit-scroll-snap-points-x
--webkit-scroll-snap-points-y
--webkit-scroll-snap-type
--webkit-scroll-snap-destination
--webkit-scroll-snap-coordinate
</del><ins>+-webkit-scroll-snap-points-x [LegacyStyleBuilder]
+-webkit-scroll-snap-points-y [LegacyStyleBuilder]
+-webkit-scroll-snap-type [LegacyStyleBuilder]
+-webkit-scroll-snap-destination [LegacyStyleBuilder]
+-webkit-scroll-snap-coordinate [LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><del>--webkit-text-combine [Inherited, NewStyleBuilder, TypeName=TextCombine]
</del><ins>+-webkit-text-combine [Inherited, 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, NewStyleBuilder, TypeName=TextAlignLast]
--webkit-text-justify [Inherited, NewStyleBuilder, TypeName=TextJustify]
</del><ins>+-webkit-text-align-last [Inherited, TypeName=TextAlignLast]
+-webkit-text-justify [Inherited, TypeName=TextJustify]
</ins><span class="cx"> #endif
</span><del>--webkit-text-decoration
--webkit-text-decoration-line [NewStyleBuilder, NameForMethods=TextDecoration, Converter=TextDecoration]
--webkit-text-decoration-style [NewStyleBuilder, TypeName=TextDecorationStyle]
--webkit-text-decoration-color
--webkit-text-decoration-skip [Inherited]
--webkit-text-underline-position [Inherited, NewStyleBuilder, Converter=TextUnderlinePosition]
--webkit-text-decorations-in-effect [Inherited]
--webkit-text-emphasis [Inherited]
</del><ins>+-webkit-text-decoration [LegacyStyleBuilder]
+-webkit-text-decoration-line [NameForMethods=TextDecoration, Converter=TextDecoration]
+-webkit-text-decoration-style [TypeName=TextDecorationStyle]
+-webkit-text-decoration-color [LegacyStyleBuilder]
+-webkit-text-decoration-skip [Inherited, LegacyStyleBuilder]
+-webkit-text-underline-position [Inherited, Converter=TextUnderlinePosition]
+-webkit-text-decorations-in-effect [Inherited, LegacyStyleBuilder]
+-webkit-text-emphasis [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> -epub-text-emphasis = -webkit-text-emphasis
</span><span class="cx"> text-emphasis = -webkit-text-emphasis
</span><del>--webkit-text-emphasis-color [Inherited]
</del><ins>+-webkit-text-emphasis-color [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> -epub-text-emphasis-color = -webkit-text-emphasis-color
</span><span class="cx"> text-emphasis-color = -webkit-text-emphasis-color
</span><del>--webkit-text-emphasis-position [Inherited, NewStyleBuilder, Converter=TextEmphasisPosition]
</del><ins>+-webkit-text-emphasis-position [Inherited, Converter=TextEmphasisPosition]
</ins><span class="cx"> text-emphasis-position = -webkit-text-emphasis-position
</span><del>--webkit-text-emphasis-style [Inherited]
</del><ins>+-webkit-text-emphasis-style [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> -epub-text-emphasis-style = -webkit-text-emphasis-style
</span><span class="cx"> text-emphasis-style = -webkit-text-emphasis-style
</span><del>--webkit-text-fill-color [Inherited]
--webkit-text-security [Inherited, NewStyleBuilder]
--webkit-text-stroke [Inherited]
--webkit-text-stroke-color [Inherited]
--webkit-text-stroke-width [Inherited]
--webkit-transform [NewStyleBuilder, Converter=Transform]
--webkit-transform-origin
--webkit-transform-origin-x [NewStyleBuilder, Converter=Length]
--webkit-transform-origin-y [NewStyleBuilder, Converter=Length]
--webkit-transform-origin-z [NewStyleBuilder, Converter=ComputedLength<float>]
--webkit-transform-style [NewStyleBuilder, TypeName=ETransformStyle3D, NameForMethods=TransformStyle3D]
--webkit-transition
--webkit-transition-delay
--webkit-transition-duration
--webkit-transition-property
--webkit-transition-timing-function
--webkit-user-drag [NewStyleBuilder]
--webkit-user-modify [Inherited, NewStyleBuilder]
--webkit-user-select [Inherited, NewStyleBuilder]
</del><ins>+-webkit-text-fill-color [Inherited, LegacyStyleBuilder]
+-webkit-text-security [Inherited]
+-webkit-text-stroke [Inherited, LegacyStyleBuilder]
+-webkit-text-stroke-color [Inherited, LegacyStyleBuilder]
+-webkit-text-stroke-width [Inherited, LegacyStyleBuilder]
+-webkit-transform [Converter=Transform]
+-webkit-transform-origin [LegacyStyleBuilder]
+-webkit-transform-origin-x [Converter=Length]
+-webkit-transform-origin-y [Converter=Length]
+-webkit-transform-origin-z [Converter=ComputedLength<float>]
+-webkit-transform-style [TypeName=ETransformStyle3D, NameForMethods=TransformStyle3D]
+-webkit-transition [LegacyStyleBuilder]
+-webkit-transition-delay [LegacyStyleBuilder]
+-webkit-transition-duration [LegacyStyleBuilder]
+-webkit-transition-property [LegacyStyleBuilder]
+-webkit-transition-timing-function [LegacyStyleBuilder]
+-webkit-user-drag
+-webkit-user-modify [Inherited]
+-webkit-user-select [Inherited]
</ins><span class="cx"> #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
</span><del>--webkit-flow-into [NewStyleBuilder, NameForMethods=FlowThread, Converter=StringOrNone]
--webkit-flow-from [NewStyleBuilder, NameForMethods=RegionThread, Converter=StringOrNone]
--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]
</del><ins>+-webkit-flow-into [NameForMethods=FlowThread, Converter=StringOrNone]
+-webkit-flow-from [NameForMethods=RegionThread, Converter=StringOrNone]
+-webkit-region-fragment [TypeName=RegionFragment]
+-webkit-region-break-after [TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-region-break-before [TypeName=EPageBreak, Initial=initialPageBreak]
+-webkit-region-break-inside [TypeName=EPageBreak, Initial=initialPageBreak]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_SHAPES) && ENABLE_CSS_SHAPES
</span><del>--webkit-shape-outside [NewStyleBuilder, Custom=Value]
--webkit-shape-margin [NewStyleBuilder, Converter=Length]
--webkit-shape-image-threshold [NewStyleBuilder, Converter=Number<float>]
</del><ins>+-webkit-shape-outside [Custom=Value]
+-webkit-shape-margin [Converter=Length]
+-webkit-shape-image-threshold [Converter=Number<float>]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_CSS_DEVICE_ADAPTATION) && ENABLE_CSS_DEVICE_ADAPTATION
</span><del>-max-zoom
-min-zoom
-orientation
-user-zoom
</del><ins>+max-zoom [LegacyStyleBuilder]
+min-zoom [LegacyStyleBuilder]
+orientation [LegacyStyleBuilder]
+user-zoom [LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
</span><del>--webkit-tap-highlight-color [Inherited]
</del><ins>+-webkit-tap-highlight-color [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_DASHBOARD_SUPPORT) && ENABLE_DASHBOARD_SUPPORT
</span><del>--webkit-dashboard-region
</del><ins>+-webkit-dashboard-region [LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) && ENABLE_ACCELERATED_OVERFLOW_SCROLLING
</span><del>--webkit-overflow-scrolling [Inherited]
</del><ins>+-webkit-overflow-scrolling [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span><span class="cx"> #if defined(WTF_PLATFORM_IOS) && WTF_PLATFORM_IOS
</span><del>--webkit-touch-callout [Inherited]
</del><ins>+-webkit-touch-callout [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssSVGCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SVGCSSPropertyNames.in (176490 => 176491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SVGCSSPropertyNames.in 2014-11-22 01:22:41 UTC (rev 176490)
+++ trunk/Source/WebCore/css/SVGCSSPropertyNames.in 2014-11-22 01:26:46 UTC (rev 176491)
</span><span class="lines">@@ -3,60 +3,60 @@
</span><span class="cx"> //
</span><span class="cx">
</span><span class="cx"> // SVG style props
</span><del>-buffered-rendering
-clip-path
-clip-rule [Inherited]
-mask
</del><ins>+buffered-rendering [LegacyStyleBuilder]
+clip-path [LegacyStyleBuilder]
+clip-rule [Inherited, LegacyStyleBuilder]
+mask [LegacyStyleBuilder]
</ins><span class="cx"> // opacity
</span><del>-enable-background
-filter
-flood-color
-flood-opacity
-lighting-color
-stop-color
-stop-opacity
</del><ins>+enable-background [LegacyStyleBuilder]
+filter [LegacyStyleBuilder]
+flood-color [LegacyStyleBuilder]
+flood-opacity [LegacyStyleBuilder]
+lighting-color [LegacyStyleBuilder]
+stop-color [LegacyStyleBuilder]
+stop-opacity [LegacyStyleBuilder]
</ins><span class="cx"> // pointer-events
</span><del>-color-interpolation [Inherited]
-color-interpolation-filters [Inherited]
-color-profile
-color-rendering [Inherited]
-fill [Inherited]
-fill-opacity [Inherited]
-fill-rule [Inherited]
</del><ins>+color-interpolation [Inherited, LegacyStyleBuilder]
+color-interpolation-filters [Inherited, LegacyStyleBuilder]
+color-profile [LegacyStyleBuilder]
+color-rendering [Inherited, LegacyStyleBuilder]
+fill [Inherited, LegacyStyleBuilder]
+fill-opacity [Inherited, LegacyStyleBuilder]
+fill-rule [Inherited, LegacyStyleBuilder]
</ins><span class="cx"> //font-size-adjust
</span><span class="cx"> //image-rendering
</span><del>-marker [Inherited]
-marker-end [Inherited]
-marker-mid [Inherited]
-marker-start [Inherited]
-mask-type
-shape-rendering [Inherited]
-stroke [Inherited]
-stroke-dasharray [Inherited]
-stroke-dashoffset [Inherited, NewStyleBuilder, NameForMethods=StrokeDashOffset, Initial=initialZeroLength, Converter=Length]
-stroke-linecap [Inherited]
-stroke-linejoin [Inherited]
-stroke-miterlimit [Inherited]
-stroke-opacity [Inherited]
-stroke-width [Inherited, NewStyleBuilder, Initial=initialOneLength, Converter=Length]
</del><ins>+marker [Inherited, LegacyStyleBuilder]
+marker-end [Inherited, LegacyStyleBuilder]
+marker-mid [Inherited, LegacyStyleBuilder]
+marker-start [Inherited, LegacyStyleBuilder]
+mask-type [LegacyStyleBuilder]
+shape-rendering [Inherited, LegacyStyleBuilder]
+stroke [Inherited, LegacyStyleBuilder]
+stroke-dasharray [Inherited, LegacyStyleBuilder]
+stroke-dashoffset [Inherited, NameForMethods=StrokeDashOffset, Initial=initialZeroLength, Converter=Length]
+stroke-linecap [Inherited, LegacyStyleBuilder]
+stroke-linejoin [Inherited, LegacyStyleBuilder]
+stroke-miterlimit [Inherited, LegacyStyleBuilder]
+stroke-opacity [Inherited, LegacyStyleBuilder]
+stroke-width [Inherited, Initial=initialOneLength, Converter=Length]
</ins><span class="cx"> // text-rendering
</span><del>-alignment-baseline
-baseline-shift
-dominant-baseline
-glyph-orientation-horizontal [Inherited]
-glyph-orientation-vertical [Inherited]
-kerning [Inherited]
-text-anchor [Inherited]
-vector-effect
-writing-mode [Inherited]
</del><ins>+alignment-baseline [LegacyStyleBuilder]
+baseline-shift [LegacyStyleBuilder]
+dominant-baseline [LegacyStyleBuilder]
+glyph-orientation-horizontal [Inherited, LegacyStyleBuilder]
+glyph-orientation-vertical [Inherited, LegacyStyleBuilder]
+kerning [Inherited, LegacyStyleBuilder]
+text-anchor [Inherited, LegacyStyleBuilder]
+vector-effect [LegacyStyleBuilder]
+writing-mode [Inherited, LegacyStyleBuilder]
</ins><span class="cx">
</span><del>--webkit-svg-shadow
</del><ins>+-webkit-svg-shadow [LegacyStyleBuilder]
</ins><span class="cx">
</span><del>-cx [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
-cy [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
-r [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
-rx [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
-ry [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
-x [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
-y [NewStyleBuilder, Initial=initialZeroLength, Converter=Length]
</del><ins>+cx [Initial=initialZeroLength, Converter=Length]
+cy [Initial=initialZeroLength, Converter=Length]
+r [Initial=initialZeroLength, Converter=Length]
+rx [Initial=initialZeroLength, Converter=Length]
+ry [Initial=initialZeroLength, Converter=Length]
+x [Initial=initialZeroLength, Converter=Length]
+y [Initial=initialZeroLength, Converter=Length]
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (176490 => 176491)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2014-11-22 01:22:41 UTC (rev 176490)
+++ trunk/Source/WebCore/css/makeprop.pl 2014-11-22 01:26:46 UTC (rev 176491)
</span><span class="lines">@@ -41,10 +41,8 @@
</span><span class="cx"> my $numPredefinedProperties = 1;
</span><span class="cx"> my @names = ();
</span><span class="cx"> my %nameIsInherited;
</span><del>-# FIXME: Eventually all properties should use the new style builder and the following
-# variable should go away.
-my %propertiesUsingNewStyleBuilder;
-my %newStyleBuilderOptions = (
</del><ins>+my %propertiesWithStyleBuilderOptions;
+my %styleBuilderOptions = (
</ins><span class="cx"> Converter => 1, # Defined in Source/WebCore/css/StyleBuilderConverter.h
</span><span class="cx"> Custom => 1,
</span><span class="cx"> Getter => 1,
</span><span class="lines">@@ -79,17 +77,20 @@
</span><span class="cx"> push @aliases, $_;
</span><span class="cx"> } else {
</span><span class="cx"> $nameIsInherited{$_} = 0;
</span><ins>+ my $isUsingLegacyStyleBuilder = 0;
+ $propertiesWithStyleBuilderOptions{$_} = {};
</ins><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 "NewStyleBuilder") {
</del><ins>+ } elsif ($optionName eq "LegacyStyleBuilder") {
</ins><span class="cx"> # FIXME: This is temporary. Eventually, all properties will use the new
</span><span class="cx"> # style builder and this option will go away.
</span><del>- $propertiesUsingNewStyleBuilder{$_} = {};
- } elsif ($newStyleBuilderOptions{$optionName}) {
- die "\"" . $optionName . "\" option was used without \"NewStyleBuilder\" option for " . $_ . " property." if not exists($propertiesUsingNewStyleBuilder{$_});
- $propertiesUsingNewStyleBuilder{$_}{$optionName} = $optionValue;
</del><ins>+ $isUsingLegacyStyleBuilder = 1;
+ delete $propertiesWithStyleBuilderOptions{$_};
+ } elsif ($styleBuilderOptions{$optionName}) {
+ die "\"" . $optionName . "\" option was used with \"LegacyStyleBuilder\" option for " . $_ . " property." if $isUsingLegacyStyleBuilder;
+ $propertiesWithStyleBuilderOptions{$_}{$optionName} = $optionValue;
</ins><span class="cx"> } else {
</span><span class="cx"> die "Unrecognized \"" . $optionName . "\" option for " . $_ . " property.";
</span><span class="cx"> }
</span><span class="lines">@@ -330,29 +331,29 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><del>- # Skip properties not using the new style builder yet.
- next unless exists($propertiesUsingNewStyleBuilder{$name});
</del><ins>+ # Skip properties still using the legacy style builder.
+ next unless exists($propertiesWithStyleBuilderOptions{$name});
</ins><span class="cx">
</span><span class="cx"> my $nameForMethods = $nameToId{$name};
</span><span class="cx"> $nameForMethods =~ s/Webkit//g;
</span><del>- if (exists($propertiesUsingNewStyleBuilder{$name}{"NameForMethods"})) {
- $nameForMethods = $propertiesUsingNewStyleBuilder{$name}{"NameForMethods"};
</del><ins>+ if (exists($propertiesWithStyleBuilderOptions{$name}{"NameForMethods"})) {
+ $nameForMethods = $propertiesWithStyleBuilderOptions{$name}{"NameForMethods"};
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!exists($propertiesUsingNewStyleBuilder{$name}{"TypeName"})) {
- $propertiesUsingNewStyleBuilder{$name}{"TypeName"} = "E" . $nameForMethods;
</del><ins>+ if (!exists($propertiesWithStyleBuilderOptions{$name}{"TypeName"})) {
+ $propertiesWithStyleBuilderOptions{$name}{"TypeName"} = "E" . $nameForMethods;
</ins><span class="cx"> }
</span><del>- if (!exists($propertiesUsingNewStyleBuilder{$name}{"Getter"})) {
- $propertiesUsingNewStyleBuilder{$name}{"Getter"} = lcfirst($nameForMethods);
</del><ins>+ if (!exists($propertiesWithStyleBuilderOptions{$name}{"Getter"})) {
+ $propertiesWithStyleBuilderOptions{$name}{"Getter"} = lcfirst($nameForMethods);
</ins><span class="cx"> }
</span><del>- if (!exists($propertiesUsingNewStyleBuilder{$name}{"Setter"})) {
- $propertiesUsingNewStyleBuilder{$name}{"Setter"} = "set" . $nameForMethods;
</del><ins>+ if (!exists($propertiesWithStyleBuilderOptions{$name}{"Setter"})) {
+ $propertiesWithStyleBuilderOptions{$name}{"Setter"} = "set" . $nameForMethods;
</ins><span class="cx"> }
</span><del>- if (!exists($propertiesUsingNewStyleBuilder{$name}{"Initial"})) {
- $propertiesUsingNewStyleBuilder{$name}{"Initial"} = "initial" . $nameForMethods;
</del><ins>+ if (!exists($propertiesWithStyleBuilderOptions{$name}{"Initial"})) {
+ $propertiesWithStyleBuilderOptions{$name}{"Initial"} = "initial" . $nameForMethods;
</ins><span class="cx"> }
</span><del>- if (!exists($propertiesUsingNewStyleBuilder{$name}{"Custom"})) {
- $propertiesUsingNewStyleBuilder{$name}{"Custom"} = "None";
</del><ins>+ if (!exists($propertiesWithStyleBuilderOptions{$name}{"Custom"})) {
+ $propertiesWithStyleBuilderOptions{$name}{"Custom"} = "None";
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -376,28 +377,28 @@
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><del>- # Skip properties not using the new style builder yet.
- next unless exists($propertiesUsingNewStyleBuilder{$name});
</del><ins>+ # Skip properties still using the legacy style builder.
+ next unless exists($propertiesWithStyleBuilderOptions{$name});
</ins><span class="cx">
</span><del>- next if $propertiesUsingNewStyleBuilder{$name}{"Custom"} eq "All";
</del><ins>+ next if $propertiesWithStyleBuilderOptions{$name}{"Custom"} eq "All";
</ins><span class="cx">
</span><del>- my $setValue = "styleResolver.style()->" . $propertiesUsingNewStyleBuilder{$name}{"Setter"};
</del><ins>+ my $setValue = "styleResolver.style()->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
</ins><span class="cx"> print STYLEBUILDER " inline void applyInitial" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
</span><span class="cx"> print STYLEBUILDER " {\n";
</span><del>- print STYLEBUILDER " " . $setValue . "(RenderStyle::" . $propertiesUsingNewStyleBuilder{$name}{"Initial"} . "());\n";
</del><ins>+ print STYLEBUILDER " " . $setValue . "(RenderStyle::" . $propertiesWithStyleBuilderOptions{$name}{"Initial"} . "());\n";
</ins><span class="cx"> print STYLEBUILDER " }\n";
</span><span class="cx"> print STYLEBUILDER " inline void applyInherit" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
</span><span class="cx"> print STYLEBUILDER " {\n";
</span><del>- print STYLEBUILDER " " . $setValue . "(styleResolver.parentStyle()->" . $propertiesUsingNewStyleBuilder{$name}{"Getter"} . "());\n";
</del><ins>+ print STYLEBUILDER " " . $setValue . "(styleResolver.parentStyle()->" . $propertiesWithStyleBuilderOptions{$name}{"Getter"} . "());\n";
</ins><span class="cx"> print STYLEBUILDER " }\n";
</span><del>- if ($propertiesUsingNewStyleBuilder{$name}{"Custom"} ne "Value") {
</del><ins>+ if ($propertiesWithStyleBuilderOptions{$name}{"Custom"} ne "Value") {
</ins><span class="cx"> print STYLEBUILDER " inline void applyValue" . $nameToId{$name} . "(StyleResolver& styleResolver, CSSValue& value)\n";
</span><span class="cx"> print STYLEBUILDER " {\n";
</span><span class="cx"> my $convertedValue;
</span><del>- if (exists($propertiesUsingNewStyleBuilder{$name}{"Converter"})) {
- $convertedValue = "StyleBuilderConverter::convert" . $propertiesUsingNewStyleBuilder{$name}{"Converter"} . "(styleResolver, value)";
</del><ins>+ if (exists($propertiesWithStyleBuilderOptions{$name}{"Converter"})) {
+ $convertedValue = "StyleBuilderConverter::convert" . $propertiesWithStyleBuilderOptions{$name}{"Converter"} . "(styleResolver, value)";
</ins><span class="cx"> } else {
</span><del>- $convertedValue = "static_cast<" . $propertiesUsingNewStyleBuilder{$name}{"TypeName"} . ">(downcast<CSSPrimitiveValue>(value))";
</del><ins>+ $convertedValue = "static_cast<" . $propertiesWithStyleBuilderOptions{$name}{"TypeName"} . ">(downcast<CSSPrimitiveValue>(value))";
</ins><span class="cx"> }
</span><span class="cx"> print STYLEBUILDER " " . $setValue . "(" . $convertedValue . ");\n";
</span><span class="cx"> print STYLEBUILDER " }\n";
</span><span class="lines">@@ -413,8 +414,8 @@
</span><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><del>- # Skip properties not using the new style builder yet.
- next unless exists($propertiesUsingNewStyleBuilder{$name});
</del><ins>+ # Skip properties still using the legacy style builder.
+ next unless exists($propertiesWithStyleBuilderOptions{$name});
</ins><span class="cx">
</span><span class="cx"> print STYLEBUILDER " case CSSProperty" . $nameToId{$name} . ":\n";
</span><span class="cx"> print STYLEBUILDER " if (isInitial)\n";
</span></span></pre>
</div>
</div>
</body>
</html>