<!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>[176657] 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/176657">176657</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-12-02 08:42:22 -0800 (Tue, 02 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move 'font-family' CSS property to the new StyleBuilder
https://bugs.webkit.org/show_bug.cgi?id=139172
Reviewed by Antti Koivisto.
Move 'font-family' 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::ApplyPropertyFontFamily::applyInheritValue): Deleted.
(WebCore::ApplyPropertyFontFamily::applyInitialValue): Deleted.
(WebCore::ApplyPropertyFontFamily::applyValue): Deleted.
(WebCore::ApplyPropertyFontFamily::createHandler): Deleted.
* css/StyleBuilderCustom.h:
(WebCore::StyleBuilderCustom::applyInitialFontFamily):
(WebCore::StyleBuilderCustom::applyInheritFontFamily):
(WebCore::StyleBuilderCustom::applyValueFontFamily):</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 (176656 => 176657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-02 16:38:51 UTC (rev 176656)
+++ trunk/Source/WebCore/ChangeLog 2014-12-02 16:42:22 UTC (rev 176657)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-02 Chris Dumez <cdumez@apple.com>
+
+ Move 'font-family' CSS property to the new StyleBuilder
+ https://bugs.webkit.org/show_bug.cgi?id=139172
+
+ Reviewed by Antti Koivisto.
+
+ Move 'font-family' 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::ApplyPropertyFontFamily::applyInheritValue): Deleted.
+ (WebCore::ApplyPropertyFontFamily::applyInitialValue): Deleted.
+ (WebCore::ApplyPropertyFontFamily::applyValue): Deleted.
+ (WebCore::ApplyPropertyFontFamily::createHandler): Deleted.
+ * css/StyleBuilderCustom.h:
+ (WebCore::StyleBuilderCustom::applyInitialFontFamily):
+ (WebCore::StyleBuilderCustom::applyInheritFontFamily):
+ (WebCore::StyleBuilderCustom::applyValueFontFamily):
+
</ins><span class="cx"> 2014-12-02 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix class was previously declared as a struct warnings
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPropertyNames.in (176656 => 176657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-02 16:38:51 UTC (rev 176656)
+++ trunk/Source/WebCore/css/CSSPropertyNames.in 2014-12-02 16:42:22 UTC (rev 176657)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> direction [Inherited, Custom=Value]
</span><span class="cx"> display [LegacyStyleBuilder]
</span><span class="cx"> font [Inherited, LegacyStyleBuilder]
</span><del>-font-family [Inherited, LegacyStyleBuilder]
</del><ins>+font-family [Inherited, Custom=All]
</ins><span class="cx"> font-size [Inherited, LegacyStyleBuilder]
</span><span class="cx"> font-style [Inherited, LegacyStyleBuilder]
</span><span class="cx"> font-variant [Inherited, LegacyStyleBuilder]
</span></span></pre></div>
<a id="trunkSourceWebCorecssDeprecatedStyleBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp (176656 => 176657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-02 16:38:51 UTC (rev 176656)
+++ trunk/Source/WebCore/css/DeprecatedStyleBuilder.cpp 2014-12-02 16:42:22 UTC (rev 176657)
</span><span class="lines">@@ -372,113 +372,6 @@
</span><span class="cx"> static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class ApplyPropertyFontFamily {
-public:
- static void applyInheritValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- FontDescription fontDescription = styleResolver->style()->fontDescription();
- FontDescription parentFontDescription = styleResolver->parentStyle()->fontDescription();
-
- fontDescription.setGenericFamily(parentFontDescription.genericFamily());
- fontDescription.setFamilies(parentFontDescription.families());
- fontDescription.setIsSpecifiedFont(parentFontDescription.isSpecifiedFont());
- styleResolver->setFontDescription(fontDescription);
- return;
- }
-
- static void applyInitialValue(CSSPropertyID, StyleResolver* styleResolver)
- {
- FontDescription fontDescription = styleResolver->style()->fontDescription();
- FontDescription initialDesc = FontDescription();
-
- // We need to adjust the size to account for the generic family change from monospace to non-monospace.
- if (fontDescription.keywordSize() && fontDescription.useFixedDefaultSize())
- styleResolver->setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueXxSmall + fontDescription.keywordSize() - 1, false, styleResolver->document()));
- fontDescription.setGenericFamily(initialDesc.genericFamily());
- if (!initialDesc.firstFamily().isEmpty())
- fontDescription.setFamilies(initialDesc.families());
-
- styleResolver->setFontDescription(fontDescription);
- return;
- }
-
- static void applyValue(CSSPropertyID, StyleResolver* styleResolver, CSSValue* value)
- {
- if (!is<CSSValueList>(*value))
- return;
-
- auto& valueList = downcast<CSSValueList>(*value);
-
- FontDescription fontDescription = styleResolver->style()->fontDescription();
- // Before mapping in a new font-family property, we should reset the generic family.
- bool oldFamilyUsedFixedDefaultSize = fontDescription.useFixedDefaultSize();
- fontDescription.setGenericFamily(FontDescription::NoFamily);
-
- Vector<AtomicString> families;
- families.reserveInitialCapacity(valueList.length());
-
- for (unsigned i = 0; i < valueList.length(); ++i) {
- CSSValue* item = valueList.item(i);
- if (!is<CSSPrimitiveValue>(*item))
- continue;
- CSSPrimitiveValue& contentValue = downcast<CSSPrimitiveValue>(*item);
- AtomicString face;
- if (contentValue.isString())
- face = contentValue.getStringValue();
- else if (Settings* settings = styleResolver->document().settings()) {
- switch (contentValue.getValueID()) {
- case CSSValueWebkitBody:
- face = settings->standardFontFamily();
- break;
- case CSSValueSerif:
- face = serifFamily;
- fontDescription.setGenericFamily(FontDescription::SerifFamily);
- break;
- case CSSValueSansSerif:
- face = sansSerifFamily;
- fontDescription.setGenericFamily(FontDescription::SansSerifFamily);
- break;
- case CSSValueCursive:
- face = cursiveFamily;
- fontDescription.setGenericFamily(FontDescription::CursiveFamily);
- break;
- case CSSValueFantasy:
- face = fantasyFamily;
- fontDescription.setGenericFamily(FontDescription::FantasyFamily);
- break;
- case CSSValueMonospace:
- face = monospaceFamily;
- fontDescription.setGenericFamily(FontDescription::MonospaceFamily);
- break;
- case CSSValueWebkitPictograph:
- face = pictographFamily;
- fontDescription.setGenericFamily(FontDescription::PictographFamily);
- break;
- default:
- break;
- }
- }
-
- if (face.isEmpty())
- continue;
- if (families.isEmpty())
- fontDescription.setIsSpecifiedFont(fontDescription.genericFamily() == FontDescription::NoFamily);
- families.uncheckedAppend(face);
- }
-
- if (families.isEmpty())
- return;
- fontDescription.setFamilies(families);
-
- if (fontDescription.keywordSize() && fontDescription.useFixedDefaultSize() != oldFamilyUsedFixedDefaultSize)
- styleResolver->setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueXxSmall + fontDescription.keywordSize() - 1, !oldFamilyUsedFixedDefaultSize, styleResolver->document()));
-
- styleResolver->setFontDescription(fontDescription);
- }
-
- static PropertyHandler createHandler() { return PropertyHandler(&applyInheritValue, &applyInitialValue, &applyValue); }
-};
-
</del><span class="cx"> class ApplyPropertyFontSize {
</span><span class="cx"> private:
</span><span class="cx"> // When the CSS keyword "larger" is used, this function will attempt to match within the keyword
</span><span class="lines">@@ -1147,7 +1040,6 @@
</span><span class="cx"> setPropertyHandler(CSSPropertyCounterReset, ApplyPropertyCounter<Reset>::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyCursor, ApplyPropertyCursor::createHandler());
</span><span class="cx"> setPropertyHandler(CSSPropertyDisplay, ApplyPropertyDisplay::createHandler());
</span><del>- setPropertyHandler(CSSPropertyFontFamily, ApplyPropertyFontFamily::createHandler());
</del><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></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (176656 => 176657)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-02 16:38:51 UTC (rev 176656)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-02 16:42:22 UTC (rev 176657)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "LocaleToScriptMapping.h"
</span><span class="cx"> #include "Rect.h"
</span><ins>+#include "StyleFontSizeFunctions.h"
</ins><span class="cx"> #include "StyleResolver.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -116,6 +117,10 @@
</span><span class="cx"> static void applyInheritWebkitBoxShadow(StyleResolver&);
</span><span class="cx"> static void applyValueWebkitBoxShadow(StyleResolver&, CSSValue&);
</span><span class="cx">
</span><ins>+ static void applyInitialFontFamily(StyleResolver&);
+ static void applyInheritFontFamily(StyleResolver&);
+ static void applyValueFontFamily(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">@@ -881,6 +886,100 @@
</span><span class="cx"> applyTextOrBoxShadowValue<CSSPropertyWebkitBoxShadow>(styleResolver, value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void StyleBuilderCustom::applyInitialFontFamily(StyleResolver& styleResolver)
+{
+ FontDescription fontDescription = styleResolver.style()->fontDescription();
+ FontDescription initialDesc = FontDescription();
+
+ // We need to adjust the size to account for the generic family change from monospace to non-monospace.
+ if (fontDescription.keywordSize() && fontDescription.useFixedDefaultSize())
+ styleResolver.setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueXxSmall + fontDescription.keywordSize() - 1, false, styleResolver.document()));
+ fontDescription.setGenericFamily(initialDesc.genericFamily());
+ if (!initialDesc.firstFamily().isEmpty())
+ fontDescription.setFamilies(initialDesc.families());
+
+ styleResolver.setFontDescription(fontDescription);
+}
+
+inline void StyleBuilderCustom::applyInheritFontFamily(StyleResolver& styleResolver)
+{
+ FontDescription fontDescription = styleResolver.style()->fontDescription();
+ FontDescription parentFontDescription = styleResolver.parentStyle()->fontDescription();
+
+ fontDescription.setGenericFamily(parentFontDescription.genericFamily());
+ fontDescription.setFamilies(parentFontDescription.families());
+ fontDescription.setIsSpecifiedFont(parentFontDescription.isSpecifiedFont());
+ styleResolver.setFontDescription(fontDescription);
+}
+
+inline void StyleBuilderCustom::applyValueFontFamily(StyleResolver& styleResolver, CSSValue& value)
+{
+ auto& valueList = downcast<CSSValueList>(value);
+
+ FontDescription fontDescription = styleResolver.style()->fontDescription();
+ // Before mapping in a new font-family property, we should reset the generic family.
+ bool oldFamilyUsedFixedDefaultSize = fontDescription.useFixedDefaultSize();
+ fontDescription.setGenericFamily(FontDescription::NoFamily);
+
+ Vector<AtomicString> families;
+ families.reserveInitialCapacity(valueList.length());
+
+ for (auto& item : valueList) {
+ auto& contentValue = downcast<CSSPrimitiveValue>(item.get());
+ AtomicString face;
+ if (contentValue.isString())
+ face = contentValue.getStringValue();
+ else if (Settings* settings = styleResolver.document().settings()) {
+ switch (contentValue.getValueID()) {
+ case CSSValueWebkitBody:
+ face = settings->standardFontFamily();
+ break;
+ case CSSValueSerif:
+ face = serifFamily;
+ fontDescription.setGenericFamily(FontDescription::SerifFamily);
+ break;
+ case CSSValueSansSerif:
+ face = sansSerifFamily;
+ fontDescription.setGenericFamily(FontDescription::SansSerifFamily);
+ break;
+ case CSSValueCursive:
+ face = cursiveFamily;
+ fontDescription.setGenericFamily(FontDescription::CursiveFamily);
+ break;
+ case CSSValueFantasy:
+ face = fantasyFamily;
+ fontDescription.setGenericFamily(FontDescription::FantasyFamily);
+ break;
+ case CSSValueMonospace:
+ face = monospaceFamily;
+ fontDescription.setGenericFamily(FontDescription::MonospaceFamily);
+ break;
+ case CSSValueWebkitPictograph:
+ face = pictographFamily;
+ fontDescription.setGenericFamily(FontDescription::PictographFamily);
+ break;
+ default:
+ break;
+ }
+ }
+
+ if (face.isEmpty())
+ continue;
+ if (families.isEmpty())
+ fontDescription.setIsSpecifiedFont(fontDescription.genericFamily() == FontDescription::NoFamily);
+ families.uncheckedAppend(face);
+ }
+
+ if (families.isEmpty())
+ return;
+ fontDescription.setFamilies(families);
+
+ if (fontDescription.keywordSize() && fontDescription.useFixedDefaultSize() != oldFamilyUsedFixedDefaultSize)
+ styleResolver.setFontSize(fontDescription, Style::fontSizeForKeyword(CSSValueXxSmall + fontDescription.keywordSize() - 1, !oldFamilyUsedFixedDefaultSize, styleResolver.document()));
+
+ 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>