<!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>[176861] 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/176861">176861</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-05 12:27:37 -0800 (Fri, 05 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'text-emphasis-style' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139285
Reviewed by Sam Weinig.
Move 'text-emphasis-style' CSS property to the new StyleBuilder by
using custom code.
No new tests, no behavior change.
* css/CSSPropertyNames.in:
* css/DeprecatedStyleBuilder.cpp:
(WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
(WebCore::ApplyPropertyTextEmphasisStyle::applyInheritValue): Deleted.
(WebCore::ApplyPropertyTextEmphasisStyle::applyInitialValue): Deleted.
(WebCore::ApplyPropertyTextEmphasisStyle::applyValue): Deleted.
(WebCore::ApplyPropertyTextEmphasisStyle::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialWebkitTextEmphasisStyle):
(WebCore::StyleBuilderCustom::applyInheritWebkitTextEmphasisStyle):
(WebCore::StyleBuilderCustom::applyValueWebkitTextEmphasisStyle):</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 (176860 => 176861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-05 19:47:09 UTC (rev 176860)
+++ trunk/Source/WebCore/ChangeLog 2014-12-05 20:27:37 UTC (rev 176861)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-05 Chris Dumez <cdumez@apple.com>
+
+ Move 'text-emphasis-style' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139285
+
+ Reviewed by Sam Weinig.
+
+ Move 'text-emphasis-style' CSS property to the new StyleBuilder by
+ using custom code.
+
+ No new tests, no behavior change.
+
+ * css/CSSPropertyNames.in:
+ * css/DeprecatedStyleBuilder.cpp:
+ (WebCore::DeprecatedStyleBuilder::DeprecatedStyleBuilder):
+ (WebCore::ApplyPropertyTextEmphasisStyle::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyTextEmphasisStyle::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyTextEmphasisStyle::applyValue): Deleted.
+ (WebCore::ApplyPropertyTextEmphasisStyle::createHandler): Deleted.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialWebkitTextEmphasisStyle):
+ (WebCore::StyleBuilderCustom::applyInheritWebkitTextEmphasisStyle):
+ (WebCore::StyleBuilderCustom::applyValueWebkitTextEmphasisStyle):
+
</ins><span class="cx"> 2014-12-05 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] remove "enter optimized fullscreen" gesture
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (176860 => 176861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-05 19:47:09 UTC (rev 176860)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-05 20:27:37 UTC (rev 176861)
</span><span class="lines">@@ -505,7 +505,7 @@
</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="cx"> text-emphasis-position = -webkit-text-emphasis-position
</span><del>--webkit-text-emphasis-style [Inherited, LegacyStyleBuilder]
</del><ins>+-webkit-text-emphasis-style [Inherited, Custom=All]
</ins><span class="cx"> -epub-text-emphasis-style = -webkit-text-emphasis-style
</span><span class="cx"> text-emphasis-style = -webkit-text-emphasis-style
</span><span class="cx"> -webkit-text-fill-color [Inherited, LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (176860 => 176861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-05 19:47:09 UTC (rev 176860)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-05 20:27:37 UTC (rev 176861)
</span><span class="lines">@@ -780,69 +780,6 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ApplyPropertyTextEmphasisStyle {
-public:
- static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- styleResolver->style()->setTextEmphasisFill(styleResolver->parentStyle()->textEmphasisFill());
- styleResolver->style()->setTextEmphasisMark(styleResolver->parentStyle()->textEmphasisMark());
- styleResolver->style()->setTextEmphasisCustomMark(styleResolver->parentStyle()->textEmphasisCustomMark());
- }
-
- static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- styleResolver->style()->setTextEmphasisFill(RenderStyle::initialTextEmphasisFill());
- styleResolver->style()->setTextEmphasisMark(RenderStyle::initialTextEmphasisMark());
- styleResolver->style()->setTextEmphasisCustomMark(RenderStyle::initialTextEmphasisCustomMark());
- }
-
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (is<CSSValueList>(*value)) {
- CSSValueList& list = downcast<CSSValueList>(*value);
- ASSERT(list.length() == 2);
- if (list.length() != 2)
- return;
- for (unsigned i = 0; i < 2; ++i) {
- CSSValue* item = list.itemWithoutBoundsCheck(i);
- if (!is<CSSPrimitiveValue>(*item))
- continue;
-
- CSSPrimitiveValue& value = downcast<CSSPrimitiveValue>(*item);
- if (value.getValueID() == CSSValueFilled || value.getValueID() == CSSValueOpen)
- styleResolver->style()->setTextEmphasisFill(value);
- else
- styleResolver->style()->setTextEmphasisMark(value);
- }
- styleResolver->style()->setTextEmphasisCustomMark(nullAtom);
- return;
- }
-
- if (!is<CSSPrimitiveValue>(*value))
- return;
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
-
- if (primitiveValue.isString()) {
- styleResolver->style()->setTextEmphasisFill(TextEmphasisFillFilled);
- styleResolver->style()->setTextEmphasisMark(TextEmphasisMarkCustom);
- styleResolver->style()->setTextEmphasisCustomMark(primitiveValue.getStringValue());
- return;
- }
-
- styleResolver->style()->setTextEmphasisCustomMark(nullAtom);
-
- if (primitiveValue.getValueID() == CSSValueFilled || primitiveValue.getValueID() == CSSValueOpen) {
- styleResolver->style()->setTextEmphasisFill(primitiveValue);
- styleResolver->style()->setTextEmphasisMark(TextEmphasisMarkAuto);
- } else {
- styleResolver->style()->setTextEmphasisFill(TextEmphasisFillFilled);
- styleResolver->style()->setTextEmphasisMark(primitiveValue);
- }
- }
-
- static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
</del><span class="cx"> template <typename T,
</span><span class="cx"> T (Animation::*getterFunction)() const,
</span><span class="cx"> void (Animation::*setterFunction)(T),
</span><span class="lines">@@ -1001,7 +938,6 @@
</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><span class="cx"> setPropertyHandler(CSSPropertyWebkitPerspectiveOrigin, ApplyPropertyExpanding<SuppressValue, CSSPropertyWebkitPerspectiveOriginX, CSSPropertyWebkitPerspectiveOriginY>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextEmphasisColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textEmphasisColor, &RenderStyle::setTextEmphasisColor, &RenderStyle::setVisitedLinkTextEmphasisColor, &RenderStyle::color>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyWebkitTextEmphasisStyle, ApplyPropertyTextEmphasisStyle::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextFillColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textFillColor, &RenderStyle::setTextFillColor, &RenderStyle::setVisitedLinkTextFillColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextStrokeColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textStrokeColor, &RenderStyle::setTextStrokeColor, &RenderStyle::setVisitedLinkTextStrokeColor, &RenderStyle::color>::createHandler());
</span><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></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (176860 => 176861)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-05 19:47:09 UTC (rev 176860)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-05 20:27:37 UTC (rev 176861)
</span><span class="lines">@@ -130,6 +130,10 @@
</span><span class="cx"> static void applyInheritWebkitAspectRatio(StyleResolver&);
</span><span class="cx"> static void applyValueWebkitAspectRatio(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><ins>+ static void applyInitialWebkitTextEmphasisStyle(StyleResolver&);
+ static void applyInheritWebkitTextEmphasisStyle(StyleResolver&);
+ static void applyValueWebkitTextEmphasisStyle(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">@@ -1046,6 +1050,56 @@
</span><span class="cx"> styleResolver.style()->setAspectRatioNumerator(aspectRatioValue.numeratorValue());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyInitialWebkitTextEmphasisStyle(StyleResolver& styleResolver)
+{
+ styleResolver.style()->setTextEmphasisFill(RenderStyle::initialTextEmphasisFill());
+ styleResolver.style()->setTextEmphasisMark(RenderStyle::initialTextEmphasisMark());
+ styleResolver.style()->setTextEmphasisCustomMark(RenderStyle::initialTextEmphasisCustomMark());
+}
+
+inline void StyleBuilderCustom::applyInheritWebkitTextEmphasisStyle(StyleResolver& styleResolver)
+{
+ styleResolver.style()->setTextEmphasisFill(styleResolver.parentStyle()->textEmphasisFill());
+ styleResolver.style()->setTextEmphasisMark(styleResolver.parentStyle()->textEmphasisMark());
+ styleResolver.style()->setTextEmphasisCustomMark(styleResolver.parentStyle()->textEmphasisCustomMark());
+}
+
+inline void StyleBuilderCustom::applyValueWebkitTextEmphasisStyle(StyleResolver& styleResolver, CSSValue& value)
+{
+ if (is<CSSValueList>(value)) {
+ auto& list = downcast<CSSValueList>(value);
+ ASSERT(list.length() == 2);
+
+ for (auto& item : list) {
+ CSSPrimitiveValue& value = downcast<CSSPrimitiveValue>(item.get());
+ if (value.getValueID() == CSSValueFilled || value.getValueID() == CSSValueOpen)
+ styleResolver.style()->setTextEmphasisFill(value);
+ else
+ styleResolver.style()->setTextEmphasisMark(value);
+ }
+ styleResolver.style()->setTextEmphasisCustomMark(nullAtom);
+ return;
+ }
+
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ if (primitiveValue.isString()) {
+ styleResolver.style()->setTextEmphasisFill(TextEmphasisFillFilled);
+ styleResolver.style()->setTextEmphasisMark(TextEmphasisMarkCustom);
+ styleResolver.style()->setTextEmphasisCustomMark(primitiveValue.getStringValue());
+ return;
+ }
+
+ styleResolver.style()->setTextEmphasisCustomMark(nullAtom);
+
+ if (primitiveValue.getValueID() == CSSValueFilled || primitiveValue.getValueID() == CSSValueOpen) {
+ styleResolver.style()->setTextEmphasisFill(primitiveValue);
+ styleResolver.style()->setTextEmphasisMark(TextEmphasisMarkAuto);
+ } else {
+ styleResolver.style()->setTextEmphasisFill(TextEmphasisFillFilled);
+ styleResolver.style()->setTextEmphasisMark(primitiveValue);
+ }
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderCustom_h
</span></span></pre>
</div>
</div>
</body>
</html>