<!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>[193667] branches/safari-601-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/193667">193667</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 16:23:33 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191968">r191968</a>. rdar://problem/23769775</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreWebCorexcodeprojprojectpbxproj">branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSFontFacecpp">branches/safari-601-branch/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSFontFaceh">branches/safari-601-branch/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSFontFaceSourcecpp">branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSFontFaceSourceh">branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSFontSelectorcpp">branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssStyleBuilderCustomh">branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedFontcpp">branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedFonth">branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedSVGFontcpp">branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedSVGFonth">branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCacheh">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCascadecpp">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsmacFontCacheMacmm">branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp">branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah">branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformtextTextFlagsh">branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderThemeIOSmm">branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-11-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ font-variant-* properties in @font-face declarations should be honored
+ https://bugs.webkit.org/show_bug.cgi?id=149771
+
+ Reviewed by Simon Fraser.
+
+ * css3/font-variant-font-face-override-expected.html: Added
+ * css3/font-variant-font-face-override.html: Added
+ * css3/font-feature-settings-font-face-rendering-expected.html: Added.
+ * css3/font-feature-settings-font-face-rendering.html: Added.
+ * css3/font-variant-font-face-all-expected.html: Added.
+ * css3/font-variant-font-face-all.html: Added.
+
</ins><span class="cx"> 2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -1,3 +1,89 @@
</span><ins>+2015-11-03 Myles C. Maxfield <mmaxfield@apple.com>
+
+ font-variant-* properties in @font-face declarations should be honored
+ https://bugs.webkit.org/show_bug.cgi?id=149771
+
+ Reviewed by Simon Fraser.
+
+ According to the CSS Fonts Level 3 spec, web authors are allowed to put
+ font-feature-settings / font-variant-* inside @font-face blocks. These
+ properties are supposed to be applied at a specific time during the
+ font selection algorithm.
+
+ This patch gives a FontFeatureSettings object and a FontVariantSettings
+ object to CSSFontFace, and moves common parsing logic from
+ StyleBuilderCustom to a shared location. Then, once the two properties
+ are parsed from the @font-face block, the relevant data structures are
+ passed down into the font selection algorithm. This algorithm then
+ consults with these values at the correct time (inside
+ preparePlatformFont()).
+
+ Tests: css3/font-feature-settings-font-face-rendering.html
+ css3/font-variant-font-face-all.html
+ css3/font-variant-font-face-override.html
+
+ * WebCore.xcodeproj/project.pbxproj: Add a header for the common
+ location of parsing font-variant-ligatures, font-variant-numeric,
+ and font-variant-east-asian.
+ * css/CSSFontFace.cpp:
+ (WebCore::CSSFontFace::font): Pass the relevant data structures
+ into the font selection algorithm.
+ * css/CSSFontFace.h: Add FontFeatureSettings and FontVariantSettings
+ member variables.
+ (WebCore::CSSFontFace::insertFeature):
+ (WebCore::CSSFontFace::setVariantCommonLigatures):
+ (WebCore::CSSFontFace::setVariantDiscretionaryLigatures):
+ (WebCore::CSSFontFace::setVariantHistoricalLigatures):
+ (WebCore::CSSFontFace::setVariantContextualAlternates):
+ (WebCore::CSSFontFace::setVariantPosition):
+ (WebCore::CSSFontFace::setVariantCaps):
+ (WebCore::CSSFontFace::setVariantNumericFigure):
+ (WebCore::CSSFontFace::setVariantNumericSpacing):
+ (WebCore::CSSFontFace::setVariantNumericFraction):
+ (WebCore::CSSFontFace::setVariantNumericOrdinal):
+ (WebCore::CSSFontFace::setVariantNumericSlashedZero):
+ (WebCore::CSSFontFace::setVariantAlternates):
+ (WebCore::CSSFontFace::setVariantEastAsianVariant):
+ (WebCore::CSSFontFace::setVariantEastAsianWidth):
+ (WebCore::CSSFontFace::setVariantEastAsianRuby):
+ * css/CSSFontFaceSource.cpp:
+ (WebCore::CSSFontFaceSource::font): Pass the relevant data
+ structures into the font selection algorithm.
+ * css/CSSFontFaceSource.h: Ditto.
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::addFontFaceRule): Call the shared
+ parsing logic to populate the FontFeatureSettings and
+ FontVariantSettings members.
+ * css/FontVariantBuilder.h: Added. Destination for shared parsing
+ logic.
+ (WebCore::applyValueFontVariantLigatures):
+ (WebCore::applyValueFontVariantNumeric):
+ (WebCore::applyValueFontVariantEastAsian):
+ * css/StyleBuilderCustom.h: Source for shared parsing logic.
+ (WebCore::StyleBuilderCustom::applyValueFontVariantLigatures):
+ (WebCore::StyleBuilderCustom::applyValueFontVariantNumeric):
+ (WebCore::StyleBuilderCustom::applyValueFontVariantEastAsian):
+ * loader/cache/CachedFont.cpp: Pass the relevant data structures
+ into the font selection algorithm.
+ (WebCore::CachedFont::createFont):
+ (WebCore::CachedFont::platformDataFromCustomData):
+ * loader/cache/CachedFont.h: Ditto.
+ * loader/cache/CachedSVGFont.cpp: Ditto.
+ (WebCore::CachedSVGFont::createFont):
+ (WebCore::CachedSVGFont::platformDataFromCustomData):
+ * loader/cache/CachedSVGFont.h: Ditto.
+ * platform/graphics/FontCache.h: Ditto.
+ * platform/graphics/FontCascade.cpp:
+ (WebCore::FontCascade::codePath): Adjust comment.
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::preparePlatformFont): Consult with the newly parsed values.
+ (WebCore::fontWithFamily): Pass the relevant data structures into the
+ font selection algorithm.
+ (WebCore::FontCache::systemFallbackForCharacters): Ditto.
+ * platform/graphics/mac/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData): Ditto.
+ * platform/graphics/mac/FontCustomPlatformData.h: Ditto.
+
</ins><span class="cx"> 2015-10-19 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> FontCascade::typesettingFeatures() is not privy to font-variant-* nor font-feature-settings
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -5668,6 +5668,7 @@
</span><span class="cx"> C0F2A44113869AAB0066C534 /* preprocessor.pm in Headers */ = {isa = PBXBuildFile; fileRef = C0F2A43F13869A280066C534 /* preprocessor.pm */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C105DA620F3AA68F001DD44F /* TextEncodingDetectorICU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */; };
</span><span class="cx"> C105DA640F3AA6B8001DD44F /* TextEncodingDetector.h in Headers */ = {isa = PBXBuildFile; fileRef = C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */; };
</span><ins>+ C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */; };
</ins><span class="cx"> C330A22313EC196B0000B45B /* ColorChooser.h in Headers */ = {isa = PBXBuildFile; fileRef = C330A22113EC196B0000B45B /* ColorChooser.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C33EE5C414FB49610002095A /* BaseClickableWithKeyInputType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C33EE5C214FB49610002095A /* BaseClickableWithKeyInputType.cpp */; };
</span><span class="cx"> C33EE5C514FB49610002095A /* BaseClickableWithKeyInputType.h in Headers */ = {isa = PBXBuildFile; fileRef = C33EE5C314FB49610002095A /* BaseClickableWithKeyInputType.h */; };
</span><span class="lines">@@ -13275,6 +13276,7 @@
</span><span class="cx"> C0F2A43F13869A280066C534 /* preprocessor.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; name = preprocessor.pm; path = scripts/preprocessor.pm; sourceTree = "<group>"; };
</span><span class="cx"> C105DA610F3AA68F001DD44F /* TextEncodingDetectorICU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextEncodingDetectorICU.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C105DA630F3AA6B8001DD44F /* TextEncodingDetector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEncodingDetector.h; sourceTree = "<group>"; };
</span><ins>+ C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontVariantBuilder.h; sourceTree = "<group>"; };
</ins><span class="cx"> C24685131A148E1800811792 /* CoreGraphicsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreGraphicsSPI.h; sourceTree = "<group>"; };
</span><span class="cx"> C2C4CB1D161A131200D214DA /* WebSafeIncrementalSweeperIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSafeIncrementalSweeperIOS.h; sourceTree = "<group>"; };
</span><span class="cx"> C330A22113EC196B0000B45B /* ColorChooser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ColorChooser.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -22810,6 +22812,7 @@
</span><span class="cx"> 3FFFF9A6159D9A550020BBD5 /* WebKitCSSViewportRule.cpp */,
</span><span class="cx"> 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
</span><span class="cx"> 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
</span><ins>+ C2015C091BE6FE2C00822389 /* FontVariantBuilder.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = css;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -24777,6 +24780,7 @@
</span><span class="cx"> 8AD0A59814C88358000D83C5 /* DOMWebKitCSSRegionRuleInternal.h in Headers */,
</span><span class="cx"> 31611E610E1C4E1400F6A579 /* DOMWebKitCSSTransformValue.h in Headers */,
</span><span class="cx"> 31611E630E1C4E1400F6A579 /* DOMWebKitCSSTransformValueInternal.h in Headers */,
</span><ins>+ C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */,
</ins><span class="cx"> 3F2B33EB165AF15600E3987C /* DOMWebKitCSSViewportRule.h in Headers */,
</span><span class="cx"> 3F2B33ED165AF15600E3987C /* DOMWebKitCSSViewportRuleInternal.h in Headers */,
</span><span class="cx"> 8A195932147EA16E00D1EA61 /* DOMWebKitNamedFlow.h in Headers */,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontFace.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSFontFace.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontFace.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> size_t size = m_sources.size();
</span><span class="cx"> for (size_t i = 0; i < size; ++i) {
</span><del>- if (RefPtr<Font> result = m_sources[i]->font(fontDescription, syntheticBold, syntheticItalic, fontSelector)) {
</del><ins>+ if (RefPtr<Font> result = m_sources[i]->font(fontDescription, syntheticBold, syntheticItalic, fontSelector, m_featureSettings, m_variantSettings)) {
</ins><span class="cx"> m_activeSource = m_sources[i].get();
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().fontLoadEventsEnabled() && m_loadState == Loading && m_sources[i]->isLoaded()) {
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> notifyLoadingDone();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(FONT_LOAD_EVENTS)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontFace.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSFontFace.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontFace.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "CSSFontFaceSource.h"
</span><ins>+#include "FontFeatureSettings.h"
</ins><span class="cx"> #include "TextFlags.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -53,6 +54,24 @@
</span><span class="cx"> void addRange(UChar32 from, UChar32 to) { m_ranges.append(UnicodeRange(from, to)); }
</span><span class="cx"> const Vector<UnicodeRange>& ranges() const { return m_ranges; }
</span><span class="cx">
</span><ins>+ void insertFeature(FontFeature&& feature) { m_featureSettings.insert(WTF::move(feature)); }
+
+ void setVariantCommonLigatures(FontVariantLigatures ligatures) { m_variantSettings.commonLigatures = ligatures; }
+ void setVariantDiscretionaryLigatures(FontVariantLigatures ligatures) { m_variantSettings.discretionaryLigatures = ligatures; }
+ void setVariantHistoricalLigatures(FontVariantLigatures ligatures) { m_variantSettings.historicalLigatures = ligatures; }
+ void setVariantContextualAlternates(FontVariantLigatures ligatures) { m_variantSettings.contextualAlternates = ligatures; }
+ void setVariantPosition(FontVariantPosition position) { m_variantSettings.position = position; }
+ void setVariantCaps(FontVariantCaps caps) { m_variantSettings.caps = caps; }
+ void setVariantNumericFigure(FontVariantNumericFigure figure) { m_variantSettings.numericFigure = figure; }
+ void setVariantNumericSpacing(FontVariantNumericSpacing spacing) { m_variantSettings.numericSpacing = spacing; }
+ void setVariantNumericFraction(FontVariantNumericFraction fraction) { m_variantSettings.numericFraction = fraction; }
+ void setVariantNumericOrdinal(FontVariantNumericOrdinal ordinal) { m_variantSettings.numericOrdinal = ordinal; }
+ void setVariantNumericSlashedZero(FontVariantNumericSlashedZero slashedZero) { m_variantSettings.numericSlashedZero = slashedZero; }
+ void setVariantAlternates(FontVariantAlternates alternates) { m_variantSettings.alternates = alternates; }
+ void setVariantEastAsianVariant(FontVariantEastAsianVariant variant) { m_variantSettings.eastAsianVariant = variant; }
+ void setVariantEastAsianWidth(FontVariantEastAsianWidth width) { m_variantSettings.eastAsianWidth = width; }
+ void setVariantEastAsianRuby(FontVariantEastAsianRuby ruby) { m_variantSettings.eastAsianRuby = ruby; }
+
</ins><span class="cx"> void addedToSegmentedFontFace(CSSSegmentedFontFace*);
</span><span class="cx"> void removedFromSegmentedFontFace(CSSSegmentedFontFace*);
</span><span class="cx">
</span><span class="lines">@@ -107,6 +126,8 @@
</span><span class="cx"> FontTraitsMask m_traitsMask;
</span><span class="cx"> Vector<UnicodeRange> m_ranges;
</span><span class="cx"> HashSet<CSSSegmentedFontFace*> m_segmentedFontFaces;
</span><ins>+ FontFeatureSettings m_featureSettings;
+ FontVariantSettings m_variantSettings;
</ins><span class="cx"> Vector<std::unique_ptr<CSSFontFaceSource>> m_sources;
</span><span class="cx"> CSSFontFaceSource* m_activeSource;
</span><span class="cx"> bool m_isLocalFallback;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSFontFaceSourcecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> m_face->fontLoaded(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> CSSFontFaceSource::font(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic, CSSFontSelector* fontSelector)
</del><ins>+RefPtr<Font> CSSFontFaceSource::font(const FontDescription& fontDescription, bool syntheticBold, bool syntheticItalic, CSSFontSelector* fontSelector, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> // If the font hasn't loaded or an error occurred, then we've got nothing.
</span><span class="cx"> if (!isValid())
</span><span class="lines">@@ -124,10 +124,8 @@
</span><span class="cx"> if (font)
</span><span class="cx"> return font.release();
</span><span class="cx">
</span><del>- // If we are still loading, then we let the system pick a font.
</del><span class="cx"> if (isLoaded()) {
</span><span class="cx"> if (m_font) {
</span><del>- // Create new FontPlatformData from our CGFontRef, point size and ATSFontRef.
</del><span class="cx"> bool hasExternalSVGFont = false;
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> hasExternalSVGFont = m_hasExternalSVGFont;
</span><span class="lines">@@ -135,7 +133,7 @@
</span><span class="cx"> if (!m_font->ensureCustomFontData(hasExternalSVGFont, m_string))
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont);
</del><ins>+ font = m_font->createFont(fontDescription, m_string, syntheticBold, syntheticItalic, hasExternalSVGFont, fontFaceFeatures, fontFaceVariantSettings);
</ins><span class="cx"> } else {
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> // In-Document SVG Fonts
</span><span class="lines">@@ -153,7 +151,7 @@
</span><span class="cx"> auto customPlatformData = createFontCustomPlatformData(*m_generatedOTFBuffer);
</span><span class="cx"> if (!customPlatformData)
</span><span class="cx"> return nullptr;
</span><del>- font = Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic), true, false);
</del><ins>+ font = Font::create(customPlatformData->fontPlatformData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
</ins><span class="cx"> #else
</span><span class="cx"> font = Font::create(std::make_unique<SVGFontData>(m_svgFontFaceElement.get()), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSFontFaceSourceh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontFaceSource.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> class CSSFontSelector;
</span><span class="cx"> class Font;
</span><span class="cx"> class FontDescription;
</span><ins>+class FontFeatureSettings;
</ins><span class="cx">
</span><span class="cx"> class CSSFontFaceSource final : public CachedFontClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="lines">@@ -60,7 +61,7 @@
</span><span class="cx">
</span><span class="cx"> virtual void fontLoaded(CachedFont*) override;
</span><span class="cx">
</span><del>- RefPtr<Font> font(const FontDescription&, bool syntheticBold, bool syntheticItalic, CSSFontSelector*);
</del><ins>+ RefPtr<Font> font(const FontDescription&, bool syntheticBold, bool syntheticItalic, CSSFontSelector*, const FontFeatureSettings&, const FontVariantSettings&);
</ins><span class="cx">
</span><span class="cx"> void pruneTable();
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -33,7 +33,9 @@
</span><span class="cx"> #include "CSSFontFaceSource.h"
</span><span class="cx"> #include "CSSFontFaceSrcValue.h"
</span><span class="cx"> #include "CSSFontFamily.h"
</span><ins>+#include "CSSFontFeatureValue.h"
</ins><span class="cx"> #include "CSSPrimitiveValue.h"
</span><ins>+#include "CSSPrimitiveValueMappings.h"
</ins><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "CSSSegmentedFontFace.h"
</span><span class="cx"> #include "CSSUnicodeRangeValue.h"
</span><span class="lines">@@ -43,6 +45,7 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "Font.h"
</span><span class="cx"> #include "FontCache.h"
</span><ins>+#include "FontVariantBuilder.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "SVGFontFaceElement.h"
</span><span class="lines">@@ -91,6 +94,13 @@
</span><span class="cx"> RefPtr<CSSValue> fontFamily = style.getPropertyCSSValue(CSSPropertyFontFamily);
</span><span class="cx"> RefPtr<CSSValue> src = style.getPropertyCSSValue(CSSPropertySrc);
</span><span class="cx"> RefPtr<CSSValue> unicodeRange = style.getPropertyCSSValue(CSSPropertyUnicodeRange);
</span><ins>+ RefPtr<CSSValue> featureSettings = style.getPropertyCSSValue(CSSPropertyFontFeatureSettings);
+ RefPtr<CSSValue> variantLigatures = style.getPropertyCSSValue(CSSPropertyFontVariantLigatures);
+ RefPtr<CSSValue> variantPosition = style.getPropertyCSSValue(CSSPropertyFontVariantPosition);
+ RefPtr<CSSValue> variantCaps = style.getPropertyCSSValue(CSSPropertyFontVariantCaps);
+ RefPtr<CSSValue> variantNumeric = style.getPropertyCSSValue(CSSPropertyFontVariantNumeric);
+ RefPtr<CSSValue> variantAlternates = style.getPropertyCSSValue(CSSPropertyFontVariantAlternates);
+ RefPtr<CSSValue> variantEastAsian = style.getPropertyCSSValue(CSSPropertyFontVariantEastAsian);
</ins><span class="cx"> if (!is<CSSValueList>(fontFamily.get()) || !is<CSSValueList>(src.get()) || (unicodeRange && !is<CSSValueList>(*unicodeRange)))
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -256,6 +266,31 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (featureSettings) {
+ for (auto& item : downcast<CSSValueList>(*featureSettings)) {
+ auto& feature = downcast<CSSFontFeatureValue>(item.get());
+ fontFace->insertFeature(FontFeature(feature.tag(), feature.value()));
+ }
+ }
+
+ if (variantLigatures)
+ applyValueFontVariantLigatures(*fontFace, *variantLigatures);
+
+ if (variantPosition)
+ fontFace->setVariantPosition(downcast<CSSPrimitiveValue>(*variantPosition));
+
+ if (variantCaps)
+ fontFace->setVariantCaps(downcast<CSSPrimitiveValue>(*variantCaps));
+
+ if (variantNumeric)
+ applyValueFontVariantNumeric(*fontFace, *variantNumeric);
+
+ if (variantAlternates)
+ fontFace->setVariantAlternates(downcast<CSSPrimitiveValue>(*variantAlternates));
+
+ if (variantEastAsian)
+ applyValueFontVariantEastAsian(*fontFace, *variantEastAsian);
+
</ins><span class="cx"> // Hash under every single family name.
</span><span class="cx"> for (auto& item : familyList) {
</span><span class="cx"> auto& value = downcast<CSSPrimitiveValue>(item.get());
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/css/StyleBuilderCustom.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "CursorList.h"
</span><span class="cx"> #include "DashboardRegion.h"
</span><span class="cx"> #include "ElementAncestorIterator.h"
</span><ins>+#include "FontVariantBuilder.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "LocaleToScriptMapping.h"
</span><span class="lines">@@ -1404,64 +1405,8 @@
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyValueFontVariantLigatures(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><del>- FontVariantLigatures common = FontVariantLigatures::Normal;
- FontVariantLigatures discretionary = FontVariantLigatures::Normal;
- FontVariantLigatures historical = FontVariantLigatures::Normal;
- FontVariantLigatures contextualAlternates = FontVariantLigatures::Normal;
-
- if (is<CSSValueList>(value)) {
- for (auto& item : downcast<CSSValueList>(value)) {
- switch (downcast<CSSPrimitiveValue>(item.get()).getValueID()) {
- case CSSValueNoCommonLigatures:
- common = FontVariantLigatures::No;
- break;
- case CSSValueCommonLigatures:
- common = FontVariantLigatures::Yes;
- break;
- case CSSValueNoDiscretionaryLigatures:
- discretionary = FontVariantLigatures::No;
- break;
- case CSSValueDiscretionaryLigatures:
- discretionary = FontVariantLigatures::Yes;
- break;
- case CSSValueNoHistoricalLigatures:
- historical = FontVariantLigatures::No;
- break;
- case CSSValueHistoricalLigatures:
- historical = FontVariantLigatures::Yes;
- break;
- case CSSValueContextual:
- contextualAlternates = FontVariantLigatures::Yes;
- break;
- case CSSValueNoContextual:
- contextualAlternates = FontVariantLigatures::No;
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
- } else {
- switch (downcast<CSSPrimitiveValue>(value).getValueID()) {
- case CSSValueNormal:
- break;
- case CSSValueNone:
- common = FontVariantLigatures::No;
- discretionary = FontVariantLigatures::No;
- historical = FontVariantLigatures::No;
- contextualAlternates = FontVariantLigatures::No;
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
-
</del><span class="cx"> auto fontDescription = styleResolver.fontDescription();
</span><del>- fontDescription.setVariantCommonLigatures(common);
- fontDescription.setVariantDiscretionaryLigatures(discretionary);
- fontDescription.setVariantHistoricalLigatures(historical);
- fontDescription.setVariantContextualAlternates(contextualAlternates);
</del><ins>+ WebCore::applyValueFontVariantLigatures(fontDescription, value);
</ins><span class="cx"> styleResolver.setFontDescription(fontDescription);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1489,53 +1434,8 @@
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyValueFontVariantNumeric(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><del>- FontVariantNumericFigure figure = FontVariantNumericFigure::Normal;
- FontVariantNumericSpacing spacing = FontVariantNumericSpacing::Normal;
- FontVariantNumericFraction fraction = FontVariantNumericFraction::Normal;
- FontVariantNumericOrdinal ordinal = FontVariantNumericOrdinal::Normal;
- FontVariantNumericSlashedZero slashedZero = FontVariantNumericSlashedZero::Normal;
-
- if (is<CSSValueList>(value)) {
- for (auto& item : downcast<CSSValueList>(value)) {
- switch (downcast<CSSPrimitiveValue>(item.get()).getValueID()) {
- case CSSValueLiningNums:
- figure = FontVariantNumericFigure::LiningNumbers;
- break;
- case CSSValueOldstyleNums:
- figure = FontVariantNumericFigure::OldStyleNumbers;
- break;
- case CSSValueProportionalNums:
- spacing = FontVariantNumericSpacing::ProportionalNumbers;
- break;
- case CSSValueTabularNums:
- spacing = FontVariantNumericSpacing::TabularNumbers;
- break;
- case CSSValueDiagonalFractions:
- fraction = FontVariantNumericFraction::DiagonalFractions;
- break;
- case CSSValueStackedFractions:
- fraction = FontVariantNumericFraction::StackedFractions;
- break;
- case CSSValueOrdinal:
- ordinal = FontVariantNumericOrdinal::Yes;
- break;
- case CSSValueSlashedZero:
- slashedZero = FontVariantNumericSlashedZero::Yes;
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
- } else
- ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNormal);
-
</del><span class="cx"> auto fontDescription = styleResolver.fontDescription();
</span><del>- fontDescription.setVariantNumericFigure(figure);
- fontDescription.setVariantNumericSpacing(spacing);
- fontDescription.setVariantNumericFraction(fraction);
- fontDescription.setVariantNumericOrdinal(ordinal);
- fontDescription.setVariantNumericSlashedZero(slashedZero);
</del><ins>+ WebCore::applyValueFontVariantNumeric(fontDescription, value);
</ins><span class="cx"> styleResolver.setFontDescription(fontDescription);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1559,52 +1459,8 @@
</span><span class="cx">
</span><span class="cx"> inline void StyleBuilderCustom::applyValueFontVariantEastAsian(StyleResolver& styleResolver, CSSValue& value)
</span><span class="cx"> {
</span><del>- FontVariantEastAsianVariant variant = FontVariantEastAsianVariant::Normal;
- FontVariantEastAsianWidth width = FontVariantEastAsianWidth::Normal;
- FontVariantEastAsianRuby ruby = FontVariantEastAsianRuby::Normal;
-
- if (is<CSSValueList>(value)) {
- for (auto& item : downcast<CSSValueList>(value)) {
- switch (downcast<CSSPrimitiveValue>(item.get()).getValueID()) {
- case CSSValueJis78:
- variant = FontVariantEastAsianVariant::Jis78;
- break;
- case CSSValueJis83:
- variant = FontVariantEastAsianVariant::Jis83;
- break;
- case CSSValueJis90:
- variant = FontVariantEastAsianVariant::Jis90;
- break;
- case CSSValueJis04:
- variant = FontVariantEastAsianVariant::Jis04;
- break;
- case CSSValueSimplified:
- variant = FontVariantEastAsianVariant::Simplified;
- break;
- case CSSValueTraditional:
- variant = FontVariantEastAsianVariant::Traditional;
- break;
- case CSSValueFullWidth:
- width = FontVariantEastAsianWidth::FullWidth;
- break;
- case CSSValueProportionalWidth:
- width = FontVariantEastAsianWidth::ProportionalWidth;
- break;
- case CSSValueRuby:
- ruby = FontVariantEastAsianRuby::Yes;
- break;
- default:
- ASSERT_NOT_REACHED();
- break;
- }
- }
- } else
- ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNormal);
-
</del><span class="cx"> auto fontDescription = styleResolver.fontDescription();
</span><del>- fontDescription.setVariantEastAsianVariant(variant);
- fontDescription.setVariantEastAsianWidth(width);
- fontDescription.setVariantEastAsianRuby(ruby);
</del><ins>+ WebCore::applyValueFontVariantEastAsian(fontDescription, value);
</ins><span class="cx"> styleResolver.setFontDescription(fontDescription);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedFontcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -121,15 +121,21 @@
</span><span class="cx"> return m_fontCustomPlatformData.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomicString&, bool syntheticBold, bool syntheticItalic, bool)
</del><ins>+RefPtr<Font> CachedFont::createFont(const FontDescription& fontDescription, const AtomicString&, bool syntheticBold, bool syntheticItalic, bool, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><del>- return Font::create(platformDataFromCustomData(fontDescription, syntheticBold, syntheticItalic), true, false);
</del><ins>+ return Font::create(platformDataFromCustomData(fontDescription, syntheticBold, syntheticItalic, fontFaceFeatures, fontFaceVariantSettings), true, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-FontPlatformData CachedFont::platformDataFromCustomData(const FontDescription& fontDescription, bool bold, bool italic)
</del><ins>+FontPlatformData CachedFont::platformDataFromCustomData(const FontDescription& fontDescription, bool bold, bool italic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_fontCustomPlatformData);
</span><ins>+#if PLATFORM(COCOA)
+ return m_fontCustomPlatformData->fontPlatformData(fontDescription, bold, italic, fontFaceFeatures, fontFaceVariantSettings);
+#else
+ UNUSED_PARAM(fontFaceFeatures);
+ UNUSED_PARAM(fontFaceVariantSettings);
</ins><span class="cx"> return m_fontCustomPlatformData->fontPlatformData(fontDescription, bold, italic);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedFont::allClientsRemoved()
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedFont.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx">
</span><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class FontDescription;
</span><ins>+class FontFeatureSettings;
</ins><span class="cx"> class FontPlatformData;
</span><span class="cx"> class SVGDocument;
</span><span class="cx"> class SVGFontElement;
</span><span class="lines">@@ -50,10 +51,10 @@
</span><span class="cx">
</span><span class="cx"> virtual bool ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI);
</span><span class="cx">
</span><del>- virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG);
</del><ins>+ virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG, const FontFeatureSettings&, const FontVariantSettings&);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><del>- FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic);
</del><ins>+ FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&);
</ins><span class="cx">
</span><span class="cx"> bool ensureCustomFontData(SharedBuffer* data);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedSVGFontcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -51,14 +51,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG)
</del><ins>+RefPtr<Font> CachedSVGFont::createFont(const FontDescription& fontDescription, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SVG_OTF_CONVERTER)
</span><span class="cx"> if (!externalSVG || firstFontFace(remoteURI))
</span><del>- return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, externalSVG);
</del><ins>+ return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, externalSVG, fontFaceFeatures, fontFaceVariantSettings);
</ins><span class="cx"> #else
</span><span class="cx"> if (!externalSVG)
</span><del>- return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, externalSVG);
</del><ins>+ return CachedFont::createFont(fontDescription, remoteURI, syntheticBold, syntheticItalic, externalSVG, fontFaceFeatures, fontFaceVariantSettings);
</ins><span class="cx">
</span><span class="cx"> if (SVGFontFaceElement* firstFontFace = this->firstFontFace(remoteURI))
</span><span class="cx"> return Font::create(std::make_unique<SVGFontData>(firstFontFace), fontDescription.computedPixelSize(), syntheticBold, syntheticItalic);
</span><span class="lines">@@ -66,11 +66,11 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontPlatformData CachedSVGFont::platformDataFromCustomData(const FontDescription& fontDescription, bool bold, bool italic)
</del><ins>+FontPlatformData CachedSVGFont::platformDataFromCustomData(const FontDescription& fontDescription, bool bold, bool italic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> if (m_externalSVGDocument)
</span><span class="cx"> return FontPlatformData(fontDescription.computedPixelSize(), bold, italic);
</span><del>- return CachedFont::platformDataFromCustomData(fontDescription, bold, italic);
</del><ins>+ return CachedFont::platformDataFromCustomData(fontDescription, bold, italic, fontFaceFeatures, fontFaceVariantSettings);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CachedSVGFont::ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedSVGFonth"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedSVGFont.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -40,10 +40,10 @@
</span><span class="cx">
</span><span class="cx"> virtual bool ensureCustomFontData(bool externalSVG, const AtomicString& remoteURI) override;
</span><span class="cx">
</span><del>- virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG) override;
</del><ins>+ virtual RefPtr<Font> createFont(const FontDescription&, const AtomicString& remoteURI, bool syntheticBold, bool syntheticItalic, bool externalSVG, const FontFeatureSettings&, const FontVariantSettings&) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic);
</del><ins>+ FontPlatformData platformDataFromCustomData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings&, const FontVariantSettings&);
</ins><span class="cx">
</span><span class="cx"> SVGFontElement* getSVGFontById(const String&) const;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -232,7 +232,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>-RetainPtr<CTFontRef> applyFontFeatureSettings(CTFontRef, const FontFeatureSettings&, const FontVariantSettings&);
</del><ins>+RetainPtr<CTFontRef> applyFontFeatureSettings(CTFontRef, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(MAC)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -622,7 +622,8 @@
</span><span class="cx"> return Simple;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // Because Font::applyTransforms() doesn't know which features to enable/disable it the simple code path can’t properly handle feature or variant settings.
</del><ins>+ // Because Font::applyTransforms() doesn't know which features to enable/disable in the simple code path, it can't properly handle feature or variant settings.
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=150791: @font-face features should also cause this to be complex.
</ins><span class="cx"> if (m_fontDescription.featureSettings().size() > 0 || !m_fontDescription.variantSettings().isAllNormal())
</span><span class="cx"> return Complex;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -143,202 +143,260 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef HashMap<FontFeatureTag, int, FontFeatureTagHash, FontFeatureTagHashTraits> FeaturesMap;
-
-static FeaturesMap computeFeatureSettingsFromVariants(const FontVariantSettings& variantSettings)
-{
- FeaturesMap result;
-
- switch (variantSettings.commonLigatures) {
- case FontVariantLigatures::Yes:
- result.add(fontFeatureTag("liga"), 1);
- result.add(fontFeatureTag("clig"), 1);
- break;
- case FontVariantLigatures::No:
- result.add(fontFeatureTag("liga"), 0);
- result.add(fontFeatureTag("clig"), 0);
- break;
- default:
- break;
- }
-
- switch (variantSettings.discretionaryLigatures) {
- case FontVariantLigatures::Yes:
- result.add(fontFeatureTag("dlig"), 1);
- break;
- case FontVariantLigatures::No:
- result.add(fontFeatureTag("dlig"), 0);
- break;
- default:
- break;
- }
-
- switch (variantSettings.historicalLigatures) {
- case FontVariantLigatures::Yes:
- result.add(fontFeatureTag("hlig"), 1);
- break;
- case FontVariantLigatures::No:
- result.add(fontFeatureTag("hlig"), 0);
- break;
- default:
- break;
- }
-
- switch (variantSettings.contextualAlternates) {
- case FontVariantLigatures::Yes:
- result.add(fontFeatureTag("calt"), 1);
- break;
- case FontVariantLigatures::No:
- result.add(fontFeatureTag("calt"), 0);
- break;
- default:
- break;
- }
-
- switch (variantSettings.position) {
- case FontVariantPosition::Subscript:
- result.add(fontFeatureTag("subs"), 1);
- break;
- case FontVariantPosition::Superscript:
- result.add(fontFeatureTag("sups"), 1);
- break;
- default:
- break;
- }
-
- switch (variantSettings.caps) {
- case FontVariantCaps::AllSmall:
- result.add(fontFeatureTag("c2sc"), 1);
- FALLTHROUGH;
- case FontVariantCaps::Small:
- result.add(fontFeatureTag("smcp"), 1);
- break;
- case FontVariantCaps::AllPetite:
- result.add(fontFeatureTag("c2pc"), 1);
- FALLTHROUGH;
- case FontVariantCaps::Petite:
- result.add(fontFeatureTag("pcap"), 1);
- break;
- case FontVariantCaps::Unicase:
- result.add(fontFeatureTag("unic"), 1);
- break;
- case FontVariantCaps::Titling:
- result.add(fontFeatureTag("titl"), 1);
- break;
- default:
- break;
- }
-
- switch (variantSettings.numericFigure) {
- case FontVariantNumericFigure::LiningNumbers:
- result.add(fontFeatureTag("lnum"), 1);
- break;
- case FontVariantNumericFigure::OldStyleNumbers:
- result.add(fontFeatureTag("onum"), 1);
- break;
- default:
- break;
- }
-
- switch (variantSettings.numericSpacing) {
- case FontVariantNumericSpacing::ProportionalNumbers:
- result.add(fontFeatureTag("pnum"), 1);
- break;
- case FontVariantNumericSpacing::TabularNumbers:
- result.add(fontFeatureTag("tnum"), 1);
- break;
- default:
- break;
- }
-
- switch (variantSettings.numericFraction) {
- case FontVariantNumericFraction::DiagonalFractions:
- result.add(fontFeatureTag("frac"), 1);
- break;
- case FontVariantNumericFraction::StackedFractions:
- result.add(fontFeatureTag("afrc"), 1);
- break;
- default:
- break;
- }
-
- if (variantSettings.numericOrdinal == FontVariantNumericOrdinal::Yes)
- result.add(fontFeatureTag("ordn"), 1);
- if (variantSettings.numericSlashedZero == FontVariantNumericSlashedZero::Yes)
- result.add(fontFeatureTag("zero"), 1);
-
- switch (variantSettings.alternates) {
- case FontVariantAlternates::HistoricalForms:
- result.add(fontFeatureTag("hist"), 1);
- break;
- default:
- break;
- }
-
- switch (variantSettings.eastAsianVariant) {
- case FontVariantEastAsianVariant::Jis78:
- result.add(fontFeatureTag("jp78"), 1);
- break;
- case FontVariantEastAsianVariant::Jis83:
- result.add(fontFeatureTag("jp83"), 1);
- break;
- case FontVariantEastAsianVariant::Jis90:
- result.add(fontFeatureTag("jp90"), 1);
- break;
- case FontVariantEastAsianVariant::Jis04:
- result.add(fontFeatureTag("jp04"), 1);
- break;
- case FontVariantEastAsianVariant::Simplified:
- result.add(fontFeatureTag("smpl"), 1);
- break;
- case FontVariantEastAsianVariant::Traditional:
- result.add(fontFeatureTag("trad"), 1);
- break;
</del><ins>+typedef HashMap<FontFeatureTag, int, FontFeatureTagHash, FontFeatureTagHashTraits> FeaturesMap;
+
+static FeaturesMap computeFeatureSettingsFromVariants(const FontVariantSettings& variantSettings)
+{
+ FeaturesMap result;
+
+ switch (variantSettings.commonLigatures) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ result.add(fontFeatureTag("liga"), 1);
+ result.add(fontFeatureTag("clig"), 1);
+ break;
+ case FontVariantLigatures::No:
+ result.add(fontFeatureTag("liga"), 0);
+ result.add(fontFeatureTag("clig"), 0);
+ break;
</ins><span class="cx"> default:
</span><del>- break;
- }
-
- switch (variantSettings.eastAsianWidth) {
- case FontVariantEastAsianWidth::FullWidth:
- result.add(fontFeatureTag("fwid"), 1);
- break;
- case FontVariantEastAsianWidth::ProportionalWidth:
- result.add(fontFeatureTag("pwid"), 1);
- break;
- default:
- break;
- }
-
- if (variantSettings.eastAsianRuby == FontVariantEastAsianRuby::Yes)
- result.add(fontFeatureTag("ruby"), 1);
-
- return result;
</del><ins>+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.discretionaryLigatures) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ result.add(fontFeatureTag("dlig"), 1);
+ break;
+ case FontVariantLigatures::No:
+ result.add(fontFeatureTag("dlig"), 0);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.historicalLigatures) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ result.add(fontFeatureTag("hlig"), 1);
+ break;
+ case FontVariantLigatures::No:
+ result.add(fontFeatureTag("hlig"), 0);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.contextualAlternates) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ result.add(fontFeatureTag("calt"), 1);
+ break;
+ case FontVariantLigatures::No:
+ result.add(fontFeatureTag("calt"), 0);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.position) {
+ case FontVariantPosition::Normal:
+ break;
+ case FontVariantPosition::Subscript:
+ result.add(fontFeatureTag("subs"), 1);
+ break;
+ case FontVariantPosition::Superscript:
+ result.add(fontFeatureTag("sups"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.caps) {
+ case FontVariantCaps::Normal:
+ break;
+ case FontVariantCaps::AllSmall:
+ result.add(fontFeatureTag("c2sc"), 1);
+ FALLTHROUGH;
+ case FontVariantCaps::Small:
+ result.add(fontFeatureTag("smcp"), 1);
+ break;
+ case FontVariantCaps::AllPetite:
+ result.add(fontFeatureTag("c2pc"), 1);
+ FALLTHROUGH;
+ case FontVariantCaps::Petite:
+ result.add(fontFeatureTag("pcap"), 1);
+ break;
+ case FontVariantCaps::Unicase:
+ result.add(fontFeatureTag("unic"), 1);
+ break;
+ case FontVariantCaps::Titling:
+ result.add(fontFeatureTag("titl"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.numericFigure) {
+ case FontVariantNumericFigure::Normal:
+ break;
+ case FontVariantNumericFigure::LiningNumbers:
+ result.add(fontFeatureTag("lnum"), 1);
+ break;
+ case FontVariantNumericFigure::OldStyleNumbers:
+ result.add(fontFeatureTag("onum"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.numericSpacing) {
+ case FontVariantNumericSpacing::Normal:
+ break;
+ case FontVariantNumericSpacing::ProportionalNumbers:
+ result.add(fontFeatureTag("pnum"), 1);
+ break;
+ case FontVariantNumericSpacing::TabularNumbers:
+ result.add(fontFeatureTag("tnum"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.numericFraction) {
+ case FontVariantNumericFraction::Normal:
+ break;
+ case FontVariantNumericFraction::DiagonalFractions:
+ result.add(fontFeatureTag("frac"), 1);
+ break;
+ case FontVariantNumericFraction::StackedFractions:
+ result.add(fontFeatureTag("afrc"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.numericOrdinal) {
+ case FontVariantNumericOrdinal::Normal:
+ break;
+ case FontVariantNumericOrdinal::Yes:
+ result.add(fontFeatureTag("ordn"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.numericSlashedZero) {
+ case FontVariantNumericSlashedZero::Normal:
+ break;
+ case FontVariantNumericSlashedZero::Yes:
+ result.add(fontFeatureTag("zero"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.alternates) {
+ case FontVariantAlternates::Normal:
+ break;
+ case FontVariantAlternates::HistoricalForms:
+ result.add(fontFeatureTag("hist"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.eastAsianVariant) {
+ case FontVariantEastAsianVariant::Normal:
+ break;
+ case FontVariantEastAsianVariant::Jis78:
+ result.add(fontFeatureTag("jp78"), 1);
+ break;
+ case FontVariantEastAsianVariant::Jis83:
+ result.add(fontFeatureTag("jp83"), 1);
+ break;
+ case FontVariantEastAsianVariant::Jis90:
+ result.add(fontFeatureTag("jp90"), 1);
+ break;
+ case FontVariantEastAsianVariant::Jis04:
+ result.add(fontFeatureTag("jp04"), 1);
+ break;
+ case FontVariantEastAsianVariant::Simplified:
+ result.add(fontFeatureTag("smpl"), 1);
+ break;
+ case FontVariantEastAsianVariant::Traditional:
+ result.add(fontFeatureTag("trad"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.eastAsianWidth) {
+ case FontVariantEastAsianWidth::Normal:
+ break;
+ case FontVariantEastAsianWidth::FullWidth:
+ result.add(fontFeatureTag("fwid"), 1);
+ break;
+ case FontVariantEastAsianWidth::ProportionalWidth:
+ result.add(fontFeatureTag("pwid"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ switch (variantSettings.eastAsianRuby) {
+ case FontVariantEastAsianRuby::Normal:
+ break;
+ case FontVariantEastAsianRuby::Yes:
+ result.add(fontFeatureTag("ruby"), 1);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
+
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RetainPtr<CTFontRef> applyFontFeatureSettings(CTFontRef originalFont, const FontFeatureSettings& features, const FontVariantSettings& variantSettings)
</del><ins>+RetainPtr<CTFontRef> applyFontFeatureSettings(CTFontRef originalFont, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings& variantSettings)
</ins><span class="cx"> {
</span><del>- if (!originalFont || (!features.size() && variantSettings.isAllNormal()))
</del><ins>+ if (!originalFont || (!features.size() && variantSettings.isAllNormal()
+ && (!fontFaceFeatures || !fontFaceFeatures->size()) && (!fontFaceVariantSettings || fontFaceVariantSettings->isAllNormal())))
</ins><span class="cx"> return originalFont;
</span><span class="cx">
</span><span class="cx"> // This algorithm is described at http://www.w3.org/TR/css3-fonts/#feature-precedence
</span><ins>+ FeaturesMap featuresToBeApplied;
</ins><span class="cx">
</span><span class="cx"> // Step 1: CoreText handles default features (such as required ligatures).
</span><span class="cx">
</span><del>- // Steps 2-3: Consult with @font-face
- // FIXME: This is not yet implemented.
</del><ins>+ // Step 2: Consult with font-variant-* inside @font-face
+ if (fontFaceVariantSettings)
+ featuresToBeApplied = computeFeatureSettingsFromVariants(*fontFaceVariantSettings);
</ins><span class="cx">
</span><ins>+ // Step 3: Consult with font-feature-settings inside @font-face
+ if (fontFaceFeatures) {
+ for (auto& fontFaceFeature : *fontFaceFeatures)
+ featuresToBeApplied.set(fontFaceFeature.tag(), fontFaceFeature.value());
+ }
+
</ins><span class="cx"> // Step 4: Font-variant
</span><del>- auto fontFeatureSettingsFromVariants = computeFeatureSettingsFromVariants(variantSettings);
</del><ins>+ for (auto& newFeature : computeFeatureSettingsFromVariants(variantSettings))
+ featuresToBeApplied.set(newFeature.key, newFeature.value);
</ins><span class="cx">
</span><ins>+ // Step 5: Other properties
+
</ins><span class="cx"> // Step 6: Font-feature-settings
</span><span class="cx"> for (auto& newFeature : features)
</span><del>- fontFeatureSettingsFromVariants.set(newFeature.tag(), newFeature.value());
</del><ins>+ featuresToBeApplied.set(newFeature.tag(), newFeature.value());
</ins><span class="cx">
</span><del>- if (!fontFeatureSettingsFromVariants.size())
</del><ins>+ if (!featuresToBeApplied.size())
</ins><span class="cx"> return originalFont;
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFMutableArrayRef> featureArray = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, features.size(), &kCFTypeArrayCallBacks));
</span><del>- for (auto& p : fontFeatureSettingsFromVariants) {
</del><ins>+ for (auto& p : featuresToBeApplied) {
</ins><span class="cx"> auto feature = FontFeature(p.key, p.value);
</span><span class="cx"> appendTrueTypeFeature(featureArray.get(), feature);
</span><span class="cx"> appendOpenTypeFeature(featureArray.get(), feature);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> NSString *desiredFamily = family;
</span><span class="cx"> RetainPtr<CTFontRef> foundFont = adoptCF(CTFontCreateForCSS((CFStringRef)desiredFamily, toCoreTextFontWeight(weight), requestedTraits, size));
</span><del>- foundFont = applyFontFeatureSettings(foundFont.get(), featureSettings, variantSettings);
</del><ins>+ foundFont = applyFontFeatureSettings(foundFont.get(), nullptr, nullptr, featureSettings, variantSettings);
</ins><span class="cx"> if (!foundFont)
</span><span class="cx"> return nil;
</span><span class="cx"> font = CFBridgingRelease(CFRetain(foundFont.get()));
</span><span class="lines">@@ -513,7 +513,7 @@
</span><span class="cx"> const FontPlatformData& platformData = originalFontData->platformData();
</span><span class="cx"> NSFont *nsFont = platformData.nsFont();
</span><span class="cx"> RetainPtr<CTFontRef> result = lookupCTFont(platformData.font(), platformData.size(), characters, length);
</span><del>- result = applyFontFeatureSettings(result.get(), description.featureSettings(), description.variantSettings());
</del><ins>+ result = applyFontFeatureSettings(result.get(), nullptr, nullptr, description.featureSettings(), description.variantSettings());
</ins><span class="cx"> if (!result)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsmacFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.cpp 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -34,16 +34,18 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontPlatformData FontCustomPlatformData::fontPlatformData(const FontDescription& fontDescription, bool bold, bool italic)
</del><ins>+FontPlatformData FontCustomPlatformData::fontPlatformData(const FontDescription& fontDescription, bool bold, bool italic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings)
</ins><span class="cx"> {
</span><span class="cx"> int size = fontDescription.computedPixelSize();
</span><span class="cx"> FontOrientation orientation = fontDescription.orientation();
</span><span class="cx"> FontWidthVariant widthVariant = fontDescription.widthVariant();
</span><span class="cx"> #if CORETEXT_WEB_FONTS
</span><span class="cx"> RetainPtr<CTFontRef> font = adoptCF(CTFontCreateWithFontDescriptor(m_fontDescriptor.get(), size, nullptr));
</span><del>- font = applyFontFeatureSettings(font.get(), fontDescription.featureSettings(), fontDescription.variantSettings());
</del><ins>+ font = applyFontFeatureSettings(font.get(), &fontFaceFeatures, &fontFaceVariantSettings, fontDescription.featureSettings(), fontDescription.variantSettings());
</ins><span class="cx"> return FontPlatformData(font.get(), size, bold, italic, orientation, widthVariant);
</span><span class="cx"> #else
</span><ins>+ UNUSED_PARAM(fontFaceFeatures);
+ UNUSED_PARAM(fontFaceVariantSettings);
</ins><span class="cx"> return FontPlatformData(m_cgFont.get(), size, bold, italic, orientation, widthVariant);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FontDescription;
</span><ins>+class FontFeatureSettings;
</ins><span class="cx"> class FontPlatformData;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><span class="lines">@@ -51,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> ~FontCustomPlatformData();
</span><span class="cx">
</span><del>- FontPlatformData fontPlatformData(const FontDescription&, bool bold, bool italic);
</del><ins>+ FontPlatformData fontPlatformData(const FontDescription&, bool bold, bool italic, const FontFeatureSettings& fontFaceFeatures, const FontVariantSettings& fontFaceVariantSettings);
</ins><span class="cx">
</span><span class="cx"> static bool supportsFormat(const String&);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformtextTextFlagsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -149,6 +149,59 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct FontVariantSettings {
</span><ins>+ FontVariantSettings()
+ : commonLigatures(FontVariantLigatures::Normal)
+ , discretionaryLigatures(FontVariantLigatures::Normal)
+ , historicalLigatures(FontVariantLigatures::Normal)
+ , contextualAlternates(FontVariantLigatures::Normal)
+ , position(FontVariantPosition::Normal)
+ , caps(FontVariantCaps::Normal)
+ , numericFigure(FontVariantNumericFigure::Normal)
+ , numericSpacing(FontVariantNumericSpacing::Normal)
+ , numericFraction(FontVariantNumericFraction::Normal)
+ , numericOrdinal(FontVariantNumericOrdinal::Normal)
+ , numericSlashedZero(FontVariantNumericSlashedZero::Normal)
+ , alternates(FontVariantAlternates::Normal)
+ , eastAsianVariant(FontVariantEastAsianVariant::Normal)
+ , eastAsianWidth(FontVariantEastAsianWidth::Normal)
+ , eastAsianRuby(FontVariantEastAsianRuby::Normal)
+ {
+ }
+
+ FontVariantSettings(
+ FontVariantLigatures commonLigatures,
+ FontVariantLigatures discretionaryLigatures,
+ FontVariantLigatures historicalLigatures,
+ FontVariantLigatures contextualAlternates,
+ FontVariantPosition position,
+ FontVariantCaps caps,
+ FontVariantNumericFigure numericFigure,
+ FontVariantNumericSpacing numericSpacing,
+ FontVariantNumericFraction numericFraction,
+ FontVariantNumericOrdinal numericOrdinal,
+ FontVariantNumericSlashedZero numericSlashedZero,
+ FontVariantAlternates alternates,
+ FontVariantEastAsianVariant eastAsianVariant,
+ FontVariantEastAsianWidth eastAsianWidth,
+ FontVariantEastAsianRuby eastAsianRuby)
+ : commonLigatures(commonLigatures)
+ , discretionaryLigatures(discretionaryLigatures)
+ , historicalLigatures(historicalLigatures)
+ , contextualAlternates(contextualAlternates)
+ , position(position)
+ , caps(caps)
+ , numericFigure(numericFigure)
+ , numericSpacing(numericSpacing)
+ , numericFraction(numericFraction)
+ , numericOrdinal(numericOrdinal)
+ , numericSlashedZero(numericSlashedZero)
+ , alternates(alternates)
+ , eastAsianVariant(eastAsianVariant)
+ , eastAsianWidth(eastAsianWidth)
+ , eastAsianRuby(eastAsianRuby)
+ {
+ }
+
</ins><span class="cx"> bool isAllNormal() const
</span><span class="cx"> {
</span><span class="cx"> return commonLigatures == FontVariantLigatures::Normal
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm (193666 => 193667)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm 2015-12-08 00:23:25 UTC (rev 193666)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderThemeIOS.mm 2015-12-08 00:23:33 UTC (rev 193667)
</span><span class="lines">@@ -1271,7 +1271,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 = applyFontFeatureSettings(font.get(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variantSettings());
</del><ins>+ font = applyFontFeatureSettings(font.get(), nullptr, nullptr, fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variantSettings());
</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>