<!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>[177503] 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/177503">177503</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 10:36:22 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'font-weight' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139765
Reviewed by Antti Koivisto.
Move 'font-weight' 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::ApplyPropertyFontWeight::applyValue): Deleted.
(WebCore::ApplyPropertyFontWeight::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialFontWeight):
(WebCore::StyleBuilderCustom::applyInheritFontWeight):
(WebCore::StyleBuilderCustom::applyValueFontWeight):</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 (177502 => 177503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-18 18:23:18 UTC (rev 177502)
+++ trunk/Source/WebCore/ChangeLog 2014-12-18 18:36:22 UTC (rev 177503)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-12-18 Chris Dumez <cdumez@apple.com>
+
+ Move 'font-weight' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139765
+
+ Reviewed by Antti Koivisto.
+
+ Move 'font-weight' 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::ApplyPropertyFontWeight::applyValue): Deleted.
+ (WebCore::ApplyPropertyFontWeight::createHandler): Deleted.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialFontWeight):
+ (WebCore::StyleBuilderCustom::applyInheritFontWeight):
+ (WebCore::StyleBuilderCustom::applyValueFontWeight):
+
</ins><span class="cx"> 2014-12-18 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> Internals methods return 0 instead of false when they fail
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (177502 => 177503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-18 18:23:18 UTC (rev 177502)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-18 18:36:22 UTC (rev 177503)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> font-size [Inherited, LegacyStyleBuilder]
</span><span class="cx"> font-style [Inherited, LegacyStyleBuilder]
</span><span class="cx"> font-variant [Inherited, LegacyStyleBuilder]
</span><del>-font-weight [Inherited, LegacyStyleBuilder]
</del><ins>+font-weight [Inherited, Custom=All]
</ins><span class="cx"> text-rendering [Inherited, LegacyStyleBuilder]
</span><span class="cx"> -webkit-font-feature-settings [Inherited, LegacyStyleBuilder]
</span><span class="cx"> -webkit-font-kerning [Inherited, LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (177502 => 177503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-18 18:23:18 UTC (rev 177502)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-18 18:36:22 UTC (rev 177503)
</span><span class="lines">@@ -503,38 +503,6 @@
</span><span class="cx"> static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ApplyPropertyFontWeight {
-public:
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (!is<CSSPrimitiveValue>(*value))
- return;
- CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
- FontDescription fontDescription = styleResolver->fontDescription();
- switch (primitiveValue.getValueID()) {
- case CSSValueInvalid:
- ASSERT_NOT_REACHED();
- break;
- case CSSValueBolder:
- fontDescription.setWeight(styleResolver->parentStyle()->fontDescription().weight());
- fontDescription.setWeight(fontDescription.bolderWeight());
- break;
- case CSSValueLighter:
- fontDescription.setWeight(styleResolver->parentStyle()->fontDescription().weight());
- fontDescription.setWeight(fontDescription.lighterWeight());
- break;
- default:
- fontDescription.setWeight(primitiveValue);
- }
- styleResolver->setFontDescription(fontDescription);
- }
- static PropertyHandler createHandler()
- {
- PropertyHandler handler = ApplyPropertyFont<FontWeight, &FontDescription::weight, &FontDescription::setWeight, FontWeightNormal>::createHandler();
- return PropertyHandler(handler.inheritFunction(), handler.initialFunction(), &applyValue);
- }
-};
-
</del><span class="cx"> class ApplyPropertyFontVariantLigatures {
</span><span class="cx"> public:
</span><span class="cx"> static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
</span><span class="lines">@@ -722,7 +690,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyFontSize, ApplyPropertyFontSize::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontStyle, ApplyPropertyFont<FontItalic, &FontDescription::italic, &FontDescription::setItalic, FontItalicOff>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyFontVariant, ApplyPropertyFont<FontSmallCaps, &FontDescription::smallCaps, &FontDescription::setSmallCaps, FontSmallCapsOff>::createHandler());
</span><del>- setPropertyHandler(CSSPropertyFontWeight, ApplyPropertyFontWeight::createHandler());
</del><span class="cx"> setPropertyHandler(CSSPropertyOrphans, ApplyPropertyAuto<short, &RenderStyle::orphans, &RenderStyle::setOrphans, &RenderStyle::hasAutoOrphans, &RenderStyle::setHasAutoOrphans>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyOutlineColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::outlineColor, &RenderStyle::setOutlineColor, &RenderStyle::setVisitedLinkOutlineColor, &RenderStyle::color>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyWebkitTextDecorationColor, ApplyPropertyColor<NoInheritFromParent, &RenderStyle::textDecorationColor, &RenderStyle::setTextDecorationColor, &RenderStyle::setVisitedLinkTextDecorationColor, &RenderStyle::color>::createHandler());
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (177502 => 177503)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-18 18:23:18 UTC (rev 177502)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-18 18:36:22 UTC (rev 177503)
</span><span class="lines">@@ -139,6 +139,10 @@
</span><span class="cx"> static void applyInheritCursor(StyleResolver&);
</span><span class="cx"> static void applyValueCursor(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><ins>+ static void applyInitialFontWeight(StyleResolver&);
+ static void applyInheritFontWeight(StyleResolver&);
+ static void applyValueFontWeight(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">@@ -1181,6 +1185,42 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyInitialFontWeight(StyleResolver& styleResolver)
+{
+ FontDescription fontDescription = styleResolver.fontDescription();
+ fontDescription.setWeight(FontWeightNormal);
+ styleResolver.setFontDescription(fontDescription);
+}
+
+inline void StyleBuilderCustom::applyInheritFontWeight(StyleResolver& styleResolver)
+{
+ FontDescription fontDescription = styleResolver.fontDescription();
+ fontDescription.setWeight(styleResolver.parentFontDescription().weight());
+ styleResolver.setFontDescription(fontDescription);
+}
+
+inline void StyleBuilderCustom::applyValueFontWeight(StyleResolver& styleResolver, CSSValue& value)
+{
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+ FontDescription fontDescription = styleResolver.fontDescription();
+ switch (primitiveValue.getValueID()) {
+ case CSSValueInvalid:
+ ASSERT_NOT_REACHED();
+ break;
+ case CSSValueBolder:
+ fontDescription.setWeight(styleResolver.parentStyle()->fontDescription().weight());
+ fontDescription.setWeight(fontDescription.bolderWeight());
+ break;
+ case CSSValueLighter:
+ fontDescription.setWeight(styleResolver.parentStyle()->fontDescription().weight());
+ fontDescription.setWeight(fontDescription.lighterWeight());
+ break;
+ default:
+ fontDescription.setWeight(primitiveValue);
+ }
+ styleResolver.setFontDescription(fontDescription);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // StyleBuilderCustom_h
</span></span></pre>
</div>
</div>
</body>
</html>