<!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>[194349] branches/safari-601.1.46-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/194349">194349</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-12-21 14:25:57 -0800 (Mon, 21 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188802">r188802</a>.  rdar://problem/23978917</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreplatformgraphicsmacFontCacheMacmm">branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194348 => 194349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2015-12-21 22:22:58 UTC (rev 194348)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog        2015-12-21 22:25:57 UTC (rev 194349)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-21  Babak Shafiei  &lt;bshafiei@apple.com&gt;
+
+        Merge r188802.
+
+    2015-08-21  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
+
+            [OS X] Remove dead code from FontCache::systemFallbackForCharacters()
+            https://bugs.webkit.org/show_bug.cgi?id=148218
+
+            Reviewed by Daniel Bates.
+
+            lookupCTFont() in FontCacheMac.mm will always return the best font (because
+            CTFontCreateForCharactersWithLanguage() does so). Also, all fonts that will
+            be created on WebKit's behalf are already printer fonts.
+
+            No new tests because there is no behavior change.
+
+            * platform/graphics/mac/FontCacheMac.mm:
+            (WebCore::FontCache::systemFallbackForCharacters): Deleted.
+
</ins><span class="cx"> 2015-12-18  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r194206. rdar://problem/23824469
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (194348 => 194349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm        2015-12-21 22:22:58 UTC (rev 194348)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm        2015-12-21 22:25:57 UTC (rev 194349)
</span><span class="lines">@@ -523,17 +523,10 @@
</span><span class="cx">     // font pointer.
</span><span class="cx">     NSFont *substituteFont = reinterpret_cast&lt;NSFont *&gt;(const_cast&lt;__CTFont*&gt;(fallbackDedupSet().add(result).iterator-&gt;get()));
</span><span class="cx"> 
</span><del>-    // Use the family name from the AppKit-supplied substitute font, requesting the
-    // traits, weight, and size we want. One way this does better than the original
-    // AppKit request is that it takes synthetic bold and oblique into account.
-    // But it does create the possibility that we could end up with a font that
-    // doesn't actually cover the characters we need.
-
</del><span class="cx">     NSFontManager *fontManager = [NSFontManager sharedFontManager];
</span><span class="cx"> 
</span><span class="cx">     NSFontTraitMask traits = 0;
</span><span class="cx">     NSInteger weight;
</span><del>-    CGFloat size;
</del><span class="cx"> 
</span><span class="cx">     if (nsFont) {
</span><span class="cx">         if (description.italic())
</span><span class="lines">@@ -543,32 +536,15 @@
</span><span class="cx">         if (platformData.m_syntheticOblique)
</span><span class="cx">             traits |= NSFontItalicTrait;
</span><span class="cx">         weight = [fontManager weightOfFont:nsFont];
</span><del>-        size = [nsFont pointSize];
</del><span class="cx">     } else {
</span><del>-        // For custom fonts nsFont is nil.
</del><ins>+        ASSERT(!CORETEXT_WEB_FONTS);
</ins><span class="cx">         traits = description.italic() ? NSFontItalicTrait : 0;
</span><span class="cx">         weight = toAppKitFontWeight(description.weight());
</span><del>-        size = description.computedPixelSize();
</del><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     NSFontTraitMask substituteFontTraits = [fontManager traitsOfFont:substituteFont];
</span><span class="cx">     NSInteger substituteFontWeight = [fontManager weightOfFont:substituteFont];
</span><span class="cx"> 
</span><del>-    if (traits != substituteFontTraits || weight != substituteFontWeight || !nsFont) {
-        if (NSFont *bestVariation = [fontManager fontWithFamily:[substituteFont familyName] traits:traits weight:weight size:size]) {
-            UChar32 character;
-            U16_GET(characters, 0, 0, length, character);
-            if (!nsFont || (([fontManager traitsOfFont:bestVariation] != substituteFontTraits || [fontManager weightOfFont:bestVariation] != substituteFontWeight)
-                &amp;&amp; [[bestVariation coveredCharacterSet] longCharacterIsMember:character]))
-                substituteFont = bestVariation;
-        }
-    }
-
-    substituteFont = [substituteFont printerFont];
-
-    substituteFontTraits = [fontManager traitsOfFont:substituteFont];
-    substituteFontWeight = [fontManager weightOfFont:substituteFont];
-
</del><span class="cx">     FontPlatformData alternateFont(reinterpret_cast&lt;CTFontRef&gt;(substituteFont), platformData.size(),
</span><span class="cx">         !isPlatformFont &amp;&amp; isAppKitFontWeightBold(weight) &amp;&amp; !isAppKitFontWeightBold(substituteFontWeight),
</span><span class="cx">         !isPlatformFont &amp;&amp; (traits &amp; NSFontItalicTrait) &amp;&amp; !(substituteFontTraits &amp; NSFontItalicTrait),
</span></span></pre>
</div>
</div>

</body>
</html>