<!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>[175464] 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/175464">175464</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-02 14:47:30 -0800 (Sun, 02 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move string-typed properties to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=138295
Reviewed by Antti Koivisto.
Move string-typed properties to the new StyleBuilder:
-webkit-hyphenate-character
-webkit-line-grid
-webkit-flow-into
-webkit-flow-from
No new tests, no behavior change.</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 (175463 => 175464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-02 18:19:33 UTC (rev 175463)
+++ trunk/Source/WebCore/ChangeLog 2014-11-02 22:47:30 UTC (rev 175464)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2014-11-02 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ Move string-typed properties to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=138295
+
+ Reviewed by Antti Koivisto.
+
+ Move string-typed properties to the new StyleBuilder:
+ -webkit-hyphenate-character
+ -webkit-line-grid
+ -webkit-flow-into
+ -webkit-flow-from
+
+ No new tests, no behavior change.
+
+2014-11-02 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> Unreviewed, rebaseline bindings tests after r175462.
</span><span class="cx">
</span><span class="cx"> * bindings/scripts/test/JS/JSTestActiveDOMObject.cpp:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175463 => 175464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-02 18:19:33 UTC (rev 175463)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-02 22:47:30 UTC (rev 175464)
</span><span class="lines">@@ -387,7 +387,7 @@
</span><span class="cx"> -webkit-grid-template-areas
</span><span class="cx"> -webkit-grid-auto-flow
</span><span class="cx"> #endif
</span><del>--webkit-hyphenate-character [Inherited]
</del><ins>+-webkit-hyphenate-character [Inherited, NewStyleBuilder, NameForMethods=HyphenationString, Converter=StringOrAuto]
</ins><span class="cx"> -webkit-hyphenate-limit-after [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitAfter, Converter=Number<short>]
</span><span class="cx"> -webkit-hyphenate-limit-before [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitBefore, Converter=Number<short>]
</span><span class="cx"> -webkit-hyphenate-limit-lines [Inherited, NewStyleBuilder, NameForMethods=HyphenationLimitLines, Converter=WebkitHyphenateLimitLines]
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> -webkit-line-align [Inherited, NewStyleBuilder, TypeName=LineAlign]
</span><span class="cx"> -webkit-line-break [Inherited, NewStyleBuilder, TypeName=LineBreak]
</span><span class="cx"> -webkit-line-clamp [NewStyleBuilder, TypeName=LineClampValue]
</span><del>--webkit-line-grid [Inherited]
</del><ins>+-webkit-line-grid [Inherited, NewStyleBuilder, Converter=StringOrNone]
</ins><span class="cx"> -webkit-line-snap [Inherited, NewStyleBuilder, TypeName=LineSnap]
</span><span class="cx"> -webkit-logical-width
</span><span class="cx"> -webkit-logical-height
</span><span class="lines">@@ -504,8 +504,8 @@
</span><span class="cx"> -webkit-user-modify [Inherited, NewStyleBuilder]
</span><span class="cx"> -webkit-user-select [Inherited, NewStyleBuilder]
</span><span class="cx"> #if defined(ENABLE_CSS_REGIONS) && ENABLE_CSS_REGIONS
</span><del>--webkit-flow-into
--webkit-flow-from
</del><ins>+-webkit-flow-into [NewStyleBuilder, NameForMethods=FlowThread, Converter=StringOrNone]
+-webkit-flow-from [NewStyleBuilder, NameForMethods=RegionThread, Converter=StringOrNone]
</ins><span class="cx"> -webkit-region-fragment [NewStyleBuilder, TypeName=RegionFragment]
</span><span class="cx"> -webkit-region-break-after [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</span><span class="cx"> -webkit-region-break-before [NewStyleBuilder, TypeName=EPageBreak, Initial=initialPageBreak]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175463 => 175464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-02 18:19:33 UTC (rev 175463)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-02 22:47:30 UTC (rev 175464)
</span><span class="lines">@@ -302,29 +302,6 @@
</span><span class="cx"> static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum StringIdentBehavior { NothingMapsToNull = 0, MapNoneToNull, MapAutoToNull };
-template <StringIdentBehavior identBehavior, const AtomicString& (RenderStyle::*getterFunction)() const, void (RenderStyle::*setterFunction)(const AtomicString&), const AtomicString& (*initialFunction)()>
-class ApplyPropertyString {
-public:
- static void setValue(RenderStyle* style, const AtomicString& value) { (style->*setterFunction)(value); }
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (!is<CSSPrimitiveValue>(*value))
- return;
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
- if ((identBehavior == MapNoneToNull && primitiveValue.getValueID() == CSSValueNone)
- || (identBehavior == MapAutoToNull && primitiveValue.getValueID() == CSSValueAuto))
- setValue(styleResolver->style(), nullAtom);
- else
- setValue(styleResolver->style(), primitiveValue.getStringValue());
- }
- static PropertyHandler createHandler()
- {
- PropertyHandler handler = ApplyPropertyDefaultBase<const AtomicString&, getterFunction, const AtomicString&, setterFunction, const AtomicString&, 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">@@ -2115,15 +2092,9 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyColumnGap, ApplyPropertyAuto<float, &RenderStyle::columnGap, &RenderStyle::setColumnGap, &RenderStyle::hasNormalColumnGap, &RenderStyle::setHasNormalColumnGap, ComputeLength, CSSValueNormal>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyColumnRuleColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::columnRuleColor, &RenderStyle::setColumnRuleColor, &RenderStyle::setVisitedLinkColumnRuleColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyColumnWidth, ApplyPropertyAuto<float, &RenderStyle::columnWidth, &RenderStyle::setColumnWidth, &RenderStyle::hasAutoColumnWidth, &RenderStyle::setHasAutoColumnWidth, ComputeLength>::createHandler());
</span><del>-#if ENABLE(CSS_REGIONS)
- setPropertyHandler(CSSPropertyWebkitFlowFrom, ApplyPropertyString<MapNoneToNull, &RenderStyle::regionThread, &RenderStyle::setRegionThread, &RenderStyle::initialRegionThread>::createHandler());
- setPropertyHandler(CSSPropertyWebkitFlowInto, ApplyPropertyString<MapNoneToNull, &RenderStyle::flowThread, &RenderStyle::setFlowThread, &RenderStyle::initialFlowThread>::createHandler());
-#endif
</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><del>- setPropertyHandler(CSSPropertyWebkitHyphenateCharacter, ApplyPropertyString<MapAutoToNull, &RenderStyle::hyphenationString, &RenderStyle::setHyphenationString, &RenderStyle::initialHyphenationString>::createHandler());
- setPropertyHandler(CSSPropertyWebkitLineGrid, ApplyPropertyString<MapNoneToNull, &RenderStyle::lineGrid, &RenderStyle::setLineGrid, &RenderStyle::initialLineGrid>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitMarqueeRepetition, ApplyPropertyMarqueeRepetition::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMarqueeSpeed, ApplyPropertyMarqueeSpeed::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitMaskBoxImageOutset, ApplyPropertyBorderImageModifier<BorderMask, Outset>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (175463 => 175464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-02 18:19:33 UTC (rev 175463)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-02 22:47:30 UTC (rev 175464)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx"> template <CSSPropertyID property> static NinePieceImage convertBorderMask(StyleResolver&, CSSValue&);
</span><span class="cx"> template <CSSPropertyID property> static PassRefPtr<StyleImage> convertBorderImageSource(StyleResolver&, CSSValue&);
</span><span class="cx"> static TransformOperations convertTransform(StyleResolver&, CSSValue&);
</span><ins>+ static String convertString(StyleResolver&, CSSValue&);
+ static String convertStringOrAuto(StyleResolver&, CSSValue&);
+ static String convertStringOrNone(StyleResolver&, CSSValue&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static Length convertToRadiusLength(CSSToLengthConversionData&, CSSPrimitiveValue&);
</span><span class="lines">@@ -249,6 +252,25 @@
</span><span class="cx"> return operations;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline String StyleBuilderConverter::convertString(StyleResolver&, CSSValue& value)
+{
+ return downcast<CSSPrimitiveValue>(value).getStringValue();
+}
+
+inline String StyleBuilderConverter::convertStringOrAuto(StyleResolver& styleResolver, CSSValue& value)
+{
+ if (downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueAuto)
+ return nullAtom;
+ return convertString(styleResolver, value);
+}
+
+inline String StyleBuilderConverter::convertStringOrNone(StyleResolver& styleResolver, CSSValue& value)
+{
+ if (downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone)
+ return nullAtom;
+ return convertString(styleResolver, value);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderConverter_h
</span></span></pre>
</div>
</div>
</body>
</html>