<!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>[175815] 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/175815">175815</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-11-10 11:34:11 -0800 (Mon, 10 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'text-indent' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=138547
Reviewed by Andreas Kling.
Move 'text-indent' CSS property from DeprecatedStyleBuilder to the new
StyleBuilder, by using custom code.
No new tests, no behavior change.
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyTextIndent::applyInheritValue): Deleted.
(WebCore::ApplyPropertyTextIndent::applyInitialValue): Deleted.
(WebCore::ApplyPropertyTextIndent::applyValue): Deleted.
(WebCore::ApplyPropertyTextIndent::createHandler): Deleted.
* css/StyleBuilderConverter.h:
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderFunctions::applyInheritTextIndent):
(WebCore::StyleBuilderFunctions::applyInitialTextIndent):
(WebCore::StyleBuilderFunctions::applyValueTextIndent):</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>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (175814 => 175815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-11-10 19:19:52 UTC (rev 175814)
+++ trunk/Source/WebCore/ChangeLog 2014-11-10 19:34:11 UTC (rev 175815)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-11-10 Chris Dumez <cdumez@apple.com>
+
+ Move 'text-indent' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=138547
+
+ Reviewed by Andreas Kling.
+
+ Move 'text-indent' CSS property from DeprecatedStyleBuilder to the new
+ StyleBuilder, by using custom code.
+
+ No new tests, no behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyTextIndent::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyTextIndent::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyTextIndent::applyValue): Deleted.
+ (WebCore::ApplyPropertyTextIndent::createHandler): Deleted.
+ * css/StyleBuilderConverter.h:
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderFunctions::applyInheritTextIndent):
+ (WebCore::StyleBuilderFunctions::applyInitialTextIndent):
+ (WebCore::StyleBuilderFunctions::applyValueTextIndent):
+
</ins><span class="cx"> 2014-11-10 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> WK1: Support default actions for read-only text
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (175814 => 175815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-10 19:19:52 UTC (rev 175814)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-11-10 19:34:11 UTC (rev 175815)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> tab-size [Inherited, NewStyleBuilder, TypeName=unsigned]
</span><span class="cx"> text-align [Inherited, NewStyleBuilder, Converter=TextAlign]
</span><span class="cx"> text-decoration [NewStyleBuilder, Converter=TextDecoration]
</span><del>-text-indent [Inherited]
</del><ins>+text-indent [Inherited, NewStyleBuilder, Custom=All]
</ins><span class="cx"> text-line-through
</span><span class="cx"> text-line-through-color
</span><span class="cx"> text-line-through-mode
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (175814 => 175815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-10 19:19:52 UTC (rev 175814)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-11-10 19:34:11 UTC (rev 175815)
</span><span class="lines">@@ -1576,67 +1576,6 @@
</span><span class="cx"> };
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-class ApplyPropertyTextIndent {
-public:
- static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- styleResolver->style()->setTextIndent(styleResolver->parentStyle()->textIndent());
-#if ENABLE(CSS3_TEXT)
- styleResolver->style()->setTextIndentLine(styleResolver->parentStyle()->textIndentLine());
- styleResolver->style()->setTextIndentType(styleResolver->parentStyle()->textIndentType());
-#endif
- }
-
- static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- styleResolver->style()->setTextIndent(RenderStyle::initialTextIndent());
-#if ENABLE(CSS3_TEXT)
- styleResolver->style()->setTextIndentLine(RenderStyle::initialTextIndentLine());
- styleResolver->style()->setTextIndentType(RenderStyle::initialTextIndentType());
-#endif
- }
-
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (!is<CSSValueList>(*value))
- return;
-
- Length lengthOrPercentageValue;
-#if ENABLE(CSS3_TEXT)
- TextIndentLine textIndentLineValue = RenderStyle::initialTextIndentLine();
- TextIndentType textIndentTypeValue = RenderStyle::initialTextIndentType();
-#endif
- CSSValueList& valueList = downcast<CSSValueList>(*value);
- for (size_t i = 0; i < valueList.length(); ++i) {
- CSSValue* item = valueList.itemWithoutBoundsCheck(i);
- if (!is<CSSPrimitiveValue>(*item))
- continue;
-
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*item);
- if (!primitiveValue.getValueID())
- lengthOrPercentageValue = primitiveValue.convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(styleResolver->state().cssToLengthConversionData());
-#if ENABLE(CSS3_TEXT)
- else if (primitiveValue.getValueID() == CSSValueWebkitEachLine)
- textIndentLineValue = TextIndentEachLine;
- else if (primitiveValue.getValueID() == CSSValueWebkitHanging)
- textIndentTypeValue = TextIndentHanging;
-#endif
- }
-
- ASSERT(!lengthOrPercentageValue.isUndefined());
- styleResolver->style()->setTextIndent(lengthOrPercentageValue);
-#if ENABLE(CSS3_TEXT)
- styleResolver->style()->setTextIndentLine(textIndentLineValue);
- styleResolver->style()->setTextIndentType(textIndentTypeValue);
-#endif
- }
-
- static PropertyHandler createHandler()
- {
- return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue);
- }
-};
-
</del><span class="cx"> const DeprecatedStyleBuilder& DeprecatedStyleBuilder::sharedStyleBuilder()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<DeprecatedStyleBuilder> styleBuilderInstance;
</span><span class="lines">@@ -1695,7 +1634,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationSkip, ApplyPropertyTextDecorationSkip::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextUnderlinePosition, ApplyPropertyTextUnderlinePosition::createHandler());
</span><del>- setPropertyHandler(CSSPropertyTextIndent, ApplyPropertyTextIndent::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyTextRendering, ApplyPropertyFont<TextRenderingMode, &FontDescription::textRenderingMode, &FontDescription::setTextRenderingMode, AutoTextRendering>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyVerticalAlign, ApplyPropertyVerticalAlign::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitAnimationDelay, ApplyPropertyAnimation<double, &Animation::delay, &Animation::setDelay, &Animation::isDelaySet, &Animation::clearDelay, &Animation::initialAnimationDelay, &CSSToStyleMap::mapAnimationDelay, &RenderStyle::accessAnimations, &RenderStyle::animations>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (175814 => 175815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-10 19:19:52 UTC (rev 175814)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2014-11-10 19:34:11 UTC (rev 175815)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// Note that we assume the CSS parser only allows valid CSSValue types.
</ins><span class="cx"> class StyleBuilderConverter {
</span><span class="cx"> public:
</span><span class="cx"> static Length convertLength(StyleResolver&, CSSValue&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (175814 => 175815)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-11-10 19:19:52 UTC (rev 175814)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-11-10 19:34:11 UTC (rev 175815)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// Note that we assume the CSS parser only allows valid CSSValue types.
</ins><span class="cx"> namespace StyleBuilderFunctions {
</span><span class="cx">
</span><span class="cx"> inline void applyValueWebkitMarqueeIncrement(StyleResolver& styleResolver, CSSValue& value)
</span><span class="lines">@@ -308,6 +309,51 @@
</span><span class="cx"> styleResolver.style()->setPageSize(LengthSize(width, height));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void applyInheritTextIndent(StyleResolver& styleResolver)
+{
+ styleResolver.style()->setTextIndent(styleResolver.parentStyle()->textIndent());
+#if ENABLE(CSS3_TEXT)
+ styleResolver.style()->setTextIndentLine(styleResolver.parentStyle()->textIndentLine());
+ styleResolver.style()->setTextIndentType(styleResolver.parentStyle()->textIndentType());
+#endif
+}
+
+inline void applyInitialTextIndent(StyleResolver& styleResolver)
+{
+ styleResolver.style()->setTextIndent(RenderStyle::initialTextIndent());
+#if ENABLE(CSS3_TEXT)
+ styleResolver.style()->setTextIndentLine(RenderStyle::initialTextIndentLine());
+ styleResolver.style()->setTextIndentType(RenderStyle::initialTextIndentType());
+#endif
+}
+
+inline void applyValueTextIndent(StyleResolver& styleResolver, CSSValue& value)
+{
+ Length lengthOrPercentageValue;
+#if ENABLE(CSS3_TEXT)
+ TextIndentLine textIndentLineValue = RenderStyle::initialTextIndentLine();
+ TextIndentType textIndentTypeValue = RenderStyle::initialTextIndentType();
+#endif
+ for (auto& item : downcast<CSSValueList>(value)) {
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(item.get());
+ if (!primitiveValue.getValueID())
+ lengthOrPercentageValue = primitiveValue.convertToLength<FixedIntegerConversion | PercentConversion | CalculatedConversion>(styleResolver.state().cssToLengthConversionData());
+#if ENABLE(CSS3_TEXT)
+ else if (primitiveValue.getValueID() == CSSValueWebkitEachLine)
+ textIndentLineValue = TextIndentEachLine;
+ else if (primitiveValue.getValueID() == CSSValueWebkitHanging)
+ textIndentTypeValue = TextIndentHanging;
+#endif
+ }
+
+ ASSERT(!lengthOrPercentageValue.isUndefined());
+ styleResolver.style()->setTextIndent(lengthOrPercentageValue);
+#if ENABLE(CSS3_TEXT)
+ styleResolver.style()->setTextIndentLine(textIndentLineValue);
+ styleResolver.style()->setTextIndentType(textIndentTypeValue);
+#endif
+}
+
</ins><span class="cx"> } // namespace StyleBuilderFunctions
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>