<!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>[195568] branches/safari-601.1.46-branch</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/195568">195568</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-25 16:43:39 -0800 (Mon, 25 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/195150">r195150</a>. rdar://problem/24208162</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<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>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfasttextsystemfontfeaturesexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfasttextsystemfontfeatureshtml">branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (195567 => 195568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-26 00:35:17 UTC (rev 195567)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-26 00:43:39 UTC (rev 195568)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r195150. rdar://problem/24208162
+
+ 2016-01-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Font features are not applied to the system font
+ https://bugs.webkit.org/show_bug.cgi?id=153053
+
+ Reviewed by Dean Jackson.
+
+ * fast/text/system-font-features-expected.html: Added.
+ * fast/text/system-font-features.html: Added.
+
</ins><span class="cx"> 2016-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195075.
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextsystemfontfeaturesexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features-expected.html (0 => 195568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features-expected.html 2016-01-26 00:43:39 UTC (rev 195568)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that font features are applied to -apple-system.
+<div style="font: 50px -apple-system-monospaced-numbers;">0123456789</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfasttextsystemfontfeatureshtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features.html (0 => 195568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/text/system-font-features.html 2016-01-26 00:43:39 UTC (rev 195568)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+</head>
+<body>
+This test makes sure that font features are applied to -apple-system.
+<div style="font: 50px -apple-system; font-variant-numeric: tabular-nums;">0123456789</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (195567 => 195568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-26 00:35:17 UTC (rev 195567)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-26 00:43:39 UTC (rev 195568)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-20 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r195150. rdar://problem/24208162
+
+ 2016-01-15 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Font features are not applied to the system font
+ https://bugs.webkit.org/show_bug.cgi?id=153053
+
+ Reviewed by Dean Jackson.
+
+ We simply need to call preparePlatformFont() on it.
+
+ Test: fast/text/system-font-features.html
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::fontWithFamily):
+
</ins><span class="cx"> 2016-01-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r195132.
</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 (195567 => 195568)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2016-01-26 00:35:17 UTC (rev 195567)
+++ branches/safari-601.1.46-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2016-01-26 00:43:39 UTC (rev 195568)
</span><span class="lines">@@ -273,117 +273,113 @@
</span><span class="cx"> int chosenWeight;
</span><span class="cx"> NSFont *font;
</span><span class="cx">
</span><ins>+ RetainPtr<CTFontRef> foundFont = fontWithFamilySpecialCase(family, weight, desiredTraits, size);
+ if (!foundFont) {
</ins><span class="cx"> #if ENABLE(PLATFORM_FONT_LOOKUP)
</span><del>-
- const auto& whitelist = fontWhitelist();
- if (whitelist.size() && !whitelist.contains(family.lower()))
- return nil;
- CTFontSymbolicTraits requestedTraits = 0;
- if (desiredTraits & NSFontItalicTrait)
- requestedTraits |= kCTFontItalicTrait;
- if (weight >= FontWeight600)
- requestedTraits |= kCTFontBoldTrait;
-
- NSString *desiredFamily = family;
- RetainPtr<CTFontRef> foundFont = adoptCF(CTFontCreateForCSS((CFStringRef)desiredFamily, toCoreTextFontWeight(weight), requestedTraits, size));
- foundFont = applyFontFeatureSettings(foundFont.get(), nullptr, nullptr, featureSettings, variantSettings);
- if (!foundFont)
- return nil;
- font = CFBridgingRelease(CFRetain(foundFont.get()));
- availableFamily = [font familyName];
- chosenWeight = [fontManager weightOfFont:font];
-
-#else
-
- UNUSED_PARAM(featureSettings);
- UNUSED_PARAM(variantSettings);
-
- NSFontTraitMask desiredTraitsForNameMatch = desiredTraits | (weight >= FontWeight600 ? NSBoldFontMask : 0);
- if (hasDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily)) {
- if (!availableFamily) {
- // We already know the desired font family does not map to any available font family.
</del><ins>+ const auto& whitelist = fontWhitelist();
+ if (whitelist.size() && !whitelist.contains(family.lower()))
</ins><span class="cx"> return nil;
</span><del>- }
- }
</del><ins>+ CTFontSymbolicTraits requestedTraits = 0;
+ if (desiredTraits & NSFontItalicTrait)
+ requestedTraits |= kCTFontItalicTrait;
+ if (weight >= FontWeight600)
+ requestedTraits |= kCTFontBoldTrait;
</ins><span class="cx">
</span><del>- if (!availableFamily) {
</del><span class="cx"> NSString *desiredFamily = family;
</span><del>-
- // Do a simple case insensitive search for a matching font family.
- // NSFontManager requires exact name matches.
- // This addresses the problem of matching arial to Arial, etc., but perhaps not all the issues.
- for (availableFamily in [fontManager availableFontFamilies]) {
- if ([desiredFamily caseInsensitiveCompare:availableFamily] == NSOrderedSame)
- break;
</del><ins>+ foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, size);
+ if (!foundFont)
+ return nil;
+ font = CFBridgingRelease(CFRetain(foundFont.get()));
+ availableFamily = [font familyName];
+ chosenWeight = [fontManager weightOfFont:font];
+#else
+ foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
+ NSFontTraitMask desiredTraitsForNameMatch = desiredTraits | (weight >= FontWeight600 ? NSBoldFontMask : 0);
+ if (hasDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily)) {
+ if (!availableFamily) {
+ // We already know the desired font family does not map to any available font family.
+ return nil;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!availableFamily) {
</span><del>- // Match by PostScript name.
- NSFont *nameMatchedFont = nil;
- for (NSString *availableFont in [fontManager availableFonts]) {
- if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
- nameMatchedFont = [NSFont fontWithName:availableFont size:size];
</del><ins>+ NSString *desiredFamily = family;
</ins><span class="cx">
</span><del>- // Special case Osaka-Mono. According to <rdar://problem/3999467>, we need to
- // treat Osaka-Mono as fixed pitch.
- if ([desiredFamily caseInsensitiveCompare:@"Osaka-Mono"] == NSOrderedSame && !desiredTraitsForNameMatch)
- return nameMatchedFont;
</del><ins>+ // Do a simple case insensitive search for a matching font family.
+ // NSFontManager requires exact name matches.
+ // This addresses the problem of matching arial to Arial, etc., but perhaps not all the issues.
+ for (availableFamily in [fontManager availableFontFamilies]) {
+ if ([desiredFamily caseInsensitiveCompare:availableFamily] == NSOrderedSame)
+ break;
+ }
</ins><span class="cx">
</span><del>- NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
- if ((traits & desiredTraitsForNameMatch) == desiredTraitsForNameMatch)
- return [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraitsForNameMatch];
</del><ins>+ if (!availableFamily) {
+ // Match by PostScript name.
+ NSFont *nameMatchedFont = nil;
+ for (NSString *availableFont in [fontManager availableFonts]) {
+ if ([desiredFamily caseInsensitiveCompare:availableFont] == NSOrderedSame) {
+ nameMatchedFont = [NSFont fontWithName:availableFont size:size];
</ins><span class="cx">
</span><del>- availableFamily = [nameMatchedFont familyName];
- break;
</del><ins>+ // Special case Osaka-Mono. According to <rdar://problem/3999467>, we need to
+ // treat Osaka-Mono as fixed pitch.
+ if ([desiredFamily caseInsensitiveCompare:@"Osaka-Mono"] == NSOrderedSame && !desiredTraitsForNameMatch)
+ return nameMatchedFont;
+
+ NSFontTraitMask traits = [fontManager traitsOfFont:nameMatchedFont];
+ if ((traits & desiredTraitsForNameMatch) == desiredTraitsForNameMatch)
+ return [fontManager convertFont:nameMatchedFont toHaveTrait:desiredTraitsForNameMatch];
+
+ availableFamily = [nameMatchedFont familyName];
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ rememberDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily);
+ if (!availableFamily)
+ return nil;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- rememberDesiredFamilyToAvailableFamilyMapping(family, desiredTraitsForNameMatch, availableFamily);
- if (!availableFamily)
- return nil;
- }
</del><ins>+ // Found a family, now figure out what weight and traits to use.
+ bool choseFont = false;
+ chosenWeight = 0;
+ NSFontTraitMask chosenTraits = 0;
+ NSString *chosenFullName = 0;
</ins><span class="cx">
</span><del>- // Found a family, now figure out what weight and traits to use.
- bool choseFont = false;
- chosenWeight = 0;
- NSFontTraitMask chosenTraits = 0;
- NSString *chosenFullName = 0;
</del><ins>+ int appKitDesiredWeight = toAppKitFontWeight(weight);
+ NSArray *fonts = [fontManager availableMembersOfFontFamily:availableFamily];
+ for (NSArray *fontInfo in fonts) {
+ // Array indices must be hard coded because of lame AppKit API.
+ NSString *fontFullName = [fontInfo objectAtIndex:0];
+ NSInteger fontWeight = [[fontInfo objectAtIndex:2] intValue];
+ NSFontTraitMask fontTraits = [[fontInfo objectAtIndex:3] unsignedIntValue];
</ins><span class="cx">
</span><del>- int appKitDesiredWeight = toAppKitFontWeight(weight);
- NSArray *fonts = [fontManager availableMembersOfFontFamily:availableFamily];
- for (NSArray *fontInfo in fonts) {
- // Array indices must be hard coded because of lame AppKit API.
- NSString *fontFullName = [fontInfo objectAtIndex:0];
- NSInteger fontWeight = [[fontInfo objectAtIndex:2] intValue];
- NSFontTraitMask fontTraits = [[fontInfo objectAtIndex:3] unsignedIntValue];
</del><ins>+ BOOL newWinner;
+ if (!choseFont)
+ newWinner = acceptableChoice(desiredTraits, fontTraits);
+ else
+ newWinner = betterChoice(desiredTraits, appKitDesiredWeight, chosenTraits, chosenWeight, fontTraits, fontWeight);
</ins><span class="cx">
</span><del>- BOOL newWinner;
- if (!choseFont)
- newWinner = acceptableChoice(desiredTraits, fontTraits);
- else
- newWinner = betterChoice(desiredTraits, appKitDesiredWeight, chosenTraits, chosenWeight, fontTraits, fontWeight);
</del><ins>+ if (newWinner) {
+ choseFont = YES;
+ chosenWeight = fontWeight;
+ chosenTraits = fontTraits;
+ chosenFullName = fontFullName;
</ins><span class="cx">
</span><del>- if (newWinner) {
- choseFont = YES;
- chosenWeight = fontWeight;
- chosenTraits = fontTraits;
- chosenFullName = fontFullName;
-
- if (chosenWeight == appKitDesiredWeight && (chosenTraits & IMPORTANT_FONT_TRAITS) == (desiredTraits & IMPORTANT_FONT_TRAITS))
- break;
</del><ins>+ if (chosenWeight == appKitDesiredWeight && (chosenTraits & IMPORTANT_FONT_TRAITS) == (desiredTraits & IMPORTANT_FONT_TRAITS))
+ break;
+ }
</ins><span class="cx"> }
</span><del>- }
</del><span class="cx">
</span><del>- if (!choseFont)
- return nil;
</del><ins>+ if (!choseFont)
+ return nil;
</ins><span class="cx">
</span><del>- font = [NSFont fontWithName:chosenFullName size:size];
- auto foundFont = applyFontFeatureSettings((CTFontRef)font, nullptr, nullptr, featureSettings, variantSettings);
- font = CFBridgingRelease(CFRetain(foundFont.get()));
</del><ins>+ font = [NSFont fontWithName:chosenFullName size:size];
+ auto foundFont = applyFontFeatureSettings((CTFontRef)font, nullptr, nullptr, featureSettings, variantSettings);
+ font = CFBridgingRelease(CFRetain(foundFont.get()));
+#endif
+ }
</ins><span class="cx">
</span><del>-#endif
-
</del><span class="cx"> if (!font)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>