<!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>[210370] trunk/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/210370">210370</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-01-05 12:31:28 -0800 (Thu, 05 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Cocoa] Variation fonts without variations specified are not rendered as if the default variations were specified
https://bugs.webkit.org/show_bug.cgi?id=166672
<rdar://problem/29779119>
<rdar://problem/29848883>
Reviewed by Simon Fraser.
CoreText has a bug (<rdar://problem/29859207>) where variation fonts without
a specified variation value are rendered as if the minimum value is specified,
rather than the default value. The solution is to apply default values where
they are omitted.
Test: fast/text/variations/advances.html
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::preparePlatformFont):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (210369 => 210370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-01-05 20:24:59 UTC (rev 210369)
+++ trunk/Source/WebCore/ChangeLog 2017-01-05 20:31:28 UTC (rev 210370)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-01-05 Myles C. Maxfield <mmaxfield@apple.com>
+
+ [Cocoa] Variation fonts without variations specified are not rendered as if the default variations were specified
+ https://bugs.webkit.org/show_bug.cgi?id=166672
+ <rdar://problem/29779119>
+ <rdar://problem/29848883>
+
+ Reviewed by Simon Fraser.
+
+ CoreText has a bug (<rdar://problem/29859207>) where variation fonts without
+ a specified variation value are rendered as if the minimum value is specified,
+ rather than the default value. The solution is to apply default values where
+ they are omitted.
+
+ Test: fast/text/variations/advances.html
+
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont):
+
</ins><span class="cx"> 2017-01-05 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark the dedicated root linebox for trailing floats in empty inlines dirty.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (210369 => 210370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-01-05 20:24:59 UTC (rev 210369)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-01-05 20:31:28 UTC (rev 210370)
</span><span class="lines">@@ -411,10 +411,6 @@
</span><span class="cx"> auto b2 = (rawAxisIdentifier & 0xFF0000) >> 16;
</span><span class="cx"> auto b3 = (rawAxisIdentifier & 0xFF00) >> 8;
</span><span class="cx"> auto b4 = rawAxisIdentifier & 0xFF;
</span><del>- ASSERT(b1 >= 0 && b1 <= std::numeric_limits<char>::max());
- ASSERT(b2 >= 0 && b2 <= std::numeric_limits<char>::max());
- ASSERT(b3 >= 0 && b3 <= std::numeric_limits<char>::max());
- ASSERT(b4 >= 0 && b4 <= std::numeric_limits<char>::max());
</del><span class="cx"> FontTag resultKey = {{ static_cast<char>(b1), static_cast<char>(b2), static_cast<char>(b3), static_cast<char>(b4) }};
</span><span class="cx"> VariationDefaults resultValues = { rawDefaultValue, rawMinimumValue, rawMaximumValue };
</span><span class="cx"> result.set(resultKey, resultValues);
</span><span class="lines">@@ -425,7 +421,18 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CTFontRef> preparePlatformFont(CTFontRef originalFont, TextRenderingMode textRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings, const FontVariationSettings& variations)
</span><span class="cx"> {
</span><del>- if (!originalFont || (!features.size() && variations.isEmpty() && (textRenderingMode == AutoTextRendering) && variantSettings.isAllNormal()
</del><ins>+ bool alwaysAddVariations = false;
+
+ // FIXME: Remove when <rdar://problem/29859207> is fixed
+#define WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)
+#if ENABLE(VARIATION_FONTS)
+ auto defaultValues = defaultVariationValues(originalFont);
+#if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
+ alwaysAddVariations = !defaultValues.isEmpty();
+#endif
+#endif
+
+ if (!originalFont || (!features.size() && (!alwaysAddVariations && 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">@@ -462,27 +469,38 @@
</span><span class="cx"> featuresToBeApplied.set(newFeature.tag(), newFeature.value());
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><del>- auto defaultValues = defaultVariationValues(originalFont);
-
</del><span class="cx"> VariationsMap variationsToBeApplied;
</span><del>- for (auto& newVariation : variations) {
- auto iterator = defaultValues.find(newVariation.tag());
- if (iterator != defaultValues.end()) {
- float valueToApply = std::max(std::min(newVariation.value(), iterator->value.maximumValue), iterator->value.minimumValue);
</del><span class="cx">
</span><del>- // FIXME: Remove when <rdar://problem/28707822> is fixed
</del><ins>+ auto applyVariationValue = [&](const FontTag& tag, float value, bool isDefaultValue) {
+ // FIXME: Remove when <rdar://problem/28707822> is fixed
</ins><span class="cx"> #define WORKAROUND_CORETEXT_VARIATIONS_DEFAULT_VALUE_BUG (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 110000)
</span><span class="cx"> #if WORKAROUND_CORETEXT_VARIATIONS_DEFAULT_VALUE_BUG
</span><del>- if (valueToApply == iterator->value.defaultValue)
- valueToApply += 0.0001;
</del><ins>+ if (isDefaultValue)
+ value += 0.0001;
</ins><span class="cx"> #endif
</span><span class="cx"> #undef WORKAROUND_CORETEXT_VARIATIONS_DEFAULT_VALUE_BUG
</span><ins>+ variationsToBeApplied.set(tag, value);
+ };
</ins><span class="cx">
</span><del>- variationsToBeApplied.set(newVariation.tag(), valueToApply);
- }
</del><ins>+ for (auto& newVariation : variations) {
+ auto iterator = defaultValues.find(newVariation.tag());
+ if (iterator == defaultValues.end())
+ continue;
+ float valueToApply = clampTo(newVariation.value(), iterator->value.minimumValue, iterator->value.maximumValue);
+ bool isDefaultValue = valueToApply == iterator->value.defaultValue;
+ applyVariationValue(newVariation.tag(), valueToApply, isDefaultValue);
</ins><span class="cx"> }
</span><ins>+
+#if WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
+ for (auto& defaultValue : defaultValues) {
+ if (!variationsToBeApplied.contains(defaultValue.key))
+ applyVariationValue(defaultValue.key, defaultValue.value.defaultValue, true);
+ }
</ins><span class="cx"> #endif
</span><ins>+#undef WORKAROUND_CORETEXT_VARIATIONS_UNSPECIFIED_VALUE_BUG
</ins><span class="cx">
</span><ins>+#endif // ENABLE(VARIATION_FONTS)
+
</ins><span class="cx"> RetainPtr<CFMutableDictionaryRef> attributes = adoptCF(CFDictionaryCreateMutable(kCFAllocatorDefault, 2, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
</span><span class="cx"> if (!featuresToBeApplied.isEmpty()) {
</span><span class="cx"> RetainPtr<CFMutableArrayRef> featureArray = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, features.size(), &kCFTypeArrayCallBacks));
</span></span></pre>
</div>
</div>
</body>
</html>