<!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>[206692] 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/206692">206692</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-09-30 16:12:23 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement rendering of font-variation-settings
https://bugs.webkit.org/show_bug.cgi?id=162782
Reviewed by Zalan Bujtas.
Source/WebCore:
Because the heavy lifting for font-variation-settings is done by CoreText,
this patch is fairly minimal. It simply hooks up the CSS property to CoreText.
There is an existing bug in CoreText where variations inside fonts do not
survive the addition of a cascade list. Therefore, FontPlatformData::ctFont()
needs to work around this (conditionally) by resupplying the variation at
the same time as the cascade list. The CoreText bug is <rdar://problem/28449441>.
Tests: fast/text/variations/duplicate.html
fast/text/variations/exist.html
fast/text/variations/inheritance.html
fast/text/variations/order.html
fast/text/variations/outofbounds.html
* platform/graphics/FontCache.h:
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::preparePlatformFont):
(WebCore::fontWithFamily):
(WebCore::FontCache::createFontPlatformData):
(WebCore::FontCache::systemFallbackForCharacters):
* platform/graphics/cocoa/FontPlatformDataCocoa.mm:
(WebCore::cascadeToLastResortAttributesDictionary):
(WebCore::cascadeToLastResortAndVariationsFontDescriptor):
(WebCore::FontPlatformData::ctFont):
(WebCore::cascadeToLastResortFontDescriptor): Deleted.
* platform/graphics/mac/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData):
* rendering/RenderThemeIOS.mm:
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
LayoutTests:
* fast/text/variations/duplicate-expected.html: Added.
* fast/text/variations/duplicate.html: Added.
* fast/text/variations/exist-expected-mismatch.html: Added.
* fast/text/variations/exist.html: Added.
* fast/text/variations/getComputedStyle.html:
* fast/text/variations/inheritance-expected.html: Added.
* fast/text/variations/inheritance.html: Added.
* fast/text/variations/order-expected.html: Added.
* fast/text/variations/order.html: Added.
* fast/text/variations/outofbounds-expected.html: Added.
* fast/text/variations/outofbounds.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsgetComputedStylehtml">trunk/LayoutTests/fast/text/variations/getComputedStyle.html</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="#trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm">trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextvariationsduplicateexpectedhtml">trunk/LayoutTests/fast/text/variations/duplicate-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsduplicatehtml">trunk/LayoutTests/fast/text/variations/duplicate.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsexistexpectedmismatchhtml">trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsexisthtml">trunk/LayoutTests/fast/text/variations/exist.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsinheritanceexpectedhtml">trunk/LayoutTests/fast/text/variations/inheritance-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsinheritancehtml">trunk/LayoutTests/fast/text/variations/inheritance.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsorderexpectedhtml">trunk/LayoutTests/fast/text/variations/order-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsorderhtml">trunk/LayoutTests/fast/text/variations/order.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsoutofboundsexpectedhtml">trunk/LayoutTests/fast/text/variations/outofbounds-expected.html</a></li>
<li><a href="#trunkLayoutTestsfasttextvariationsoutofboundshtml">trunk/LayoutTests/fast/text/variations/outofbounds.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/LayoutTests/ChangeLog 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-09-30 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><ins>+ Implement rendering of font-variation-settings
+ https://bugs.webkit.org/show_bug.cgi?id=162782
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/text/variations/duplicate-expected.html: Added.
+ * fast/text/variations/duplicate.html: Added.
+ * fast/text/variations/exist-expected-mismatch.html: Added.
+ * fast/text/variations/exist.html: Added.
+ * fast/text/variations/getComputedStyle.html:
+ * fast/text/variations/inheritance-expected.html: Added.
+ * fast/text/variations/inheritance.html: Added.
+ * fast/text/variations/order-expected.html: Added.
+ * fast/text/variations/order.html: Added.
+ * fast/text/variations/outofbounds-expected.html: Added.
+ * fast/text/variations/outofbounds.html: Added.
+
+2016-09-30 Myles C. Maxfield <mmaxfield@apple.com>
+
</ins><span class="cx"> Implement animation of font-variation-settings
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=162783
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsduplicateexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/duplicate-expected.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/duplicate-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/duplicate-expected.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wght' 3;">Test passes if this text has a weight of 3.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsduplicatehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/duplicate.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/duplicate.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/duplicate.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wght' 3;">Test passes if this text has a weight of 3.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsexistexpectedmismatchhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/exist-expected-mismatch.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia';">Test passes if this text is bold.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsexisthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/exist.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/exist.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/exist.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: '-apple-system'; font-variation-settings: 'wght' 1.8;">Test passes if this text is bold.</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsgetComputedStylehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/variations/getComputedStyle.html (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/getComputedStyle.html 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/LayoutTests/fast/text/variations/getComputedStyle.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -29,4 +29,4 @@
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span><del>-</html>
</del><ins>+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsinheritanceexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/inheritance-expected.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/inheritance-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/inheritance-expected.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2;">Test passes if this text is bold.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsinheritancehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/inheritance.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/inheritance.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/inheritance.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2;"><div>Test passes if this text is bold.</div></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsorderexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/order-expected.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/order-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/order-expected.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wdth' 1.2, 'wght' 2;">Test passes if this text has a weight of 3.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsorderhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/order.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/order.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/order.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wght' 2, 'wdth' 1.2;">Test passes if this text has a weight of 3.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsoutofboundsexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/outofbounds-expected.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/outofbounds-expected.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/outofbounds-expected.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia';">Test passes if this text is not bold.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextvariationsoutofboundshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/variations/outofbounds.html (0 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/variations/outofbounds.html (rev 0)
+++ trunk/LayoutTests/fast/text/variations/outofbounds.html 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script>
+if (window.internals)
+ window.internals.settings.setVariationFontsEnabled(true);
+</script>
+</head>
+<body>
+<div style="font-family: 'Skia'; font-variation-settings: 'wght' 27;">Test passes if this text is not bold.</div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-09-30 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Implement rendering of font-variation-settings
+ https://bugs.webkit.org/show_bug.cgi?id=162782
+
+ Reviewed by Zalan Bujtas.
+
+ Because the heavy lifting for font-variation-settings is done by CoreText,
+ this patch is fairly minimal. It simply hooks up the CSS property to CoreText.
+
+ There is an existing bug in CoreText where variations inside fonts do not
+ survive the addition of a cascade list. Therefore, FontPlatformData::ctFont()
+ needs to work around this (conditionally) by resupplying the variation at
+ the same time as the cascade list. The CoreText bug is <rdar://problem/28449441>.
+
+ Tests: fast/text/variations/duplicate.html
+ fast/text/variations/exist.html
+ fast/text/variations/inheritance.html
+ fast/text/variations/order.html
+ fast/text/variations/outofbounds.html
+
+ * platform/graphics/FontCache.h:
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+ (WebCore::fontWithFamily):
+ (WebCore::FontCache::createFontPlatformData):
+ (WebCore::FontCache::systemFallbackForCharacters):
+ * platform/graphics/cocoa/FontPlatformDataCocoa.mm:
+ (WebCore::cascadeToLastResortAttributesDictionary):
+ (WebCore::cascadeToLastResortAndVariationsFontDescriptor):
+ (WebCore::FontPlatformData::ctFont):
+ (WebCore::cascadeToLastResortFontDescriptor): Deleted.
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData):
+ * rendering/RenderThemeIOS.mm:
+ (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+
</ins><span class="cx"> 2016-09-29 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add initial support for IDL union conversion
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -259,7 +259,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&);
</del><ins>+RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&, const FontVariationSettings&);
</ins><span class="cx"> FontWeight fontWeightFromCoreText(CGFloat weight);
</span><span class="cx"> uint16_t toCoreTextFontWeight(FontWeight);
</span><span class="cx"> bool isFontWeightBold(FontWeight);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -143,6 +143,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> typedef HashMap<FontTag, int, FourCharacterTagHash, FourCharacterTagHashTraits> FeaturesMap;
</span><ins>+typedef HashMap<FontTag, float, FourCharacterTagHash, FourCharacterTagHashTraits> VariationsMap;
</ins><span class="cx">
</span><span class="cx"> static FeaturesMap computeFeatureSettingsFromVariants(const FontVariantSettings& variantSettings)
</span><span class="cx"> {
</span><span class="lines">@@ -360,9 +361,9 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</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)
</del><ins>+RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, const FontVariationSettings& variations)
</ins><span class="cx"> {
</span><del>- if (!originalFont || (!features.size() && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal()
</del><ins>+ if (!originalFont || (!features.size() && variations.isEmpty() && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal()
</ins><span class="cx"> && (!fontFaceFeatures || !fontFaceFeatures->size()) && (!fontFaceVariantSettings || fontFaceVariantSettings->isAllNormal())))
</span><span class="cx"> return originalFont;
</span><span class="cx">
</span><span class="lines">@@ -398,8 +399,12 @@
</span><span class="cx"> for (auto& newFeature : features)
</span><span class="cx"> featuresToBeApplied.set(newFeature.tag(), newFeature.value());
</span><span class="cx">
</span><ins>+ VariationsMap variationsToBeApplied;
+ for (auto& newVariation : variations)
+ variationsToBeApplied.set(newVariation.tag(), newVariation.value());
+
</ins><span class="cx"> RetainPtr<CFMutableDictionaryRef> attributes = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><del>- if (featuresToBeApplied.size()) {
</del><ins>+ if (!featuresToBeApplied.isEmpty()) {
</ins><span class="cx"> RetainPtr<CFMutableArrayRef> featureArray = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, features.size(), &kCFTypeArrayCallBacks));
</span><span class="cx"> for (auto& p : featuresToBeApplied) {
</span><span class="cx"> auto feature = FontFeature(p.key, p.value);
</span><span class="lines">@@ -408,6 +413,18 @@
</span><span class="cx"> }
</span><span class="cx"> CFDictionaryAddValue(attributes.get(), kCTFontFeatureSettingsAttribute, featureArray.get());
</span><span class="cx"> }
</span><ins>+
+ if (!variationsToBeApplied.isEmpty()) {
+ auto variationDictionary = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+ for (auto& p : variationsToBeApplied) {
+ long long bitwiseTag = p.key[0] << 24 | p.key[1] << 16 | p.key[2] << 8 | p.key[3];
+ auto tagNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberLongLongType, &bitwiseTag));
+ auto valueNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &p.value));
+ CFDictionarySetValue(variationDictionary.get(), tagNumber.get(), valueNumber.get());
+ }
+ CFDictionaryAddValue(attributes.get(), kCTFontVariationAttribute, variationDictionary.get());
+ }
+
</ins><span class="cx"> if (textRenderingMode == OptimizeLegibility) {
</span><span class="cx"> CGFloat size = CTFontGetSize(originalFont);
</span><span class="cx"> RetainPtr<CFNumberRef> sizeNumber = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberCGFloatType, &size));
</span><span class="lines">@@ -676,7 +693,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, CTFontSymbolicTraits desiredTraits, FontWeight weight, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
</del><ins>+static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, CTFontSymbolicTraits desiredTraits, FontWeight weight, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
</ins><span class="cx"> {
</span><span class="cx"> if (family.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -689,7 +706,7 @@
</span><span class="cx"> foundFont = platformFontWithFamily(family, desiredTraits, weight, textRenderingMode, size);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>- return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings);
</del><ins>+ return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings, variationSettings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="lines">@@ -729,7 +746,7 @@
</span><span class="cx"> CTFontSymbolicTraits traits = computeTraits(fontDescription);
</span><span class="cx"> float size = fontDescription.computedPixelSize();
</span><span class="cx">
</span><del>- RetainPtr<CTFontRef> font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</del><ins>+ RetainPtr<CTFontRef> font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (!font) {
</span><span class="lines">@@ -740,7 +757,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, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</del><ins>+ font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -784,7 +801,7 @@
</span><span class="cx">
</span><span class="cx"> const FontPlatformData& platformData = originalFontData->platformData();
</span><span class="cx"> RetainPtr<CTFontRef> result = platformLookupFallbackFont(platformData.font(), description.weight(), description.locale(), characters, length);
</span><del>- result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings());
</del><ins>+ result = preparePlatformFont(result.get(), description.textRenderingMode(), nullptr, nullptr, description.featureSettings(), description.variantSettings(), 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="trunkSourceWebCoreplatformgraphicscocoaFontPlatformDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontPlatformDataCocoa.mm 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -99,11 +99,11 @@
</span><span class="cx"> return TextSpacingProportional;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static CTFontDescriptorRef cascadeToLastResortFontDescriptor()
</del><ins>+static CFDictionaryRef cascadeToLastResortAttributesDictionary()
</ins><span class="cx"> {
</span><del>- static CTFontDescriptorRef descriptor;
- if (descriptor)
- return descriptor;
</del><ins>+ static CFDictionaryRef attributes = nullptr;
+ if (attributes)
+ return attributes;
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> lastResort = adoptCF(CTFontDescriptorCreateWithNameAndSize(CFSTR("LastResort"), 0));
</span><span class="cx">
</span><span class="lines">@@ -112,11 +112,37 @@
</span><span class="cx">
</span><span class="cx"> const void* keys[] = { kCTFontCascadeListAttribute };
</span><span class="cx"> const void* values[] = { array.get() };
</span><del>- RetainPtr<CFDictionaryRef> attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</del><ins>+ attributes = CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
</ins><span class="cx">
</span><del>- descriptor = CTFontDescriptorCreateWithAttributes(attributes.get());
</del><ins>+ return attributes;
+}
</ins><span class="cx">
</span><del>- return descriptor;
</del><ins>+static RetainPtr<CTFontDescriptorRef> cascadeToLastResortAndVariationsFontDescriptor(CTFontRef originalFont)
+{
+// FIXME: Remove this when <rdar://problem/28449441> is fixed.
+#define WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG ((PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000))
+
+#if WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG
+ CFDictionaryRef attributes = cascadeToLastResortAttributesDictionary();
+ auto variations = adoptCF(static_cast<CFDictionaryRef>(CTFontCopyAttribute(originalFont, kCTFontVariationAttribute)));
+ if (!variations)
+#endif
+ {
+ UNUSED_PARAM(originalFont);
+
+ static CTFontDescriptorRef descriptor = nullptr;
+ if (descriptor)
+ return descriptor;
+
+ descriptor = CTFontDescriptorCreateWithAttributes(attributes);
+ return descriptor;
+ }
+#if WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG
+ auto mutableAttributes = adoptCF(CFDictionaryCreateMutableCopy(kCFAllocatorDefault, 2, attributes));
+ CFDictionaryAddValue(mutableAttributes.get(), kCTFontVariationAttribute, variations.get());
+ return adoptCF(CTFontDescriptorCreateWithAttributes(mutableAttributes.get()));
+#endif
+#undef WORKAROUND_CORETEXT_VARIATIONS_WITH_FALLBACK_LIST_BUG
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CTFontRef FontPlatformData::ctFont() const
</span><span class="lines">@@ -128,7 +154,7 @@
</span><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000)
</span><span class="cx"> ASSERT(m_cgFont);
</span><span class="cx"> #endif
</span><del>- m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_font.get(), m_size, 0, cascadeToLastResortFontDescriptor()));
</del><ins>+ m_ctFont = adoptCF(CTFontCreateCopyWithAttributes(m_font.get(), m_size, 0, cascadeToLastResortAndVariationsFontDescriptor(m_font.get()).get()));
</ins><span class="cx">
</span><span class="cx"> if (m_widthVariant != RegularWidth) {
</span><span class="cx"> int featureTypeValue = kTextSpacingType;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2016-09-30 23:12:23 UTC (rev 206692)
</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());
</del><ins>+ font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings(), 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="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (206691 => 206692)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-09-30 23:10:31 UTC (rev 206691)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2016-09-30 23:12:23 UTC (rev 206692)
</span><span class="lines">@@ -1278,7 +1278,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(fontDescriptor);
</span><span class="cx"> RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(fontDescriptor.get(), 0, nullptr));
</span><del>- font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings());
</del><ins>+ font = preparePlatformFont(font.get(), fontDescription.textRenderingMode(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings());
</ins><span class="cx"> fontDescription.setIsAbsoluteSize(true);
</span><span class="cx"> fontDescription.setOneFamily(textStyle);
</span><span class="cx"> fontDescription.setSpecifiedSize(CTFontGetSize(font.get()));
</span></span></pre>
</div>
</div>
</body>
</html>