<!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>[213505] trunk</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/213505">213505</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-03-06 23:30:27 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Apply well-known-axis variation values at the right time in preparePlatformFont()
https://bugs.webkit.org/show_bug.cgi?id=168896
Reviewed by Jon Lee.
Source/WebCore:
Simply plumb the FontSelectionRequest to the place where font variations are implemented.
Test: fast/text/variations/font-selection-properties.html
* platform/graphics/FontCache.h:
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::preparePlatformFont):
(WebCore::fontWithFamily):
(WebCore::FontCache::createFontPlatformData):
(WebCore::FontCache::systemFallbackForCharacters):
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData):
LayoutTests:
* fast/text/variations/font-selection-properties-expected.html: Added.
* fast/text/variations/font-selection-properties.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformspicocoaCoreTextSPIh">trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextvariationsfontselectionpropertiesexpectedhtml">trunk/LayoutTests/fast/text/variations/font-selection-properties-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsfontselectionpropertieshtml">trunk/LayoutTests/fast/text/variations/font-selection-properties.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213504 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-07 07:19:51 UTC (rev 213504)
+++ trunk/LayoutTests/ChangeLog 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Apply well-known-axis variation values at the right time in preparePlatformFont()
+ https://bugs.webkit.org/show_bug.cgi?id=168896
+
+ Reviewed by Jon Lee.
+
+ * fast/text/variations/font-selection-properties-expected.html: Added.
+ * fast/text/variations/font-selection-properties.html: Added.
+
</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="trunkLayoutTestsfasttextvariationsfontselectionpropertiesexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/font-selection-properties-expected.html (0 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/font-selection-properties-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/font-selection-properties-expected.html 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "Boxis";
+ src: url("resources/Boxis-VF.ttf");
+}
+</style>
+</head>
+<body>
+This test makes sure that the font selection properties affect font variations.
+<div style="font-family: Boxis; font-variation-settings: 'wdth' 900;">Hello</div>
+<div style="font-family: Boxis; font-variation-settings: 'wdth' 100;">Hello</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsfontselectionpropertieshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/font-selection-properties.html (0 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/font-selection-properties.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/font-selection-properties.html 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+@font-face {
+ font-family: "Boxis";
+ src: url("resources/Boxis-VF.ttf");
+}
+</style>
+</head>
+<body>
+This test makes sure that the font selection properties affect font variations.
+<div style="font-family: Boxis; font-stretch: 900;">Hello</div>
+<div style="font-family: Boxis; font-stretch: 900; font-variation-settings: 'wdth' 100;">Hello</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213504 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-07 07:19:51 UTC (rev 213504)
+++ trunk/Source/WebCore/ChangeLog 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Apply well-known-axis variation values at the right time in preparePlatformFont()
+ https://bugs.webkit.org/show_bug.cgi?id=168896
+
+ Reviewed by Jon Lee.
+
+ Simply plumb the FontSelectionRequest to the place where font variations are implemented.
+
+ Test: fast/text/variations/font-selection-properties.html
+
+ * platform/graphics/FontCache.h:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+ (WebCore::fontWithFamily):
+ (WebCore::FontCache::createFontPlatformData):
+ (WebCore::FontCache::systemFallbackForCharacters):
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData):
+
+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> Unreviewed post-review fixup after r213464
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=169255
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (213504 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2017-03-07 07:19:51 UTC (rev 213504)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> bool needsSyntheticOblique;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&, const FontVariationSettings&);
</del><ins>+RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&, FontSelectionRequest, const FontVariationSettings&);
</ins><span class="cx"> SynthesisPair computeNecessarySynthesis(CTFontRef, const FontDescription&, bool isPlatformFont = false);
</span><span class="cx"> RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest, float size);
</span><span class="cx"> RetainPtr<CTFontRef> platformFontWithFamily(const AtomicString& family, FontSelectionRequest, TextRenderingMode, float size);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (213504 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-07 07:19:51 UTC (rev 213504)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #define WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
</span><del>-#if ENABLE(VARIATION_FONTS) && WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
</del><ins>+#if ENABLE(VARIATION_FONTS) && (PLATFORM(IOS) || WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG)
</ins><span class="cx"> static inline bool fontIsSystemFont(CTFontRef font)
</span><span class="cx"> {
</span><span class="cx"> if (CTFontDescriptorIsSystemUIFont(adoptCF(CTFontCopyFontDescriptor(font)).get()))
</span><span class="lines">@@ -432,7 +432,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, const FontVariationSettings& variations)
</del><ins>+RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, FontSelectionRequest fontSelectionRequest, const FontVariationSettings& variations)
</ins><span class="cx"> {
</span><span class="cx"> bool alwaysAddVariations = false;
</span><span class="cx">
</span><span class="lines">@@ -439,10 +439,10 @@
</span><span class="cx"> // FIXME: Remove when <rdar://problem/29859207> is fixed
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> auto defaultValues = defaultVariationValues(originalFont);
</span><del>-#if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
</del><span class="cx"> alwaysAddVariations = !defaultValues.isEmpty();
</span><ins>+#else
+ UNUSED_PARAM(fontSelectionRequest);
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!originalFont || (!features.size() && (!alwaysAddVariations && variations.isEmpty()) && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal()
</span><span class="cx"> && (!fontFaceFeatures || !fontFaceFeatures->size()) && (!fontFaceVariantSettings || fontFaceVariantSettings->isAllNormal())))
</span><span class="lines">@@ -496,14 +496,26 @@
</span><span class="cx"> variationsToBeApplied.set(tag, value);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- for (auto& newVariation : variations) {
- auto iterator = defaultValues.find(newVariation.tag());
</del><ins>+ auto applyVariation = [&](const FontTag& tag, float value) {
+ auto iterator = defaultValues.find(tag);
</ins><span class="cx"> if (iterator == defaultValues.end())
</span><del>- continue;
- float valueToApply = clampTo(newVariation.value(), iterator->value.minimumValue, iterator->value.maximumValue);
</del><ins>+ return;
+ float valueToApply = clampTo(value, iterator->value.minimumValue, iterator->value.maximumValue);
</ins><span class="cx"> bool isDefaultValue = valueToApply == iterator->value.defaultValue;
</span><del>- applyVariationValue(newVariation.tag(), valueToApply, isDefaultValue);
</del><ins>+ applyVariationValue(tag, valueToApply, isDefaultValue);
+ };
+
+#if PLATFORM(IOS)
+ // The system font is somewhat magical. Don't mess with its variations.
+ if (!fontIsSystemFont(originalFont))
+#endif
+ {
+ applyVariation({{'w', 'g', 'h', 't'}}, static_cast<float>(fontSelectionRequest.weight));
+ applyVariation({{'w', 'd', 't', 'h'}}, static_cast<float>(fontSelectionRequest.width));
+ applyVariation({{'s', 'l', 'n', 't'}}, static_cast<float>(fontSelectionRequest.slope));
</ins><span class="cx"> }
</span><ins>+ for (auto& newVariation : variations)
+ applyVariation(newVariation.tag(), newVariation.value());
</ins><span class="cx">
</span><span class="cx"> #if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
</span><span class="cx"> if (!fontIsSystemFont(originalFont)) {
</span><span class="lines">@@ -951,7 +963,7 @@
</span><span class="cx"> FontCache::singleton().invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, FontSelectionRequest request, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
</del><ins>+static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, FontSelectionRequest request, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, FontSelectionRequest fontSelectionRequest, float size)
</ins><span class="cx"> {
</span><span class="cx"> if (family.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -959,7 +971,7 @@
</span><span class="cx"> auto foundFont = platformFontWithFamilySpecialCase(family, request, size);
</span><span class="cx"> if (!foundFont)
</span><span class="cx"> foundFont = platformFontLookupWithFamily(family, request, size);
</span><del>- return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings, variationSettings);
</del><ins>+ return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings, fontSelectionRequest, variationSettings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -998,7 +1010,7 @@
</span><span class="cx"> {
</span><span class="cx"> float size = fontDescription.computedPixelSize();
</span><span class="cx">
</span><del>- auto font = fontWithFamily(family, fontDescription.fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</del><ins>+ auto font = fontWithFamily(family, fontDescription.fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), fontDescription.fontSelectionRequest(), size);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (!font) {
</span><span class="lines">@@ -1009,7 +1021,7 @@
</span><span class="cx"> // Ignore the result because we want to use our own algorithm to actually find the font.
</span><span class="cx"> autoActivateFont(family.string(), size);
</span><span class="cx">
</span><del>- font = fontWithFamily(family, fontDescription.fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</del><ins>+ font = fontWithFamily(family, fontDescription.fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), fontDescription.fontSelectionRequest(), size);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1097,7 +1109,7 @@
</span><span class="cx">
</span><span class="cx"> const FontPlatformData& platformData = originalFontData->platformData();
</span><span class="cx"> auto result = lookupFallbackFont(platformData.font(), description.weight(), description.locale(), characters, length);
</span><del>- result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings(), description.variationSettings());
</del><ins>+ result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings(), description.fontSelectionRequest(), description.variationSettings());
</ins><span class="cx"> if (!result)
</span><span class="cx"> return lastResortFallbackFont(description);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (213504 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2017-03-07 07:19:51 UTC (rev 213504)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> FontOrientation orientation = fontDescription.orientation();
</span><span class="cx"> FontWidthVariant widthVariant = fontDescription.widthVariant();
</span><span class="cx"> RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
</span><del>- font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings());
</del><ins>+ font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.fontSelectionRequest(), fontDescription.variationSettings());
</ins><span class="cx"> ASSERT(font);
</span><span class="cx"> return FontPlatformData(font.get(), size, bold, italic, orientation, widthVariant, fontDescription.textRenderingMode());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformspicocoaCoreTextSPIh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (213504 => 213505)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2017-03-07 07:19:51 UTC (rev 213504)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2017-03-07 07:30:27 UTC (rev 213505)
</span><span class="lines">@@ -125,7 +125,6 @@
</span><span class="cx">
</span><span class="cx"> CTFontRef CTFontCreatePhysicalFontForCharactersWithLanguage(CTFontRef, const UTF16Char* characters, CFIndex length, CFStringRef language, CFIndex* coveredLength);
</span><span class="cx"> bool CTFontIsAppleColorEmoji(CTFontRef);
</span><del>-bool CTFontDescriptorIsSystemUIFont(CTFontDescriptorRef);
</del><span class="cx"> CTFontRef CTFontCreateForCharacters(CTFontRef currentFont, const UTF16Char *characters, CFIndex length, CFIndex *coveredLength);
</span><span class="cx">
</span><span class="cx"> WTF_EXTERN_C_END
</span></span></pre>
</div>
</div>
</body>
</html>