<!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>[193592] branches/safari-601-branch/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/193592">193592</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-06 14:03:21 -0800 (Sun, 06 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188114">r188114</a>. rdar://problem/23769852</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSSegmentedFontFacecpp">branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSSegmentedFontFaceh">branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCacheh">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193591 => 193592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-06 22:03:21 UTC (rev 193592)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-12-06 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r188114.
+
+ 2015-08-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ CSSSegmentedFontFace::fontRanges() does not handle duplicate fonts correctly
+ https://bugs.webkit.org/show_bug.cgi?id=147765
+
+ Reviewed by Filip Pizlo.
+
+ CSSSegmentedFontFace::fontRanges() was trying to hash on FontDescriptors by
+ picking a few specific pieces of data out of the FontDescriptor, computing
+ a hash on it, and using that unsigned as a key in a HashMap. This has two
+ problems: it doesn't handle equality correctly, as hash collisions cannot
+ depend on an equality operator to dedup, and it doesn't hash on all the
+ members of a FontDescription.
+
+ Instead, this HashMap should use FontDescriptionKey, which represents a
+ FontDescription, and is designed exactly for the purpose of being used as a
+ key in a HashMap.
+
+ No new tests because there is no behavior change (because a problem occurs
+ when two different FontDescriptions hash to the same value, which is rare).
+
+ * css/CSSSegmentedFontFace.cpp:
+ (WebCore::CSSSegmentedFontFace::fontRanges):
+ * css/CSSSegmentedFontFace.h:
+ * platform/graphics/FontCache.h:
+ (WebCore::FontDescriptionKeyHash::hash):
+ (WebCore::FontDescriptionKeyHash::equal):
+
</ins><span class="cx"> 2015-12-06 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r190895. rdar://problem/23769817
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSSegmentedFontFacecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp (193591 => 193592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp        2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.cpp        2015-12-06 22:03:21 UTC (rev 193592)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "CSSFontSelector.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Font.h"
</span><ins>+#include "FontCache.h"
</ins><span class="cx"> #include "FontDescription.h"
</span><span class="cx"> #include "RuntimeEnabledFeatures.h"
</span><span class="cx">
</span><span class="lines">@@ -113,17 +114,11 @@
</span><span class="cx"> return FontRanges();
</span><span class="cx">
</span><span class="cx"> FontTraitsMask desiredTraitsMask = fontDescription.traitsMask();
</span><del>- // FIXME: Unify this function with FontDescriptionFontDataCacheKey in FontCache.h (Or just use the regular FontCache instead of this)
- unsigned hashKey = ((fontDescription.computedPixelSize() + 1) << (FontTraitsMaskWidth + FontWidthVariantWidth + FontSynthesisWidth + 1))
- | (fontDescription.fontSynthesis() << (FontTraitsMaskWidth + FontWidthVariantWidth + 1))
- | ((fontDescription.orientation() == Vertical ? 1 : 0) << (FontTraitsMaskWidth + FontWidthVariantWidth))
- | fontDescription.widthVariant() << FontTraitsMaskWidth
- | desiredTraitsMask;
</del><span class="cx">
</span><del>- auto addResult = m_descriptionToRangesMap.add(hashKey, FontRanges());
</del><ins>+ auto addResult = m_descriptionToRangesMap.add(FontDescriptionFontDataCacheKey(fontDescription), FontRanges());
</ins><span class="cx"> auto& fontRanges = addResult.iterator->value;
</span><span class="cx">
</span><del>- if (addResult.isNewEntry) {
</del><ins>+ if (true /*addResult.isNewEntry*/) {
</ins><span class="cx"> for (auto& face : m_fontFaces) {
</span><span class="cx"> if (!face->isValid())
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSSegmentedFontFaceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h (193591 => 193592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h        2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/css/CSSSegmentedFontFace.h        2015-12-06 22:03:21 UTC (rev 193592)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef CSSSegmentedFontFace_h
</span><span class="cx"> #define CSSSegmentedFontFace_h
</span><span class="cx">
</span><ins>+#include "FontCache.h"
</ins><span class="cx"> #include "FontRanges.h"
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -73,7 +74,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CSSFontSelector* m_fontSelector;
</span><del>- HashMap<unsigned, FontRanges> m_descriptionToRangesMap;
</del><ins>+ HashMap<FontDescriptionFontDataCacheKey, FontRanges, FontDescriptionKeyHash, WTF::SimpleClassHashTraits<FontDescriptionFontDataCacheKey>> m_descriptionToRangesMap;
</ins><span class="cx"> Vector<RefPtr<CSSFontFace>, 1> m_fontFaces;
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> Vector<RefPtr<LoadFontCallback>> m_callbacks;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (193591 => 193592)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h        2015-12-06 21:59:06 UTC (rev 193591)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h        2015-12-06 22:03:21 UTC (rev 193592)
</span><span class="lines">@@ -139,6 +139,20 @@
</span><span class="cx"> FontFeatureSettings m_featureSettings;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct FontDescriptionKeyHash {
+ static unsigned hash(const FontDescriptionFontDataCacheKey& key)
+ {
+ return key.computeHash();
+ }
+
+ static bool equal(const FontDescriptionFontDataCacheKey& a, const FontDescriptionFontDataCacheKey& b)
+ {
+ return a == b;
+ }
+
+ static const bool safeToCompareToEmptyOrDeleted = true;
+};
+
</ins><span class="cx"> class FontCache {
</span><span class="cx"> friend class WTF::NeverDestroyed<FontCache>;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>