<!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>[177274] 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/177274">177274</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-15 01:50:23 -0800 (Mon, 15 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'counter-increment' / 'counter-reset' to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139635
Reviewed by Antti Koivisto.
Move 'counter-increment' / 'counter-reset' to the new StyleBuilder by
using custom code.
No new tests, no behavior change.
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyCounter::emptyFunction): Deleted.
(WebCore::ApplyPropertyCounter::applyInheritValue): Deleted.
(WebCore::ApplyPropertyCounter::applyValue): Deleted.
(WebCore::ApplyPropertyCounter::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialCounterIncrement):
(WebCore::StyleBuilderCustom::applyInitialCounterReset):
(WebCore::StyleBuilderCustom::applyInheritCounter):
(WebCore::StyleBuilderCustom::applyValueCounter):
(WebCore::StyleBuilderCustom::applyInheritCounterIncrement):
(WebCore::StyleBuilderCustom::applyValueCounterIncrement):
(WebCore::StyleBuilderCustom::applyInheritCounterReset):
(WebCore::StyleBuilderCustom::applyValueCounterReset):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177273 => 177274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-15 06:40:12 UTC (rev 177273)
+++ trunk/Source/WebCore/ChangeLog 2014-12-15 09:50:23 UTC (rev 177274)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-12-15 Chris Dumez <cdumez@apple.com>
+
+ Move 'counter-increment' / 'counter-reset' to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139635
+
+ Reviewed by Antti Koivisto.
+
+ Move 'counter-increment' / 'counter-reset' to the new StyleBuilder by
+ using custom code.
+
+ No new tests, no behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyCounter::emptyFunction): Deleted.
+ (WebCore::ApplyPropertyCounter::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyCounter::applyValue): Deleted.
+ (WebCore::ApplyPropertyCounter::createHandler): Deleted.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialCounterIncrement):
+ (WebCore::StyleBuilderCustom::applyInitialCounterReset):
+ (WebCore::StyleBuilderCustom::applyInheritCounter):
+ (WebCore::StyleBuilderCustom::applyValueCounter):
+ (WebCore::StyleBuilderCustom::applyInheritCounterIncrement):
+ (WebCore::StyleBuilderCustom::applyValueCounterIncrement):
+ (WebCore::StyleBuilderCustom::applyInheritCounterReset):
+ (WebCore::StyleBuilderCustom::applyValueCounterReset):
+
</ins><span class="cx"> 2014-12-14 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177238 and r177244.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (177273 => 177274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-15 06:40:12 UTC (rev 177273)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-15 09:50:23 UTC (rev 177274)
</span><span class="lines">@@ -166,8 +166,8 @@
</span><span class="cx"> clip [Custom=All]
</span><span class="cx"> -webkit-clip-path [Converter=ClipPath]
</span><span class="cx"> content [LegacyStyleBuilder]
</span><del>-counter-increment [LegacyStyleBuilder]
-counter-reset [LegacyStyleBuilder]
</del><ins>+counter-increment [Custom=All]
+counter-reset [Custom=All]
</ins><span class="cx"> cursor [Inherited, LegacyStyleBuilder]
</span><span class="cx"> #if defined(ENABLE_CURSOR_VISIBILITY) && ENABLE_CURSOR_VISIBILITY
</span><span class="cx"> -webkit-cursor-visibility [Inherited, TypeName=CursorVisibility]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (177273 => 177274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-15 06:40:12 UTC (rev 177273)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-15 09:50:23 UTC (rev 177274)
</span><span class="lines">@@ -626,72 +626,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum CounterBehavior {Increment = 0, Reset};
-template <CounterBehavior counterBehavior>
-class ApplyPropertyCounter {
-public:
- static void emptyFunction(CSSPropertyID, StyleResolver*) { }
- static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- CounterDirectiveMap& map = styleResolver->style()->accessCounterDirectives();
- CounterDirectiveMap& parentMap = styleResolver->parentStyle()->accessCounterDirectives();
-
- typedef CounterDirectiveMap::iterator Iterator;
- Iterator end = parentMap.end();
- for (Iterator it = parentMap.begin(); it != end; ++it) {
- CounterDirectives& directives = map.add(it->key, CounterDirectives()).iterator->value;
- if (counterBehavior == Reset) {
- directives.inheritReset(it->value);
- } else {
- directives.inheritIncrement(it->value);
- }
- }
- }
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- bool setCounterIncrementToNone = counterBehavior == Increment && is<CSSPrimitiveValue>(*value) && downcast<CSSPrimitiveValue>(*value).getValueID() == CSSValueNone;
-
- if (!is<CSSValueList>(*value) && !setCounterIncrementToNone)
- return;
-
- CounterDirectiveMap& map = styleResolver->style()->accessCounterDirectives();
- typedef CounterDirectiveMap::iterator Iterator;
-
- Iterator end = map.end();
- for (Iterator it = map.begin(); it != end; ++it)
- if (counterBehavior == Reset)
- it->value.clearReset();
- else
- it->value.clearIncrement();
-
- if (setCounterIncrementToNone)
- return;
-
- CSSValueList& list = downcast<CSSValueList>(*value);
- int length = list.length();
- for (int i = 0; i < length; ++i) {
- CSSValue* currValue = list.itemWithoutBoundsCheck(i);
- if (!is<CSSPrimitiveValue>(*currValue))
- continue;
-
- Pair* pair = downcast<CSSPrimitiveValue>(*currValue).getPairValue();
- if (!pair || !pair->first() || !pair->second())
- continue;
-
- AtomicString identifier = static_cast<CSSPrimitiveValue*>(pair->first())->getStringValue();
- int value = static_cast<CSSPrimitiveValue*>(pair->second())->getIntValue();
- CounterDirectives& directives = map.add(identifier, CounterDirectives()).iterator->value;
- if (counterBehavior == Reset) {
- directives.setResetValue(value);
- } else {
- directives.addIncrementValue(value);
- }
- }
- }
- static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &emptyFunction, &applyValue); }
-};
-
-
</del><span class="cx"> class ApplyPropertyCursor {
</span><span class="cx"> public:
</span><span class="cx"> static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
</span><span class="lines">@@ -884,8 +818,6 @@
</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><span class="cx"> setPropertyHandler(CSSPropertyColor, ApplyPropertyColor<InheritFromParent, &RenderStyle::color, &RenderStyle::setColor, &RenderStyle::setVisitedLinkColor, &RenderStyle::invalidColor, RenderStyle::initialColor>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyCounterIncrement, ApplyPropertyCounter<Increment>::createHandler());
- setPropertyHandler(CSSPropertyCounterReset, ApplyPropertyCounter<Reset>::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyCursor, ApplyPropertyCursor::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont<FontItalic, &FontDescription::italic, &FontDescription::setItalic, FontItalicOff>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (177273 => 177274)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-15 06:40:12 UTC (rev 177273)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-15 09:50:23 UTC (rev 177274)
</span><span class="lines">@@ -134,6 +134,13 @@
</span><span class="cx"> static void applyInheritWebkitTextEmphasisStyle(StyleResolver&);
</span><span class="cx"> static void applyValueWebkitTextEmphasisStyle(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><ins>+ static void applyInitialCounterIncrement(StyleResolver&) { }
+ static void applyInheritCounterIncrement(StyleResolver&);
+ static void applyValueCounterIncrement(StyleResolver&, CSSValue&);
+ static void applyInitialCounterReset(StyleResolver&) { }
+ static void applyInheritCounterReset(StyleResolver&);
+ static void applyValueCounterReset(StyleResolver&, CSSValue&);
+
</ins><span class="cx"> private:
</span><span class="cx"> static void resetEffectiveZoom(StyleResolver&);
</span><span class="cx"> static CSSToLengthConversionData csstoLengthConversionDataWithTextZoomFactor(StyleResolver&);
</span><span class="lines">@@ -146,6 +153,12 @@
</span><span class="cx"> template <CSSPropertyID id>
</span><span class="cx"> static void applyTextOrBoxShadowValue(StyleResolver&, CSSValue&);
</span><span class="cx"> static bool isValidDisplayValue(StyleResolver&, EDisplay);
</span><ins>+
+ enum CounterBehavior {Increment = 0, Reset};
+ template <CounterBehavior counterBehavior>
+ static void applyInheritCounter(StyleResolver&);
+ template <CounterBehavior counterBehavior>
+ static void applyValueCounter(StyleResolver&, CSSValue&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyValueWebkitMarqueeIncrement(StyleResolver& styleResolver, CSSValue& value)
</span><span class="lines">@@ -1100,6 +1113,73 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+template <StyleBuilderCustom::CounterBehavior counterBehavior>
+inline void StyleBuilderCustom::applyInheritCounter(StyleResolver& styleResolver)
+{
+ CounterDirectiveMap& map = styleResolver.style()->accessCounterDirectives();
+ for (auto& keyValue : styleResolver.parentStyle()->accessCounterDirectives()) {
+ CounterDirectives& directives = map.add(keyValue.key, CounterDirectives()).iterator->value;
+ if (counterBehavior == Reset)
+ directives.inheritReset(keyValue.value);
+ else
+ directives.inheritIncrement(keyValue.value);
+ }
+}
+
+template <StyleBuilderCustom::CounterBehavior counterBehavior>
+inline void StyleBuilderCustom::applyValueCounter(StyleResolver& styleResolver, CSSValue& value)
+{
+ bool setCounterIncrementToNone = counterBehavior == Increment && is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNone;
+
+ if (!is<CSSValueList>(value) && !setCounterIncrementToNone)
+ return;
+
+ CounterDirectiveMap& map = styleResolver.style()->accessCounterDirectives();
+ for (auto& keyValue : map) {
+ if (counterBehavior == Reset)
+ keyValue.value.clearReset();
+ else
+ keyValue.value.clearIncrement();
+ }
+
+ if (setCounterIncrementToNone)
+ return;
+
+ for (auto& item : downcast<CSSValueList>(value)) {
+ Pair* pair = downcast<CSSPrimitiveValue>(item.get()).getPairValue();
+ if (!pair || !pair->first() || !pair->second())
+ continue;
+
+ AtomicString identifier = pair->first()->getStringValue();
+ int value = pair->second()->getIntValue();
+ CounterDirectives& directives = map.add(identifier, CounterDirectives()).iterator->value;
+ if (counterBehavior == Reset)
+ directives.setResetValue(value);
+ else
+ directives.addIncrementValue(value);
+ }
+}
+
+inline void StyleBuilderCustom::applyInheritCounterIncrement(StyleResolver& styleResolver)
+{
+ applyInheritCounter<Increment>(styleResolver);
+}
+
+inline void StyleBuilderCustom::applyValueCounterIncrement(StyleResolver& styleResolver, CSSValue& value)
+{
+ applyValueCounter<Increment>(styleResolver, value);
+}
+
+inline void StyleBuilderCustom::applyInheritCounterReset(StyleResolver& styleResolver)
+{
+ applyInheritCounter<Reset>(styleResolver);
+}
+
+inline void StyleBuilderCustom::applyValueCounterReset(StyleResolver& styleResolver, CSSValue& value)
+{
+ applyValueCounter<Reset>(styleResolver, value);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderCustom_h
</span></span></pre>
</div>
</div>
</body>
</html>