<!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>[175222] 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/175222">175222</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-10-27 11:26:08 -0700 (Mon, 27 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move radius CSS properties to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=138087
Reviewed by Andreas Kling.
Move radius CSS properties from DeprecatedStyleBuilder to the new
StyleBuilder so that they are now generated from CSSPropertyNames.in.
No new tests, no behavior change.
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyBorderRadius::setValue): Deleted.
(WebCore::ApplyPropertyBorderRadius::applyValue): Deleted.
(WebCore::ApplyPropertyBorderRadius::createHandler): Deleted.
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertRadius):</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="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175221 => 175222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-10-27 18:06:31 UTC (rev 175221)
+++ trunk/Source/WebCore/ChangeLog 2014-10-27 18:26:08 UTC (rev 175222)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-10-27 Chris Dumez <cdumez@apple.com>
+
+ Move radius CSS properties to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=138087
+
+ Reviewed by Andreas Kling.
+
+ Move radius CSS properties from DeprecatedStyleBuilder to the new
+ StyleBuilder so that they are now generated from CSSPropertyNames.in.
+
+ No new tests, no behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyBorderRadius::setValue): Deleted.
+ (WebCore::ApplyPropertyBorderRadius::applyValue): Deleted.
+ (WebCore::ApplyPropertyBorderRadius::createHandler): Deleted.
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertRadius):
+
</ins><span class="cx"> 2014-10-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Shrink MathMLOperatorDictionary::dictionary table
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175221 => 175222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-10-27 18:06:31 UTC (rev 175221)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-10-27 18:26:08 UTC (rev 175222)
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx"> border
</span><span class="cx"> border-bottom
</span><span class="cx"> border-bottom-color
</span><del>-border-bottom-left-radius
</del><ins>+border-bottom-left-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-bottom-left-radius = border-bottom-left-radius
</span><del>-border-bottom-right-radius
</del><ins>+border-bottom-right-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-bottom-right-radius = border-bottom-right-radius
</span><span class="cx"> border-bottom-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</span><span class="cx"> border-bottom-width [NewStyleBuilder, Initial=initialBorderWidth, Converter=LineWidth<float>]
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> border-style
</span><span class="cx"> border-top
</span><span class="cx"> border-top-color
</span><del>-border-top-left-radius
</del><ins>+border-top-left-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-top-left-radius = border-top-left-radius
</span><del>-border-top-right-radius
</del><ins>+border-top-right-radius [NewStyleBuilder, Initial=initialBorderRadius, Converter=Radius]
</ins><span class="cx"> -webkit-border-top-right-radius = border-top-right-radius
</span><span class="cx"> border-top-style [NewStyleBuilder, TypeName=EBorderStyle, Initial=initialBorderStyle]
</span><span class="cx"> border-top-width [NewStyleBuilder, Initial=initialBorderWidth, Converter=LineWidth<float>]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175221 => 175222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-10-27 18:06:31 UTC (rev 175221)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-10-27 18:26:08 UTC (rev 175222)
</span><span class="lines">@@ -432,54 +432,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-template <const LengthSize& (RenderStyle::*getterFunction)() const, void (RenderStyle::*setterFunction)(LengthSize), LengthSize (*initialFunction)()>
-class ApplyPropertyBorderRadius {
-public:
- static void setValue(RenderStyle* style, LengthSize value) { (style->*setterFunction)(WTF::move(value)); }
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (!is<CSSPrimitiveValue>(*value))
- return;
-
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
- Pair* pair = primitiveValue.getPairValue();
- if (!pair || !pair->first() || !pair->second())
- return;
-
- CSSToLengthConversionData conversionData = styleResolver->state().cssToLengthConversionData();
- Length radiusWidth;
- if (pair->first()->isPercentage())
- radiusWidth = Length(pair->first()->getDoubleValue(), Percent);
- else if (pair->first()->isCalculatedPercentageWithLength())
- radiusWidth = Length(pair->first()->cssCalcValue()->createCalculationValue(conversionData));
- else
- radiusWidth = pair->first()->computeLength<Length>(conversionData);
-
- Length radiusHeight;
- if (pair->second()->isPercentage())
- radiusHeight = Length(pair->second()->getDoubleValue(), Percent);
- else if (pair->second()->isCalculatedPercentageWithLength())
- radiusHeight = Length(pair->second()->cssCalcValue()->createCalculationValue(conversionData));
- else
- radiusHeight = pair->second()->computeLength<Length>(conversionData);
-
- if (radiusWidth.isNegative() || radiusHeight.isNegative())
- return;
-
- if (radiusWidth.isZero() || radiusHeight.isZero()) {
- radiusWidth.setValue(Fixed, 0);
- radiusHeight.setValue(Fixed, 0);
- }
-
- setValue(styleResolver->style(), LengthSize(radiusWidth, radiusHeight));
- }
- static PropertyHandler createHandler()
- {
- PropertyHandler handler = ApplyPropertyDefaultBase<const LengthSize&, getterFunction, LengthSize, setterFunction, LengthSize, initialFunction>::createHandler();
- return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &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">@@ -2300,8 +2252,6 @@
</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><span class="cx"> setPropertyHandler(CSSPropertyBorderBottomColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderBottomColor, &RenderStyle::setBorderBottomColor, &RenderStyle::setVisitedLinkBorderBottomColor, &RenderStyle::color>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderBottomLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomLeftRadius, &RenderStyle::setBorderBottomLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
- setPropertyHandler(CSSPropertyBorderBottomRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderBottomRightRadius, &RenderStyle::setBorderBottomRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyBorderImageOutset, ApplyPropertyBorderImageModifier<BorderImage, Outset>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageRepeat, ApplyPropertyBorderImageModifier<BorderImage, Repeat>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderImageSlice, ApplyPropertyBorderImageModifier<BorderImage, Slice>::createHandler());
</span><span class="lines">@@ -2310,8 +2260,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderLeftColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderLeftColor, &RenderStyle::setBorderLeftColor, &RenderStyle::setVisitedLinkBorderLeftColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderRightColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderRightColor, &RenderStyle::setBorderRightColor, &RenderStyle::setVisitedLinkBorderRightColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyBorderTopColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::borderTopColor, &RenderStyle::setBorderTopColor, &RenderStyle::setVisitedLinkBorderTopColor, &RenderStyle::color>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyBorderTopLeftRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopLeftRadius, &RenderStyle::setBorderTopLeftRadius, &RenderStyle::initialBorderRadius>::createHandler());
- setPropertyHandler(CSSPropertyBorderTopRightRadius, ApplyPropertyBorderRadius<&RenderStyle::borderTopRightRadius, &RenderStyle::setBorderTopRightRadius, &RenderStyle::initialBorderRadius>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyClip, ApplyPropertyClip::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::color, &RenderStyle::setColor, &RenderStyle::setVisitedLinkColor, &RenderStyle::invalidColor, RenderStyle::initialColor>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyCounterIncrement, ApplyPropertyCounter<Increment>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (175221 => 175222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-10-27 18:06:31 UTC (rev 175221)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-10-27 18:26:08 UTC (rev 175222)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "CSSCalculationValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "Length.h"
</span><ins>+#include "Pair.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -43,6 +44,10 @@
</span><span class="cx"> template <typename T> static T convertComputedLength(StyleResolver&, CSSValue&);
</span><span class="cx"> template <typename T> static T convertLineWidth(StyleResolver&, CSSValue&);
</span><span class="cx"> static float convertSpacing(StyleResolver&, CSSValue&);
</span><ins>+ static LengthSize convertRadius(StyleResolver&, CSSValue&);
+
+private:
+ static Length convertToRadiusLength(CSSToLengthConversionData&, CSSPrimitiveValue&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline Length StyleBuilderConverter::convertLength(StyleResolver& styleResolver, CSSValue& value)
</span><span class="lines">@@ -154,6 +159,35 @@
</span><span class="cx"> return primitiveValue.computeLength<float>(conversionData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Length StyleBuilderConverter::convertToRadiusLength(CSSToLengthConversionData& conversionData, CSSPrimitiveValue& value)
+{
+ if (value.isPercentage())
+ return Length(value.getDoubleValue(), Percent);
+ if (value.isCalculatedPercentageWithLength())
+ return Length(value.cssCalcValue()->createCalculationValue(conversionData));
+ return value.computeLength<Length>(conversionData);
+}
+
+LengthSize StyleBuilderConverter::convertRadius(StyleResolver& styleResolver, CSSValue& value)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ Pair* pair = primitiveValue.getPairValue();
+ ASSERT(pair);
+ ASSERT(pair->first());
+ ASSERT(pair->second());
+
+ CSSToLengthConversionData conversionData = styleResolver.state().cssToLengthConversionData();
+ Length radiusWidth = convertToRadiusLength(conversionData, *pair->first());
+ Length radiusHeight = convertToRadiusLength(conversionData, *pair->second());
+
+ ASSERT(!radiusWidth.isNegative());
+ ASSERT(!radiusHeight.isNegative());
+ if (radiusWidth.isZero() || radiusHeight.isZero())
+ return LengthSize(Length(0, Fixed), Length(0, Fixed));
+
+ return LengthSize(radiusWidth, radiusHeight);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre>
</div>
</div>
</body>
</html>