<!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>[177687] 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/177687">177687</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-23 10:37:21 -0800 (Tue, 23 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move color CSS properties to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139898
Reviewed by Antti Koivisto.
Move color CSS properties to the new StyleBuilder by teaching the
StyleBuilder generator how to handle them.
* css/CSSPropertyNames.in:
- Move color properties to the new StyleBuilder.
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::defaultInitialColor): Deleted.
(WebCore::ApplyPropertyColor::applyInheritValue): Deleted.
(WebCore::ApplyPropertyColor::applyInitialValue): Deleted.
(WebCore::ApplyPropertyColor::applyValue): Deleted.
(WebCore::ApplyPropertyColor::applyColorValue): Deleted.
(WebCore::ApplyPropertyColor::createHandler): Deleted.
- Drop color properties support from the DeprecatedStyleBuilder.
* css/makeprop.pl:
- Teach the StyleBuilder generator how to handle color properties.
- Use a class for StyleBuilderFunctions instead of a namespace so
that it can be made a friend of RenderStyle class.
* rendering/style/RenderStyle.h:
- Mark StyleBuilderFunctions class as friend as its functions
can set RenderStyle members directly. This is similar to what
is already done for StyleBuilderCustom class. The new color
properties handling calls private methods on RenderStyle.
- Mark invalidColor() method as static as it does not require
an instance.</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="#trunkSourceWebCorecssmakeproppl">trunk/Source/WebCore/css/makeprop.pl</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStyleh">trunk/Source/WebCore/rendering/style/RenderStyle.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177686 => 177687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-23 18:04:39 UTC (rev 177686)
+++ trunk/Source/WebCore/ChangeLog 2014-12-23 18:37:21 UTC (rev 177687)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-12-23 Chris Dumez <cdumez@apple.com>
+
+ Move color CSS properties to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139898
+
+ Reviewed by Antti Koivisto.
+
+ Move color CSS properties to the new StyleBuilder by teaching the
+ StyleBuilder generator how to handle them.
+
+ * css/CSSPropertyNames.in:
+ - Move color properties to the new StyleBuilder.
+
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::defaultInitialColor): Deleted.
+ (WebCore::ApplyPropertyColor::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyColor::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyColor::applyValue): Deleted.
+ (WebCore::ApplyPropertyColor::applyColorValue): Deleted.
+ (WebCore::ApplyPropertyColor::createHandler): Deleted.
+ - Drop color properties support from the DeprecatedStyleBuilder.
+
+ * css/makeprop.pl:
+ - Teach the StyleBuilder generator how to handle color properties.
+ - Use a class for StyleBuilderFunctions instead of a namespace so
+ that it can be made a friend of RenderStyle class.
+
+ * rendering/style/RenderStyle.h:
+ - Mark StyleBuilderFunctions class as friend as its functions
+ can set RenderStyle members directly. This is similar to what
+ is already done for StyleBuilderCustom class. The new color
+ properties handling calls private methods on RenderStyle.
+ - Mark invalidColor() method as static as it does not require
+ an instance.
+
</ins><span class="cx"> 2014-12-23 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Incorrect dashed and dotted border painting.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (177686 => 177687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-23 18:04:39 UTC (rev 177686)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-23 18:37:21 UTC (rev 177687)
</span><span class="lines">@@ -60,11 +60,23 @@
</span><span class="cx"> // * AutoFunctions:
</span><span class="cx"> // Indicates that this CSS property requires handling of "auto" and has
</span><span class="cx"> // corresponding hasAutoXXX() / setHasAutoXXX() methods on RenderStyle.
</span><ins>+//
+// * VisitedLinkColorSupport:
+// Indicates that this CSS property is a color property with a
+// "setVisitedLinkXXX()" setter on RenderStyle to be called when
+// StyleResolver::applyPropertyToVisitedLinkStyle() return true.
+// The regular setter on RenderStyle will only be called if
+// StyleResolver::applyPropertyToRegularStyle() returns true.
+//
+// * NoDefaultColor:
+// Should only with used with "VisitedLinkColorSupport". It indicates that for
+// setting the inherited value, it will not fallback to using the parent's
+// "color" property if the inherited color is invalid.
</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><del>-color [Inherited, LegacyStyleBuilder]
</del><ins>+color [Inherited, VisitedLinkColorSupport, NoDefaultColor]
</ins><span class="cx"> direction [Inherited, Custom=Value]
</span><span class="cx"> display [Custom=Inherit|Value]
</span><span class="cx"> font [Inherited, LegacyStyleBuilder]
</span><span class="lines">@@ -112,7 +124,7 @@
</span><span class="cx"> background-attachment [LegacyStyleBuilder]
</span><span class="cx"> background-blend-mode [LegacyStyleBuilder]
</span><span class="cx"> background-clip [LegacyStyleBuilder]
</span><del>-background-color [LegacyStyleBuilder]
</del><ins>+background-color [VisitedLinkColorSupport, Initial=invalidColor, NoDefaultColor]
</ins><span class="cx"> background-image [LegacyStyleBuilder]
</span><span class="cx"> background-origin [LegacyStyleBuilder]
</span><span class="cx"> background-position [LegacyStyleBuilder]
</span><span class="lines">@@ -124,7 +136,7 @@
</span><span class="cx"> background-size [LegacyStyleBuilder]
</span><span class="cx"> border [LegacyStyleBuilder]
</span><span class="cx"> border-bottom [LegacyStyleBuilder]
</span><del>-border-bottom-color [LegacyStyleBuilder]
</del><ins>+border-bottom-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> border-bottom-left-radius [Initial=initialBorderRadius, Converter=Radius]
</span><span class="cx"> -webkit-border-bottom-left-radius = border-bottom-left-radius
</span><span class="cx"> border-bottom-right-radius [Initial=initialBorderRadius, Converter=Radius]
</span><span class="lines">@@ -140,18 +152,18 @@
</span><span class="cx"> border-image-source [Converter=StyleImage<CSSPropertyBorderImageSource>]
</span><span class="cx"> border-image-width [Custom=All]
</span><span class="cx"> border-left [LegacyStyleBuilder]
</span><del>-border-left-color [LegacyStyleBuilder]
</del><ins>+border-left-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> border-left-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
</span><span class="cx"> border-left-width [Initial=initialBorderWidth, Converter=LineWidth<float>]
</span><span class="cx"> border-radius [LegacyStyleBuilder]
</span><span class="cx"> border-right [LegacyStyleBuilder]
</span><del>-border-right-color [LegacyStyleBuilder]
</del><ins>+border-right-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> border-right-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
</span><span class="cx"> border-right-width [Initial=initialBorderWidth, Converter=LineWidth<float>]
</span><span class="cx"> border-spacing [Inherited, LegacyStyleBuilder]
</span><span class="cx"> border-style [LegacyStyleBuilder]
</span><span class="cx"> border-top [LegacyStyleBuilder]
</span><del>-border-top-color [LegacyStyleBuilder]
</del><ins>+border-top-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> border-top-left-radius [Initial=initialBorderRadius, Converter=Radius]
</span><span class="cx"> -webkit-border-top-left-radius = border-top-left-radius
</span><span class="cx"> border-top-right-radius [Initial=initialBorderRadius, Converter=Radius]
</span><span class="lines">@@ -209,7 +221,7 @@
</span><span class="cx"> -webkit-opacity = opacity
</span><span class="cx"> orphans [Inherited, TypeName=short, AutoFunctions]
</span><span class="cx"> outline [LegacyStyleBuilder]
</span><del>-outline-color [LegacyStyleBuilder]
</del><ins>+outline-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> outline-offset [Converter=ComputedLength<int>]
</span><span class="cx"> outline-style [Custom=All]
</span><span class="cx"> outline-width [Converter=LineWidth<unsigned short>]
</span><span class="lines">@@ -351,7 +363,7 @@
</span><span class="cx"> -webkit-column-progression = column-progression
</span><span class="cx"> column-rule [LegacyStyleBuilder]
</span><span class="cx"> -webkit-column-rule = column-rule
</span><del>-column-rule-color [LegacyStyleBuilder]
</del><ins>+column-rule-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> -webkit-column-rule-color = column-rule-color
</span><span class="cx"> column-rule-style [TypeName=EBorderStyle, Initial=initialBorderStyle]
</span><span class="cx"> -webkit-column-rule-style = column-rule-style
</span><span class="lines">@@ -497,14 +509,14 @@
</span><span class="cx"> -webkit-text-decoration [LegacyStyleBuilder]
</span><span class="cx"> -webkit-text-decoration-line [NameForMethods=TextDecoration, Converter=TextDecoration]
</span><span class="cx"> -webkit-text-decoration-style [TypeName=TextDecorationStyle]
</span><del>--webkit-text-decoration-color [LegacyStyleBuilder]
</del><ins>+-webkit-text-decoration-color [VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> -webkit-text-decoration-skip [Inherited, Converter=TextDecorationSkip]
</span><span class="cx"> -webkit-text-underline-position [Inherited, Converter=TextUnderlinePosition]
</span><span class="cx"> -webkit-text-decorations-in-effect [Inherited, LegacyStyleBuilder]
</span><span class="cx"> -webkit-text-emphasis [Inherited, LegacyStyleBuilder]
</span><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, LegacyStyleBuilder]
</del><ins>+-webkit-text-emphasis-color [Inherited, VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> -epub-text-emphasis-color = -webkit-text-emphasis-color
</span><span class="cx"> text-emphasis-color = -webkit-text-emphasis-color
</span><span class="cx"> -webkit-text-emphasis-position [Inherited, Converter=TextEmphasisPosition]
</span><span class="lines">@@ -512,10 +524,10 @@
</span><span class="cx"> -webkit-text-emphasis-style [Inherited, Custom=All]
</span><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, LegacyStyleBuilder]
</del><ins>+-webkit-text-fill-color [Inherited, VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> -webkit-text-security [Inherited]
</span><span class="cx"> -webkit-text-stroke [Inherited, LegacyStyleBuilder]
</span><del>--webkit-text-stroke-color [Inherited, LegacyStyleBuilder]
</del><ins>+-webkit-text-stroke-color [Inherited, VisitedLinkColorSupport, Initial=invalidColor]
</ins><span class="cx"> -webkit-text-stroke-width [Inherited, Converter=TextStrokeWidth]
</span><span class="cx"> -webkit-transform [Converter=Transform]
</span><span class="cx"> -webkit-transform-origin [LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (177686 => 177687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-23 18:04:39 UTC (rev 177686)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-23 18:37:21 UTC (rev 177687)
</span><span class="lines">@@ -41,56 +41,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-enum ColorInherit {NoInheritFromParent = 0, InheritFromParent};
-Color defaultInitialColor();
-Color defaultInitialColor() { return Color(); }
-template <ColorInherit inheritColorFromParent,
- Color (RenderStyle::*getterFunction)() const,
- void (RenderStyle::*setterFunction)(const Color&),
- void (RenderStyle::*visitedLinkSetterFunction)(const Color&),
- Color (RenderStyle::*defaultFunction)() const,
- Color (*initialFunction)() = &defaultInitialColor>
-class ApplyPropertyColor {
-public:
- static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- // Visited link style can never explicitly inherit from parent visited link style so no separate getters are needed.
- Color color = (styleResolver->parentStyle()->*getterFunction)();
- applyColorValue(styleResolver, color.isValid() ? color : (styleResolver->parentStyle()->*defaultFunction)());
- }
-
- static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- applyColorValue(styleResolver, initialFunction());
- }
-
- static void applyValue(CSSPropertyID propertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (!is<CSSPrimitiveValue>(*value))
- return;
-
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
- if (inheritColorFromParent && primitiveValue.getValueID() == CSSValueCurrentcolor)
- applyInheritValue(propertyID, styleResolver);
- else {
- if (styleResolver->applyPropertyToRegularStyle())
- (styleResolver->style()->*setterFunction)(styleResolver->colorFromPrimitiveValue(&primitiveValue));
- if (styleResolver->applyPropertyToVisitedLinkStyle())
- (styleResolver->style()->*visitedLinkSetterFunction)(styleResolver->colorFromPrimitiveValue(&primitiveValue, /* forVisitedLink */ true));
- }
- }
-
- static void applyColorValue(StyleResolver* styleResolver, const Color& color)
- {
- if (styleResolver->applyPropertyToRegularStyle())
- (styleResolver->style()->*setterFunction)(color);
- if (styleResolver->applyPropertyToVisitedLinkStyle())
- (styleResolver->style()->*visitedLinkSetterFunction)(color);
- }
-
- static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
</del><span class="cx"> template <typename T>
</span><span class="cx"> struct FillLayerAccessorTypes {
</span><span class="cx"> typedef T Setter;
</span><span class="lines">@@ -534,7 +484,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundAttachment, ApplyPropertyFillLayer<EFillAttachment, CSSPropertyBackgroundAttachment, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isAttachmentSet, &FillLayer::attachment, &FillLayer::setAttachment, &FillLayer::clearAttachment, &FillLayer::initialFillAttachment, &CSSToStyleMap::mapFillAttachment>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundBlendMode, ApplyPropertyFillLayer<BlendMode, CSSPropertyBackgroundBlendMode, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isBlendModeSet, &FillLayer::blendMode, &FillLayer::setBlendMode, &FillLayer::clearBlendMode, &FillLayer::initialFillBlendMode, &CSSToStyleMap::mapFillBlendMode>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundClip, ApplyPropertyFillLayer<EFillBox, CSSPropertyBackgroundClip, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isClipSet, &FillLayer::clip, &FillLayer::setClip, &FillLayer::clearClip, &FillLayer::initialFillClip, &CSSToStyleMap::mapFillClip>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBackgroundColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::backgroundColor, &RenderStyle::setBackgroundColor, &RenderStyle::setVisitedLinkBackgroundColor, &RenderStyle::invalidColor>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBackgroundImage, ApplyPropertyFillLayer<StyleImage*, CSSPropertyBackgroundImage, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isImageSet, &FillLayer::image, &FillLayer::setImage, &FillLayer::clearImage, &FillLayer::initialFillImage, &CSSToStyleMap::mapFillImage>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundOrigin, ApplyPropertyFillLayer<EFillBox, CSSPropertyBackgroundOrigin, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isOriginSet, &FillLayer::origin, &FillLayer::setOrigin, &FillLayer::clearOrigin, &FillLayer::initialFillOrigin, &CSSToStyleMap::mapFillOrigin>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundPositionX, ApplyPropertyFillLayer<Length, CSSPropertyBackgroundPositionX, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isXPositionSet, &FillLayer::xPosition, &FillLayer::setXPosition, &FillLayer::clearXPosition, &FillLayer::initialFillXPosition, &CSSToStyleMap::mapFillXPosition>::createHandler());
</span><span class="lines">@@ -542,16 +491,9 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundRepeatX, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyBackgroundRepeatX, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isRepeatXSet, &FillLayer::repeatX, &FillLayer::setRepeatX, &FillLayer::clearRepeatX, &FillLayer::initialFillRepeatX, &CSSToStyleMap::mapFillRepeatX>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundRepeatY, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyBackgroundRepeatY, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &CSSToStyleMap::mapFillRepeatY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBackgroundSize, ApplyPropertyFillLayer<FillSize, CSSPropertyBackgroundSize, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSToStyleMap::mapFillSize>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderBottomColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderBottomColor, &RenderStyle::setBorderBottomColor, &RenderStyle::setVisitedLinkBorderBottomColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyBorderLeftColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyBorderRightColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderRightColor, &RenderStyle::setBorderRightColor, &RenderStyle::setVisitedLinkBorderRightColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyBorderTopColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderTopColor, &RenderStyle::setBorderTopColor, &RenderStyle::setVisitedLinkBorderTopColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::color, &RenderStyle::setColor, &RenderStyle::setVisitedLinkColor, &RenderStyle::invalidColor, RenderStyle::initialColor>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont<FontItalic, &FontDescription::italic, &FontDescription::setItalic, FontItalicOff>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont<FontSmallCaps, &FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
</span><span class="cx">
</span><span class="cx"> setPropertyHandler(CSSPropertyAnimationDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span><span class="lines">@@ -575,7 +517,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundComposite, ApplyPropertyFillLayer<CompositeOperator, CSSPropertyWebkitBackgroundComposite, BackgroundFillLayer, &RenderStyle::accessBackgroundLayers, &RenderStyle::backgroundLayers, &FillLayer::isCompositeSet, &FillLayer::composite, &FillLayer::setComposite, &FillLayer::clearComposite, &FillLayer::initialFillComposite, &CSSToStyleMap::mapFillComposite>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundOrigin, CSSPropertyBackgroundOrigin);
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitBackgroundSize, CSSPropertyBackgroundSize);
</span><del>- setPropertyHandler(CSSPropertyColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontKerning, ApplyPropertyFont<FontDescription::Kerning, &FontDescription::kerning, &FontDescription::setKerning, FontDescription::AutoKerning>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontSmoothing, ApplyPropertyFont<FontSmoothingMode, &FontDescription::fontSmoothing, &FontDescription::setFontSmoothing, AutoSmoothing>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitFontVariantLigatures, ApplyPropertyFontVariantLigatures::createHandler());
</span><span class="lines">@@ -588,9 +529,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskRepeatY, ApplyPropertyFillLayer<EFillRepeat, CSSPropertyWebkitMaskRepeatY, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isRepeatYSet, &FillLayer::repeatY, &FillLayer::setRepeatY, &FillLayer::clearRepeatY, &FillLayer::initialFillRepeatY, &CSSToStyleMap::mapFillRepeatY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskSize, ApplyPropertyFillLayer<FillSize, CSSPropertyWebkitMaskSize, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isSizeSet, &FillLayer::size, &FillLayer::setSize, &FillLayer::clearSize, &FillLayer::initialFillSize, &CSSToStyleMap::mapFillSize>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskSourceType, ApplyPropertyFillLayer<EMaskSourceType, CSSPropertyWebkitMaskSourceType, MaskFillLayer, &RenderStyle::accessMaskLayers, &RenderStyle::maskLayers, &FillLayer::isMaskSourceTypeSet, &FillLayer::maskSourceType, &FillLayer::setMaskSourceType, &FillLayer::clearMaskSourceType, &FillLayer::initialMaskSourceType, &CSSToStyleMap::mapFillMaskSourceType>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitTextEmphasisColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyWebkitTextFillColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::setVisitedLinkTextFillColor, &RenderStyle::color>::createHandler());
- setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionDuration, ApplyPropertyAnimation<double, &Animation::duration, &Animation::setDuration, &Animation::isDurationSet, &Animation::clearDuration, &Animation::initialAnimationDuration, &CSSToStyleMap::mapAnimationDuration, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTransitionProperty, ApplyPropertyAnimation<CSSPropertyID, &Animation::property, &Animation::setProperty, &Animation::isPropertySet, &Animation::clearProperty, &Animation::initialAnimationProperty, &CSSToStyleMap::mapAnimationProperty, &RenderStyle::accessTransitions, &RenderStyle::transitions>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssmakeproppl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/makeprop.pl (177686 => 177687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/makeprop.pl 2014-12-23 18:04:39 UTC (rev 177686)
+++ trunk/Source/WebCore/css/makeprop.pl 2014-12-23 18:37:21 UTC (rev 177687)
</span><span class="lines">@@ -49,8 +49,10 @@
</span><span class="cx"> Getter => 1,
</span><span class="cx"> Initial => 1,
</span><span class="cx"> NameForMethods => 1,
</span><ins>+ NoDefaultColor => 1,
</ins><span class="cx"> Setter => 1,
</span><span class="cx"> TypeName => 1,
</span><ins>+ VisitedLinkColorSupport => 1,
</ins><span class="cx"> );
</span><span class="cx"> my %nameToId;
</span><span class="cx"> my @aliases = ();
</span><span class="lines">@@ -363,6 +365,13 @@
</span><span class="cx"> return $renderStyle . "->setHasAuto" . getNameForMethods($name) . "()";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub getVisitedLinkSetter {
+ my $name = shift;
+ my $renderStyle = shift;
+
+ return $renderStyle . "->setVisitedLink" . getNameForMethods($name);
+}
+
</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">@@ -394,16 +403,66 @@
</span><span class="cx"> $propertiesWithStyleBuilderOptions{$name}{"Custom"} = \%customValues;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+use constant {
+ NOT_FOR_VISITED_LINK => 0,
+ FOR_VISITED_LINK => 1,
+};
+
+sub colorFromPrimitiveValue {
+ my $primitiveValue = shift;
+ my $forVisitedLink = @_ ? shift : NOT_FOR_VISITED_LINK;
+
+ return "styleResolver.colorFromPrimitiveValue(&" . $primitiveValue . ", /* forVisitedLink */ " . ($forVisitedLink ? "true" : "false") . ")";
+}
+
+use constant {
+ VALUE_IS_COLOR => 0,
+ VALUE_IS_PRIMITIVE => 1,
+};
+
+sub generateColorValueSetter {
+ my $name = shift;
+ my $value = shift;
+ my $indent = shift;
+ my $valueIsPrimitive = @_ ? shift : VALUE_IS_COLOR;
+
+ my $style = "styleResolver.style()";
+ my $setterContent .= $indent . "if (styleResolver.applyPropertyToRegularStyle())\n";
+ my $setValue = $style . "->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
+ my $color = $valueIsPrimitive ? colorFromPrimitiveValue($value) : $value;
+ $setterContent .= $indent . " " . $setValue . "(" . $color . ");\n";
+ $setterContent .= $indent . "if (styleResolver.applyPropertyToVisitedLinkStyle())\n";
+ $color = $valueIsPrimitive ? colorFromPrimitiveValue($value, FOR_VISITED_LINK) : $value;
+ $setterContent .= $indent . " " . getVisitedLinkSetter($name, $style) . "(" . $color . ");\n";
+
+ return $setterContent;
+}
+
+sub handleCurrentColorValue {
+ my $name = shift;
+ my $primitiveValue = shift;
+ my $indent = shift;
+
+ my $code = $indent . "if (" . $primitiveValue . ".getValueID() == CSSValueCurrentcolor) {\n";
+ $code .= $indent . " applyInherit" . $nameToId{$name} . "(styleResolver);\n";
+ $code .= $indent . " return;\n";
+ $code .= $indent . "}\n";
+ return $code;
+}
+
</ins><span class="cx"> sub generateInitialValueSetter {
</span><span class="cx"> my $name = shift;
</span><span class="cx"> my $indent = shift;
</span><span class="cx">
</span><span class="cx"> my $setterContent = "";
</span><del>- $setterContent .= $indent . "inline void applyInitial" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
</del><ins>+ $setterContent .= $indent . "static void applyInitial" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
</ins><span class="cx"> $setterContent .= $indent . "{\n";
</span><span class="cx"> my $style = "styleResolver.style()";
</span><span class="cx"> if (exists $propertiesWithStyleBuilderOptions{$name}{"AutoFunctions"}) {
</span><span class="cx"> $setterContent .= $indent . " " . getAutoSetter($name, $style) . ";\n";
</span><ins>+ } elsif (exists $propertiesWithStyleBuilderOptions{$name}{"VisitedLinkColorSupport"}) {
+ my $initialColor = "RenderStyle::" . $propertiesWithStyleBuilderOptions{$name}{"Initial"} . "()";
+ $setterContent .= generateColorValueSetter($name, $initialColor, $indent . " ");
</ins><span class="cx"> } else {
</span><span class="cx"> my $setValue = $style . "->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
</span><span class="cx"> $setterContent .= $indent . " " . $setValue . "(RenderStyle::" . $propertiesWithStyleBuilderOptions{$name}{"Initial"} . "());\n";
</span><span class="lines">@@ -418,18 +477,30 @@
</span><span class="cx"> my $indent = shift;
</span><span class="cx">
</span><span class="cx"> my $setterContent = "";
</span><del>- $setterContent .= $indent . "inline void applyInherit" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
</del><ins>+ $setterContent .= $indent . "static void applyInherit" . $nameToId{$name} . "(StyleResolver& styleResolver)\n";
</ins><span class="cx"> $setterContent .= $indent . "{\n";
</span><span class="cx"> my $parentStyle = "styleResolver.parentStyle()";
</span><span class="cx"> my $style = "styleResolver.style()";
</span><ins>+ my $setValue = $style . "->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
+ my $didCallSetValue = 0;
</ins><span class="cx"> if (exists $propertiesWithStyleBuilderOptions{$name}{"AutoFunctions"}) {
</span><span class="cx"> $setterContent .= $indent . " if (" . getAutoGetter($name, $parentStyle) . ") {\n";
</span><span class="cx"> $setterContent .= $indent . " " . getAutoSetter($name, $style) . ";\n";
</span><span class="cx"> $setterContent .= $indent . " return;\n";
</span><span class="cx"> $setterContent .= $indent . " }\n";
</span><ins>+ } elsif (exists $propertiesWithStyleBuilderOptions{$name}{"VisitedLinkColorSupport"}) {
+ $setterContent .= $indent . " Color color = " . $parentStyle . "->" . $propertiesWithStyleBuilderOptions{$name}{"Getter"} . "();\n";
+ if (!exists($propertiesWithStyleBuilderOptions{$name}{"NoDefaultColor"})) {
+ $setterContent .= $indent . " if (!color.isValid())\n";
+ $setterContent .= $indent . " color = " . $parentStyle . "->color();\n";
+ }
+ $setterContent .= generateColorValueSetter($name, "color", $indent . " ");
+ $didCallSetValue = 1;
</ins><span class="cx"> }
</span><del>- my $setValue = $style . "->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
- $setterContent .= $indent . " " . $setValue . "(" . $parentStyle . "->" . $propertiesWithStyleBuilderOptions{$name}{"Getter"} . "());\n";
</del><ins>+ if (!$didCallSetValue) {
+ my $inheritedValue = $parentStyle . "->" . $propertiesWithStyleBuilderOptions{$name}{"Getter"} . "()";
+ $setterContent .= $indent . " " . $setValue . "(" . $inheritedValue . ");\n";
+ }
</ins><span class="cx"> $setterContent .= $indent . "}\n";
</span><span class="cx">
</span><span class="cx"> return $setterContent;
</span><span class="lines">@@ -440,7 +511,7 @@
</span><span class="cx"> my $indent = shift;
</span><span class="cx">
</span><span class="cx"> my $setterContent = "";
</span><del>- $setterContent .= $indent . "inline void applyValue" . $nameToId{$name} . "(StyleResolver& styleResolver, CSSValue& value)\n";
</del><ins>+ $setterContent .= $indent . "static void applyValue" . $nameToId{$name} . "(StyleResolver& styleResolver, CSSValue& value)\n";
</ins><span class="cx"> $setterContent .= $indent . "{\n";
</span><span class="cx"> my $convertedValue;
</span><span class="cx"> if (exists($propertiesWithStyleBuilderOptions{$name}{"Converter"})) {
</span><span class="lines">@@ -448,15 +519,27 @@
</span><span class="cx"> } else {
</span><span class="cx"> $convertedValue = "static_cast<" . $propertiesWithStyleBuilderOptions{$name}{"TypeName"} . ">(downcast<CSSPrimitiveValue>(value))";
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> my $style = "styleResolver.style()";
</span><ins>+ my $didCallSetValue = 0;
</ins><span class="cx"> if (exists $propertiesWithStyleBuilderOptions{$name}{"AutoFunctions"}) {
</span><span class="cx"> $setterContent .= $indent . " if (downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueAuto) {\n";
</span><span class="cx"> $setterContent .= $indent . " ". getAutoSetter($name, $style) . ";\n";
</span><span class="cx"> $setterContent .= $indent . " return;\n";
</span><span class="cx"> $setterContent .= $indent . " }\n";
</span><ins>+ } elsif (exists $propertiesWithStyleBuilderOptions{$name}{"VisitedLinkColorSupport"}) {
+ $setterContent .= $indent . " auto& primitiveValue = downcast<CSSPrimitiveValue>(value);\n";
+ if ($name eq "color") {
+ # The "color" property supports "currentColor" value. We should add a parameter.
+ $setterContent .= handleCurrentColorValue($name, "primitiveValue", $indent . " ");
+ }
+ $setterContent .= generateColorValueSetter($name, "primitiveValue", $indent . " ", VALUE_IS_PRIMITIVE);
+ $didCallSetValue = 1;
</ins><span class="cx"> }
</span><del>- my $setValue = $style . "->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
- $setterContent .= $indent . " " . $setValue . "(" . $convertedValue . ");\n";
</del><ins>+ if (!$didCallSetValue) {
+ my $setValue = $style . "->" . $propertiesWithStyleBuilderOptions{$name}{"Setter"};
+ $setterContent .= $indent . " " . $setValue . "(" . $convertedValue . ");\n";
+ }
</ins><span class="cx"> $setterContent .= $indent . "}\n";
</span><span class="cx">
</span><span class="cx"> return $setterContent;
</span><span class="lines">@@ -478,7 +561,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-namespace StyleBuilderFunctions {
</del><ins>+class StyleBuilderFunctions {
+public:
</ins><span class="cx"> EOF
</span><span class="cx">
</span><span class="cx"> foreach my $name (@names) {
</span><span class="lines">@@ -498,7 +582,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> print STYLEBUILDER << "EOF";
</span><del>-} // namespace StyleBuilderFunctions
</del><ins>+};
</ins><span class="cx">
</span><span class="cx"> bool StyleBuilder::applyProperty(CSSPropertyID property, StyleResolver& styleResolver, CSSValue& value, bool isInitial, bool isInherit)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (177686 => 177687)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-12-23 18:04:39 UTC (rev 177686)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h 2014-12-23 18:37:21 UTC (rev 177687)
</span><span class="lines">@@ -130,6 +130,7 @@
</span><span class="cx"> friend class RenderSVGResource; // FIXME: Needs to alter the visited state by hand. Should clean the SVG code up and move it into RenderStyle perhaps.
</span><span class="cx"> friend class RenderTreeAsText; // FIXME: Only needed so the render tree can keep lying and dump the wrong colors. Rebaselining would allow this to be yanked.
</span><span class="cx"> friend class StyleBuilderCustom; // Sets members directly.
</span><ins>+ friend class StyleBuilderFunctions; // Sets members directly.
</ins><span class="cx"> friend class StyleResolver; // Sets members directly.
</span><span class="cx">
</span><span class="cx"> public:
</span><span class="lines">@@ -2082,7 +2083,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Color accessors are all private to make sure callers use visitedDependentColor instead to access them.
</span><del>- Color invalidColor() const { static Color invalid; return invalid; }
</del><ins>+ static Color invalidColor() { static Color invalid; return invalid; }
</ins><span class="cx"> Color borderLeftColor() const { return surround->border.left().color(); }
</span><span class="cx"> Color borderRightColor() const { return surround->border.right().color(); }
</span><span class="cx"> Color borderTopColor() const { return surround->border.top().color(); }
</span></span></pre>
</div>
</div>
</body>
</html>