<!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>[176790] 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/176790">176790</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-04 06:09:57 -0800 (Thu, 04 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/176789">r176789</a>.
https://bugs.webkit.org/show_bug.cgi?id=139255
Broke the non Mac-WK2 builds (Requested by stavila on
#webkit).
Reverted changeset:
"Remove isSpecifiedFont boolean from FontDescription"
https://bugs.webkit.org/show_bug.cgi?id=139233
http://trac.webkit.org/changeset/176789</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptioncpp">trunk/Source/WebCore/platform/graphics/FontDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptionh">trunk/Source/WebCore/platform/graphics/FontDescription.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176789 => 176790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-04 11:50:26 UTC (rev 176789)
+++ trunk/Source/WebCore/ChangeLog 2014-12-04 14:09:57 UTC (rev 176790)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-12-04 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r176789.
+ https://bugs.webkit.org/show_bug.cgi?id=139255
+
+ Broke the non Mac-WK2 builds (Requested by stavila on
+ #webkit).
+
+ Reverted changeset:
+
+ "Remove isSpecifiedFont boolean from FontDescription"
+ https://bugs.webkit.org/show_bug.cgi?id=139233
+ http://trac.webkit.org/changeset/176789
+
</ins><span class="cx"> 2014-12-03 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove isSpecifiedFont boolean from FontDescription
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (176789 => 176790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-04 11:50:26 UTC (rev 176789)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2014-12-04 14:09:57 UTC (rev 176790)
</span><span class="lines">@@ -911,6 +911,7 @@
</span><span class="cx"> FontDescription parentFontDescription = styleResolver.parentStyle()->fontDescription();
</span><span class="cx">
</span><span class="cx"> fontDescription.setFamilies(parentFontDescription.families());
</span><ins>+ fontDescription.setIsSpecifiedFont(parentFontDescription.isSpecifiedFont());
</ins><span class="cx"> styleResolver.setFontDescription(fontDescription);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -928,6 +929,7 @@
</span><span class="cx"> for (auto& item : valueList) {
</span><span class="cx"> auto& contentValue = downcast<CSSPrimitiveValue>(item.get());
</span><span class="cx"> AtomicString family;
</span><ins>+ bool isGenericFamily = false;
</ins><span class="cx"> if (contentValue.isString())
</span><span class="cx"> family = contentValue.getStringValue();
</span><span class="cx"> else {
</span><span class="lines">@@ -938,28 +940,37 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSSValueSerif:
</span><span class="cx"> family = serifFamily;
</span><ins>+ isGenericFamily = true;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueSansSerif:
</span><span class="cx"> family = sansSerifFamily;
</span><ins>+ isGenericFamily = true;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueCursive:
</span><span class="cx"> family = cursiveFamily;
</span><ins>+ isGenericFamily = true;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueFantasy:
</span><span class="cx"> family = fantasyFamily;
</span><ins>+ isGenericFamily = true;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueMonospace:
</span><span class="cx"> family = monospaceFamily;
</span><ins>+ isGenericFamily = true;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueWebkitPictograph:
</span><span class="cx"> family = pictographFamily;
</span><ins>+ isGenericFamily = true;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (family.isEmpty())
</span><span class="cx"> continue;
</span><ins>+ if (families.isEmpty())
+ fontDescription.setIsSpecifiedFont(!isGenericFamily);
</ins><span class="cx"> families.uncheckedAppend(family);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.cpp (176789 => 176790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.cpp 2014-12-04 11:50:26 UTC (rev 176789)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.cpp 2014-12-04 14:09:57 UTC (rev 176790)
</span><span class="lines">@@ -30,10 +30,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "FontDescription.h"
</span><span class="cx">
</span><del>-#include <wtf/HashSet.h>
-#include <wtf/NeverDestroyed.h>
-#include <wtf/text/AtomicStringHash.h>
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> struct SameSizeAsFontDescription {
</span><span class="lines">@@ -105,29 +101,6 @@
</span><span class="cx"> return normalDescription;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const HashSet<AtomicString>& genericFamiliesSet()
-{
- static NeverDestroyed<HashSet<AtomicString>> set;
- if (set.get().isEmpty()) {
- set.get().add(cursiveFamily);
- set.get().add(fantasyFamily);
- set.get().add(monospaceFamily);
- set.get().add(pictographFamily);
- set.get().add(sansSerifFamily);
- set.get().add(serifFamily);
- set.get().add(standardFamily);
- }
- return set.get();
-}
-
-bool FontDescription::hasGenericFirstFamily() const
-{
- auto& family = firstFamily();
- if (family.isNull())
- return false;
- return genericFamiliesSet().contains(family);
-}
-
</del><span class="cx"> #if ENABLE(IOS_TEXT_AUTOSIZING)
</span><span class="cx"> bool FontDescription::familiesEqualForTextAutoSizing(const FontDescription& other) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (176789 => 176790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.h 2014-12-04 11:50:26 UTC (rev 176789)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h 2014-12-04 14:09:57 UTC (rev 176790)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> , m_keywordSize(0)
</span><span class="cx"> , m_fontSmoothing(AutoSmoothing)
</span><span class="cx"> , m_textRendering(AutoTextRendering)
</span><ins>+ , m_isSpecifiedFont(false)
</ins><span class="cx"> , m_script(USCRIPT_COMMON)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -126,9 +127,9 @@
</span><span class="cx"> FontSmoothingMode fontSmoothing() const { return static_cast<FontSmoothingMode>(m_fontSmoothing); }
</span><span class="cx"> TextRenderingMode textRenderingMode() const { return static_cast<TextRenderingMode>(m_textRendering); }
</span><span class="cx"> UScriptCode script() const { return static_cast<UScriptCode>(m_script); }
</span><del>- bool hasGenericFirstFamily() const;
</del><span class="cx">
</span><span class="cx"> FontTraitsMask traitsMask() const;
</span><ins>+ bool isSpecifiedFont() const { return m_isSpecifiedFont; }
</ins><span class="cx"> FontOrientation orientation() const { return static_cast<FontOrientation>(m_orientation); }
</span><span class="cx"> NonCJKGlyphOrientation nonCJKGlyphOrientation() const { return static_cast<NonCJKGlyphOrientation>(m_nonCJKGlyphOrientation); }
</span><span class="cx"> FontWidthVariant widthVariant() const { return static_cast<FontWidthVariant>(m_widthVariant); }
</span><span class="lines">@@ -155,6 +156,7 @@
</span><span class="cx"> void setKeywordSize(unsigned s) { m_keywordSize = s; }
</span><span class="cx"> void setFontSmoothing(FontSmoothingMode smoothing) { m_fontSmoothing = smoothing; }
</span><span class="cx"> void setTextRenderingMode(TextRenderingMode rendering) { m_textRendering = rendering; }
</span><ins>+ void setIsSpecifiedFont(bool isSpecifiedFont) { m_isSpecifiedFont = isSpecifiedFont; }
</ins><span class="cx"> void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
</span><span class="cx"> void setNonCJKGlyphOrientation(NonCJKGlyphOrientation orientation) { m_nonCJKGlyphOrientation = orientation; }
</span><span class="cx"> void setWidthVariant(FontWidthVariant widthVariant) { m_widthVariant = widthVariant; }
</span><span class="lines">@@ -207,6 +209,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_fontSmoothing : 2; // FontSmoothingMode
</span><span class="cx"> unsigned m_textRendering : 2; // TextRenderingMode
</span><ins>+ unsigned m_isSpecifiedFont : 1; // True if a web page specifies a non-generic font family as the first font family.
</ins><span class="cx"> unsigned m_script : 7; // Used to help choose an appropriate font for generic font families.
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -228,6 +231,7 @@
</span><span class="cx"> && m_keywordSize == other.m_keywordSize
</span><span class="cx"> && m_fontSmoothing == other.m_fontSmoothing
</span><span class="cx"> && m_textRendering == other.m_textRendering
</span><ins>+ && m_isSpecifiedFont == other.m_isSpecifiedFont
</ins><span class="cx"> && m_orientation == other.m_orientation
</span><span class="cx"> && m_nonCJKGlyphOrientation == other.m_nonCJKGlyphOrientation
</span><span class="cx"> && m_widthVariant == other.m_widthVariant
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (176789 => 176790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2014-12-04 11:50:26 UTC (rev 176789)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2014-12-04 14:09:57 UTC (rev 176790)
</span><span class="lines">@@ -213,11 +213,15 @@
</span><span class="cx"> bool RenderText::computeUseBackslashAsYenSymbol() const
</span><span class="cx"> {
</span><span class="cx"> const RenderStyle& style = this->style();
</span><ins>+ const FontDescription& fontDescription = style.font().fontDescription();
</ins><span class="cx"> if (style.font().useBackslashAsYenSymbol())
</span><span class="cx"> return true;
</span><del>- if (!document().decoder() || document().decoder()->encoding().backslashAsCurrencySymbol() == '\\')
</del><ins>+ if (fontDescription.isSpecifiedFont())
</ins><span class="cx"> return false;
</span><del>- return style.font().fontDescription().hasGenericFirstFamily() || style.font().primaryFontDataIsSystemFont();
</del><ins>+ const TextEncoding* encoding = document().decoder() ? &document().decoder()->encoding() : 0;
+ if (encoding && encoding->backslashAsCurrencySymbol() != '\\')
+ return true;
+ return false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderText::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
</span></span></pre>
</div>
</div>
</body>
</html>