<!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>[176721] 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/176721">176721</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-03 06:46:15 -0800 (Wed, 03 Dec 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move 'display' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139218

Reviewed by Antti Koivisto.

Move 'display' CSS property to the new StyleBuilder.

No new tests, no behavior change.

* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyDisplay::isValidDisplayValue): Deleted.
(WebCore::ApplyPropertyDisplay::applyInheritValue): Deleted.
(WebCore::ApplyPropertyDisplay::applyInitialValue): Deleted.
(WebCore::ApplyPropertyDisplay::applyValue): Deleted.
(WebCore::ApplyPropertyDisplay::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::isValidDisplayValue):
(WebCore::StyleBuilderCustom::applyInheritDisplay):
(WebCore::StyleBuilderCustom::applyValueDisplay):
* css/makeprop.pl:
Add support for passing multiple values for Custom option, e.g.:
'Custom=Inherit|Value'. This was useful as we did not need custom
code for display's initial value.</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="#trunkSourceWebCorecssDeprecatedStyleBuildercpp">trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</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 (176720 => 176721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-12-03 14:39:25 UTC (rev 176720)
+++ trunk/Source/WebCore/ChangeLog        2014-12-03 14:46:15 UTC (rev 176721)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-12-03  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Move 'display' CSS property to the new StyleBuilder
+        https://bugs.webkit.org/show_bug.cgi?id=139218
+
+        Reviewed by Antti Koivisto.
+
+        Move 'display' CSS property to the new StyleBuilder.
+
+        No new tests, no behavior change.
+
+        * css/CSSPropertyNames.in:
+        * css/DeprecatedStyleBuilder.cpp:
+        (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+        (WebCore::ApplyPropertyDisplay::isValidDisplayValue): Deleted.
+        (WebCore::ApplyPropertyDisplay::applyInheritValue): Deleted.
+        (WebCore::ApplyPropertyDisplay::applyInitialValue): Deleted.
+        (WebCore::ApplyPropertyDisplay::applyValue): Deleted.
+        (WebCore::ApplyPropertyDisplay::createHandler): Deleted.
+        * css/StyleBuilderCustom.h:
+        (WebCore::StyleBuilderCustom::isValidDisplayValue):
+        (WebCore::StyleBuilderCustom::applyInheritDisplay):
+        (WebCore::StyleBuilderCustom::applyValueDisplay):
+        * css/makeprop.pl:
+        Add support for passing multiple values for Custom option, e.g.:
+        'Custom=Inherit|Value'. This was useful as we did not need custom
+        code for display's initial value.
+
+2014-12-03  Chris Dumez  &lt;cdumez@apple.com&gt;
+
</ins><span class="cx">         Modernize the CSSParser code
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=139209
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (176720 => 176721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in        2014-12-03 14:39:25 UTC (rev 176720)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in        2014-12-03 14:46:15 UTC (rev 176721)
</span><span class="lines">@@ -44,20 +44,25 @@
</span><span class="cx"> // can indicate that a Converter helper function in
</span><span class="cx"> // css/StyleBuilderConverter.h should be used.
</span><span class="cx"> //
</span><del>-// * Custom=[Value|All]:
</del><ins>+// * Custom=[Initial|Value|Inherit|All]:
+// Custom=Initial option is used to indicate that the CSS property requires
+// special handling to set its initial value.
+// Custom=Inherit option is used to indicate that the CSS property requires
+// special handling to set its inherit value.
</ins><span class="cx"> // Custom=Value option is used to indicate that the CSS property requires special
</span><span class="cx"> // handling to set its value, and a regular Converter helper cannot be
</span><span class="cx"> // used. The Custom code for the property should be located in
</span><span class="cx"> // css/StyleBuilderCustom.h and named applyValue[CSSPropertyName]().
</span><span class="cx"> // If special handling is also needed to apply inherit or initial value, use
</span><del>-// Custom=All.
</del><ins>+// Custom=All. Alternatively, several '|'-separated options can be passed:
+// e.g. 'Custom=Inherit|Value&quot;.
</ins><span class="cx"> 
</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><span class="cx"> color [Inherited, LegacyStyleBuilder]
</span><span class="cx"> direction [Inherited, Custom=Value]
</span><del>-display [LegacyStyleBuilder]
</del><ins>+display [Custom=Inherit|Value]
</ins><span class="cx"> font [Inherited, LegacyStyleBuilder]
</span><span class="cx"> font-family [Inherited, Custom=All]
</span><span class="cx"> font-size [Inherited, LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (176720 => 176721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp        2014-12-03 14:39:25 UTC (rev 176720)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp        2014-12-03 14:46:15 UTC (rev 176721)
</span><span class="lines">@@ -967,47 +967,6 @@
</span><span class="cx">     }
</span><span class="cx"> };
</span><span class="cx"> 
</span><del>-class ApplyPropertyDisplay {
-private:
-    static inline bool isValidDisplayValue(StyleResolver* styleResolver, EDisplay displayPropertyValue)
-    {
-        if (styleResolver-&gt;element() &amp;&amp; styleResolver-&gt;element()-&gt;isSVGElement() &amp;&amp; styleResolver-&gt;style()-&gt;styleType() == NOPSEUDO)
-            return (displayPropertyValue == INLINE || displayPropertyValue == BLOCK || displayPropertyValue == NONE);
-        return true;
-    }
-public:
-    static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        EDisplay display = styleResolver-&gt;parentStyle()-&gt;display();
-        if (!isValidDisplayValue(styleResolver, display))
-            return;
-        styleResolver-&gt;style()-&gt;setDisplay(display);
-    }
-
-    static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
-    {
-        styleResolver-&gt;style()-&gt;setDisplay(RenderStyle::initialDisplay());
-    }
-
-    static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
-    {
-        if (!is&lt;CSSPrimitiveValue&gt;(*value))
-            return;
-
-        EDisplay display = downcast&lt;CSSPrimitiveValue&gt;(*value);
-
-        if (!isValidDisplayValue(styleResolver, display))
-            return;
-
-        styleResolver-&gt;style()-&gt;setDisplay(display);
-    }
-
-    static PropertyHandler createHandler()
-    {
-        return PropertyHandler(&amp;applyInheritValue, &amp;applyInitialValue, &amp;applyValue);
-    }
-};
-
</del><span class="cx"> const DeprecatedStyleBuilder&amp; DeprecatedStyleBuilder::sharedStyleBuilder()
</span><span class="cx"> {
</span><span class="cx">     static NeverDestroyed&lt;DeprecatedStyleBuilder&gt; styleBuilderInstance;
</span><span class="lines">@@ -1039,7 +998,6 @@
</span><span class="cx">     setPropertyHandler(CSSPropertyCounterIncrement, ApplyPropertyCounter&lt;Increment&gt;::createHandler());
</span><span class="cx">     setPropertyHandler(CSSPropertyCounterReset, ApplyPropertyCounter&lt;Reset&gt;::createHandler());
</span><span class="cx">     setPropertyHandler(CSSPropertyCursor, ApplyPropertyCursor::createHandler());
</span><del>-    setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler());
</del><span class="cx">     setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler());
</span><span class="cx">     setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont&lt;FontItalic, &amp;FontDescription::italic, &amp;FontDescription::setItalic, FontItalicOff&gt;::createHandler());
</span><span class="cx">     setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont&lt;FontSmallCaps, &amp;FontDescription::smallCaps, &amp;FontDescription::setSmallCaps, FontSmallCapsOff&gt;::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (176720 => 176721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h        2014-12-03 14:39:25 UTC (rev 176720)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h        2014-12-03 14:46:15 UTC (rev 176721)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include &quot;Frame.h&quot;
</span><span class="cx"> #include &quot;LocaleToScriptMapping.h&quot;
</span><span class="cx"> #include &quot;Rect.h&quot;
</span><ins>+#include &quot;SVGElement.h&quot;
</ins><span class="cx"> #include &quot;StyleFontSizeFunctions.h&quot;
</span><span class="cx"> #include &quot;StyleResolver.h&quot;
</span><span class="cx"> 
</span><span class="lines">@@ -121,6 +122,9 @@
</span><span class="cx">     static void applyInheritFontFamily(StyleResolver&amp;);
</span><span class="cx">     static void applyValueFontFamily(StyleResolver&amp;, CSSValue&amp;);
</span><span class="cx"> 
</span><ins>+    static void applyInheritDisplay(StyleResolver&amp;);
+    static void applyValueDisplay(StyleResolver&amp;, CSSValue&amp;);
+
</ins><span class="cx"> private:
</span><span class="cx">     static void resetEffectiveZoom(StyleResolver&amp;);
</span><span class="cx">     static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(StyleResolver&amp;);
</span><span class="lines">@@ -132,6 +136,7 @@
</span><span class="cx"> 
</span><span class="cx">     template &lt;CSSPropertyID id&gt;
</span><span class="cx">     static void applyTextOrBoxShadowValue(StyleResolver&amp;, CSSValue&amp;);
</span><ins>+    static bool isValidDisplayValue(StyleResolver&amp;, EDisplay);
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> inline void StyleBuilderCustom::applyValueWebkitMarqueeIncrement(StyleResolver&amp; styleResolver, CSSValue&amp; value)
</span><span class="lines">@@ -980,6 +985,27 @@
</span><span class="cx">     styleResolver.setFontDescription(fontDescription);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline bool StyleBuilderCustom::isValidDisplayValue(StyleResolver&amp; styleResolver, EDisplay display)
+{
+    if (is&lt;SVGElement&gt;(styleResolver.element()) &amp;&amp; styleResolver.style()-&gt;styleType() == NOPSEUDO)
+        return display == INLINE || display == BLOCK || display == NONE;
+    return true;
+}
+
+inline void StyleBuilderCustom::applyInheritDisplay(StyleResolver&amp; styleResolver)
+{
+    EDisplay display = styleResolver.parentStyle()-&gt;display();
+    if (isValidDisplayValue(styleResolver, display))
+        styleResolver.style()-&gt;setDisplay(display);
+}
+
+inline void StyleBuilderCustom::applyValueDisplay(StyleResolver&amp; styleResolver, CSSValue&amp; value)
+{
+    EDisplay display = downcast&lt;CSSPrimitiveValue&gt;(value);
+    if (isValidDisplayValue(styleResolver, display))
+        styleResolver.style()-&gt;setDisplay(display);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx"> 
</span><span class="cx"> #endif // StyleBuilderCustom_h
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (176720 => 176721)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl        2014-12-03 14:39:25 UTC (rev 176720)
+++ trunk/Source/WebCore/css/makeprop.pl        2014-12-03 14:46:15 UTC (rev 176721)
</span><span class="lines">@@ -330,6 +330,13 @@
</span><span class="cx"> # StyleBuilder.cpp generator.
</span><span class="cx"> #
</span><span class="cx"> 
</span><ins>+sub getScopeForFunction {
+  my $name = shift;
+  my $builderFunction = shift;
+
+  return $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;}{$builderFunction} ? &quot;StyleBuilderCustom&quot; : &quot;StyleBuilderFunctions&quot;;
+}
+
</ins><span class="cx"> foreach my $name (@names) {
</span><span class="cx">   # Skip properties still using the legacy style builder.
</span><span class="cx">   next unless exists($propertiesWithStyleBuilderOptions{$name});
</span><span class="lines">@@ -353,8 +360,12 @@
</span><span class="cx">     $propertiesWithStyleBuilderOptions{$name}{&quot;Initial&quot;} = &quot;initial&quot; . $nameForMethods;
</span><span class="cx">   }
</span><span class="cx">   if (!exists($propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;})) {
</span><del>-    $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} = &quot;None&quot;;
</del><ins>+    $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} = &quot;&quot;;
+  } elsif ($propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} eq &quot;All&quot;) {
+    $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} = &quot;Initial|Inherit|Value&quot;;
</ins><span class="cx">   }
</span><ins>+  my %customValues = map { $_ =&gt; 1 } split(/\|/, $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;});
+  $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} = \%customValues;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> open STYLEBUILDER, &quot;&gt;StyleBuilder.cpp&quot; || die &quot;Could not open StyleBuilder.cpp for writing&quot;;
</span><span class="lines">@@ -380,18 +391,20 @@
</span><span class="cx">   # Skip properties still using the legacy style builder.
</span><span class="cx">   next unless exists($propertiesWithStyleBuilderOptions{$name});
</span><span class="cx"> 
</span><del>-  next if $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} eq &quot;All&quot;;
-
</del><span class="cx">   my $setValue = &quot;styleResolver.style()-&gt;&quot; . $propertiesWithStyleBuilderOptions{$name}{&quot;Setter&quot;};
</span><del>-  print STYLEBUILDER &quot;    inline void applyInitial&quot; . $nameToId{$name} . &quot;(StyleResolver&amp; styleResolver)\n&quot;;
-  print STYLEBUILDER &quot;    {\n&quot;;
-  print STYLEBUILDER &quot;        &quot; . $setValue . &quot;(RenderStyle::&quot; . $propertiesWithStyleBuilderOptions{$name}{&quot;Initial&quot;} . &quot;());\n&quot;;
-  print STYLEBUILDER &quot;    }\n&quot;;
-  print STYLEBUILDER &quot;    inline void applyInherit&quot; . $nameToId{$name} . &quot;(StyleResolver&amp; styleResolver)\n&quot;;
-  print STYLEBUILDER &quot;    {\n&quot;;
-  print STYLEBUILDER &quot;        &quot; . $setValue . &quot;(styleResolver.parentStyle()-&gt;&quot; .  $propertiesWithStyleBuilderOptions{$name}{&quot;Getter&quot;} . &quot;());\n&quot;;
-  print STYLEBUILDER &quot;    }\n&quot;;
-  if ($propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} ne &quot;Value&quot;) {
</del><ins>+  if (!$propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;}{&quot;Initial&quot;}) {
+    print STYLEBUILDER &quot;    inline void applyInitial&quot; . $nameToId{$name} . &quot;(StyleResolver&amp; styleResolver)\n&quot;;
+    print STYLEBUILDER &quot;    {\n&quot;;
+    print STYLEBUILDER &quot;        &quot; . $setValue . &quot;(RenderStyle::&quot; . $propertiesWithStyleBuilderOptions{$name}{&quot;Initial&quot;} . &quot;());\n&quot;;
+    print STYLEBUILDER &quot;    }\n&quot;;
+  }
+  if (!$propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;}{&quot;Inherit&quot;}) {
+    print STYLEBUILDER &quot;    inline void applyInherit&quot; . $nameToId{$name} . &quot;(StyleResolver&amp; styleResolver)\n&quot;;
+    print STYLEBUILDER &quot;    {\n&quot;;
+    print STYLEBUILDER &quot;        &quot; . $setValue . &quot;(styleResolver.parentStyle()-&gt;&quot; .  $propertiesWithStyleBuilderOptions{$name}{&quot;Getter&quot;} . &quot;());\n&quot;;
+    print STYLEBUILDER &quot;    }\n&quot;;
+  }
+  if (!$propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;}{&quot;Value&quot;}) {
</ins><span class="cx">     print STYLEBUILDER &quot;    inline void applyValue&quot; . $nameToId{$name} . &quot;(StyleResolver&amp; styleResolver, CSSValue&amp; value)\n&quot;;
</span><span class="cx">     print STYLEBUILDER &quot;    {\n&quot;;
</span><span class="cx">     my $convertedValue;
</span><span class="lines">@@ -417,16 +430,13 @@
</span><span class="cx">   # Skip properties still using the legacy style builder.
</span><span class="cx">   next unless exists($propertiesWithStyleBuilderOptions{$name});
</span><span class="cx"> 
</span><del>-  my $scope = $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} eq &quot;All&quot; ? &quot;StyleBuilderCustom&quot; : &quot;StyleBuilderFunctions&quot;;
-  my $valueScope = $propertiesWithStyleBuilderOptions{$name}{&quot;Custom&quot;} eq &quot;Value&quot; ? &quot;StyleBuilderCustom&quot; : $scope;
-
</del><span class="cx">   print STYLEBUILDER &quot;    case CSSProperty&quot; . $nameToId{$name} . &quot;:\n&quot;;
</span><span class="cx">   print STYLEBUILDER &quot;        if (isInitial)\n&quot;;
</span><del>-  print STYLEBUILDER &quot;            &quot; . $scope . &quot;::applyInitial&quot; . $nameToId{$name} . &quot;(styleResolver);\n&quot;;
</del><ins>+  print STYLEBUILDER &quot;            &quot; . getScopeForFunction($name, &quot;Initial&quot;) . &quot;::applyInitial&quot; . $nameToId{$name} . &quot;(styleResolver);\n&quot;;
</ins><span class="cx">   print STYLEBUILDER &quot;        else if (isInherit)\n&quot;;
</span><del>-  print STYLEBUILDER &quot;            &quot; . $scope . &quot;::applyInherit&quot; . $nameToId{$name} . &quot;(styleResolver);\n&quot;;
</del><ins>+  print STYLEBUILDER &quot;            &quot; . getScopeForFunction($name, &quot;Inherit&quot;) . &quot;::applyInherit&quot; . $nameToId{$name} . &quot;(styleResolver);\n&quot;;
</ins><span class="cx">   print STYLEBUILDER &quot;        else\n&quot;;
</span><del>-  print STYLEBUILDER &quot;            &quot; . $valueScope . &quot;::applyValue&quot; . $nameToId{$name} . &quot;(styleResolver, value);\n&quot;;
</del><ins>+  print STYLEBUILDER &quot;            &quot; . getScopeForFunction($name, &quot;Value&quot;) . &quot;::applyValue&quot; . $nameToId{$name} . &quot;(styleResolver, value);\n&quot;;
</ins><span class="cx">   print STYLEBUILDER &quot;        return true;\n&quot;;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>