<!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>[213502] 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/213502">213502</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-03-06 22:24:16 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed post-review fixup after <a href="http://trac.webkit.org/projects/webkit/changeset/213464">r213464</a>
https://bugs.webkit.org/show_bug.cgi?id=169255
* platform/graphics/FontCache.h:
(WebCore::FontDescriptionKey::FontDescriptionKey):
(WebCore::FontDescriptionKey::operator==):
(WebCore::FontDescriptionKey::computeHash):
(WebCore::FontDescriptionKey::makeFlagsKey):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::computeNecessarySynthesis):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213501 => 213502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-07 06:10:37 UTC (rev 213501)
+++ trunk/Source/WebCore/ChangeLog 2017-03-07 06:24:16 UTC (rev 213502)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unreviewed post-review fixup after r213464
+ https://bugs.webkit.org/show_bug.cgi?id=169255
+
+ * platform/graphics/FontCache.h:
+ (WebCore::FontDescriptionKey::FontDescriptionKey):
+ (WebCore::FontDescriptionKey::operator==):
+ (WebCore::FontDescriptionKey::computeHash):
+ (WebCore::FontDescriptionKey::makeFlagsKey):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::computeNecessarySynthesis):
+
</ins><span class="cx"> 2017-03-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Validate DOM after potentially destructive actions during parser insert operations
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (213501 => 213502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2017-03-07 06:10:37 UTC (rev 213501)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2017-03-07 06:24:16 UTC (rev 213502)
</span><span class="lines">@@ -72,13 +72,12 @@
</span><span class="cx">
</span><span class="cx"> FontDescriptionKey(const FontDescription& description)
</span><span class="cx"> : m_size(description.computedPixelSize())
</span><del>- , m_weight(description.weight())
</del><ins>+ , m_fontSelectionRequest(description.fontSelectionRequest())
</ins><span class="cx"> , m_flags(makeFlagsKey(description))
</span><span class="cx"> , m_featureSettings(description.featureSettings())
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> , m_variationSettings(description.variationSettings())
</span><span class="cx"> #endif
</span><del>- , m_stretch(description.stretch().rawValue())
</del><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> explicit FontDescriptionKey(WTF::HashTableDeletedValueType)
</span><span class="lines">@@ -88,8 +87,7 @@
</span><span class="cx"> bool operator==(const FontDescriptionKey& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_size == other.m_size
</span><del>- && m_weight == other.m_weight
- && m_stretch == other.m_stretch
</del><ins>+ && m_fontSelectionRequest == other.m_fontSelectionRequest
</ins><span class="cx"> && m_flags == other.m_flags
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> && m_variationSettings == other.m_variationSettings
</span><span class="lines">@@ -108,8 +106,9 @@
</span><span class="cx"> {
</span><span class="cx"> IntegerHasher hasher;
</span><span class="cx"> hasher.add(m_size);
</span><del>- hasher.add(m_weight);
- hasher.add(m_stretch);
</del><ins>+ hasher.add(m_fontSelectionRequest.weight);
+ hasher.add(m_fontSelectionRequest.width);
+ hasher.add(m_fontSelectionRequest.slope);
</ins><span class="cx"> for (unsigned flagItem : m_flags)
</span><span class="cx"> hasher.add(flagItem);
</span><span class="cx"> hasher.add(m_featureSettings.hash());
</span><span class="lines">@@ -129,7 +128,6 @@
</span><span class="cx"> | static_cast<unsigned>(description.widthVariant()) << 4
</span><span class="cx"> | static_cast<unsigned>(description.nonCJKGlyphOrientation()) << 3
</span><span class="cx"> | static_cast<unsigned>(description.orientation()) << 2
</span><del>- | static_cast<unsigned>(description.italic()) << 1
</del><span class="cx"> | static_cast<unsigned>(description.renderingMode());
</span><span class="cx"> unsigned second = static_cast<unsigned>(description.variantEastAsianRuby()) << 27
</span><span class="cx"> | static_cast<unsigned>(description.variantEastAsianWidth()) << 25
</span><span class="lines">@@ -153,13 +151,12 @@
</span><span class="cx">
</span><span class="cx"> // FontCascade::locale() is explicitly not included in this struct.
</span><span class="cx"> unsigned m_size { 0 };
</span><del>- unsigned m_weight { 0 };
</del><ins>+ FontSelectionRequest m_fontSelectionRequest;
</ins><span class="cx"> std::array<unsigned, 2> m_flags {{ 0, 0 }};
</span><span class="cx"> FontFeatureSettings m_featureSettings;
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> FontVariationSettings m_variationSettings;
</span><span class="cx"> #endif
</span><del>- uint16_t m_stretch { 0 };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct FontDescriptionKeyHash {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (213501 => 213502)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-07 06:10:37 UTC (rev 213501)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-07 06:24:16 UTC (rev 213502)
</span><span class="lines">@@ -661,7 +661,7 @@
</span><span class="cx"> CTFontSymbolicTraits desiredTraits = computeTraits(fontDescription);
</span><span class="cx">
</span><span class="cx"> CTFontSymbolicTraits actualTraits = 0;
</span><del>- if (isFontWeightBold(fontDescription.weight()) || fontDescription.italic())
</del><ins>+ if (isFontWeightBold(fontDescription.weight()) || isItalic(fontDescription.italic()))
</ins><span class="cx"> actualTraits = CTFontGetSymbolicTraits(font);
</span><span class="cx">
</span><span class="cx"> bool needsSyntheticBold = (fontDescription.fontSynthesis() & FontSynthesisWeight) && (desiredTraits & kCTFontTraitBold) && !(actualTraits & kCTFontTraitBold);
</span></span></pre>
</div>
</div>
</body>
</html>