<!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>[213464] 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/213464">213464</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-03-06 13:40:31 -0800 (Mon, 06 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expand font-weight and font-stretch to take any number
https://bugs.webkit.org/show_bug.cgi?id=168889
Reviewed by Simon Fraser.
Source/WebCore:
This patch expands parsing support for font-weight and font-stretch so that they can accept
numbers in addition to the keyword values they accepted previously. Eventually, these numbers
will be used as inputs to select variation fonts; however, in this patch, the values are just
parsed and held in our internal data model. This means that this patch doesn't actually change
the general behavior of WebKit; instead, it parses new values, outputs them (via
getComputedStyle() and similar functions), and provides them as input to our preexisting font
selection algorithm.
This patch doesn't actually modify anything algorithmically, and therefore, it doesn't include
any additional tests for the font selection algorithm. Instead, it tests the parsing of the
newly accepted values (both input and output).
Because our internal data model needs to hold numbers now, this patch also completely eliminates
the FontWidth, FontItalic, and FontTraitsMask enum values in favor of FontSelectionValues (which
can hold numbers instead of individual enum values). Therefore, every place which we were using
these enum values is migrated in this patch to using FontSelectionValues instead.
Tests: fast/text/font-selection-font-face-parse.html
fast/text/font-selection-font-loading-api-parse.html
fast/text/font-style-parse.html
fast/text/font-weight-parse.html
* accessibility/AccessibilityRenderObject.cpp: Migrate off of old enum types.
(WebCore::AccessibilityRenderObject::hasBoldFont):
(WebCore::AccessibilityRenderObject::hasItalicFont):
(WebCore::AccessibilityRenderObject::hasPlainText):
* accessibility/atk/WebKitAccessibleInterfaceText.cpp: Ditto.
(getAttributeSetForAccessibilityObject):
* css/CSSComputedStyleDeclaration.cpp: Output newly parsed values.
(WebCore::fontWeightFromStyle):
(WebCore::fontStretchFromStyle):
(WebCore::fontStyleFromStyle):
(WebCore::fontShorthandValueForSelectionProperties):
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSFontFace.cpp: Migrate off old enum types.
(WebCore::calculateWeightRange):
(WebCore::CSSFontFace::setWeight):
(WebCore::calculateStretchRange):
(WebCore::CSSFontFace::setStretch):
(WebCore::calculateStyleRange):
(WebCore::CSSFontFace::setStyle):
(WebCore::CSSFontFace::calculateStyleMask): Deleted.
(WebCore::CSSFontFace::calculateWeightMask): Deleted.
(WebCore::CSSFontFace::calculateStretch): Deleted.
* css/CSSFontFace.h:
* css/CSSFontFaceSet.cpp: Migrate off old enum types.
(WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):
(WebCore::calculateWeightValue):
(WebCore::calculateStretchValue):
(WebCore::calculateStyleValue):
(WebCore::computeFontSelectionRequest):
(WebCore::CSSFontFaceSet::matchingFaces):
(WebCore::CSSFontFaceSet::fontFace):
(WebCore::computeFontTraitsMask): Deleted.
(WebCore::computeFontStretch): Deleted.
* css/CSSFontFaceSet.h:
* css/CSSFontSelector.cpp: Migrate off old enum types.
(WebCore::CSSFontSelector::fontRangesForFamily):
* css/CSSPrimitiveValueMappings.h: font-weight and font-style are no longer
keyword properties.
(WebCore::CSSPrimitiveValue::operator FontWeight): Deleted.
(WebCore::CSSPrimitiveValue::operator FontItalic): Deleted.
* css/CSSProperties.json: Use the same infrastructure for all three of the
font selection properties.
* css/CSSSegmentedFontFace.cpp: Migrate off old enum types.
(WebCore::CSSSegmentedFontFace::fontRanges):
* css/CSSValueKeywords.in: The 100-based font-weight values are now represented
as real numbers.
* css/FontFace.cpp: Update the string output functions for the new values.
(WebCore::rangeIsSingleValue):
(WebCore::FontFace::style):
(WebCore::FontFace::weight):
(WebCore::FontFace::stretch):
* css/StyleBuilderConverter.h: Use CSSValue conversion functions to convert
to our new data model.
(WebCore::StyleBuilderConverter::convertFontWeight):
(WebCore::StyleBuilderConverter::convertFontStretch):
(WebCore::StyleBuilderConverter::convertFontStyle):
* css/StyleBuilderCustom.h: font-weight is no longer a completely custom
property.
(WebCore::StyleBuilderCustom::applyInitialFontWeight): Deleted.
(WebCore::StyleBuilderCustom::applyInheritFontWeight): Deleted.
(WebCore::StyleBuilderCustom::applyValueFontWeight): Deleted.
* css/parser/CSSParserFastPaths.cpp: font-style is no longer a keyword property.
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
(WebCore::CSSParserFastPaths::isKeywordPropertyID):
* css/parser/CSSPropertyParser.cpp: Parse the new values in the font selection
properties.
(WebCore::consumeFontWeightKeywordValue):
(WebCore::consumeFontWeightCSS21):
(WebCore::consumeFontWeight):
(WebCore::consumeFontStyleKeywordValue):
(WebCore::consumeFontStyle):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::parseFontFaceDescriptor):
(WebCore::CSSPropertyParser::consumeSystemFont):
(WebCore::CSSPropertyParser::consumeFont):
* editing/EditingStyle.cpp: Migrate off old enum types.
(WebCore::fontWeightIsBold):
* editing/mac/EditorMac.mm: Ditto.
(WebCore::Editor::applyFontStyles):
* platform/graphics/FontCache.h: Unify our font selection values into
their enclosing struct, FontSelectionCapabilities. Also, clean up utility
functions.
* platform/graphics/FontCascade.cpp: Migrate off old enum types.
(WebCore::FontCascade::FontCascade):
* platform/graphics/FontCascade.h: Ditto.
(WebCore::FontCascade::italic):
(WebCore::FontCascade::weight):
* platform/graphics/FontDescription.cpp: Ditto.
(WebCore::FontDescription::FontDescription):
(WebCore::FontCascadeDescription::lighterWeight):
(WebCore::FontCascadeDescription::bolderWeight):
(WebCore::FontDescription::traitsMask): Deleted.
* platform/graphics/FontDescription.h: Migrate off old enum types.
(WebCore::FontDescription::italic):
(WebCore::FontDescription::stretch):
(WebCore::FontDescription::weight):
(WebCore::FontDescription::fontSelectionRequest):
(WebCore::FontDescription::computedPixelSize):
(WebCore::FontDescription::setItalic):
(WebCore::FontDescription::setStretch):
(WebCore::FontDescription::setIsItalic):
(WebCore::FontDescription::setWeight):
(WebCore::FontDescription::operator==):
(WebCore::FontCascadeDescription::lighterWeight):
(WebCore::FontCascadeDescription::bolderWeight):
(WebCore::FontCascadeDescription::initialItalic):
(WebCore::FontCascadeDescription::initialWeight):
(WebCore::FontCascadeDescription::initialStretch):
* platform/graphics/FontSelectionAlgorithm.cpp: Delete code which was only
present to convert from the old enum types to the new FontSelectionRequest
type.
(WebCore::fontSelectionRequestForTraitsMask): Deleted.
(WebCore::initialFontSelectionCapabilitiesForTraitsMask): Deleted.
(WebCore::fontSelectionCapabilitiesForTraitsMask): Deleted.
* platform/graphics/FontSelectionAlgorithm.h: Migrate to new named functions
for special values.
(WebCore::isItalic):
(WebCore::boldWeightValue):
(WebCore::normalWeightValue):
(WebCore::isFontWeightBold):
(WebCore::normalStretchValue):
(WebCore::FontSelectionRequest::FontSelectionRequest):
* platform/graphics/cocoa/FontCacheCoreText.cpp: Migrate all platforms which
compile this file to know about FontDatabase. This simplifies the interaction
between @font-face fonts and installed fonts. Also, migrate off old enum types.
(WebCore::stretchFromCoreTextTraits):
(WebCore::fontWeightFromCoreText):
(WebCore::capabilitiesForFontDescriptor):
(WebCore::FontCache::getFontSelectionCapabilitiesInFamily):
(WebCore::platformFontLookupWithFamily):
(WebCore::invalidateFontCache):
(WebCore::fontWithFamily):
(WebCore::FontCache::createFontPlatformData):
(WebCore::lookupFallbackFont):
(WebCore::toTraitsMask): Deleted.
(WebCore::isFontWeightBold): Deleted.
(WebCore::toCoreTextFontWeight): Deleted.
(): Deleted.
(WebCore::FontDatabase::capabilitiesForFontDescriptor): Deleted.
(WebCore::calculateFontSelectionRequest): Deleted.
* platform/graphics/freetype/FontCacheFreeType.cpp: Migrate off old enum types.
(WebCore::FontCache::getFontSelectionCapabilitiesInFamily):
(WebCore::fontWeightToFontconfigWeight):
(): Deleted.
* platform/graphics/freetype/FontPlatformDataFreeType.cpp: Ditto.
(WebCore::FontPlatformData::FontPlatformData):
* platform/graphics/ios/FontCacheIOS.mm: Ditto.
(WebCore::baseSystemFontDescriptor):
(WebCore::systemFontModificationAttributes):
(WebCore::systemFontDescriptor):
(WebCore::platformFontWithFamilySpecialCase):
(WebCore::FontCache::weightOfCTFont): Deleted.
* platform/graphics/mac/FontCacheMac.mm: Ditto.
(WebCore::toNSFontWeight):
(WebCore::platformFontWithFamilySpecialCase):
* platform/graphics/win/FontCacheWin.cpp: Ditto.
(WebCore::toGDIFontWeight):
(WebCore::traitsInFamilyEnumProc):
(WebCore::FontCache::getFontSelectionCapabilitiesInFamily):
(): Deleted.
* platform/mock/MockRealtimeVideoSource.cpp: Ditto.
(WebCore::MockRealtimeVideoSource::applySize):
* platform/text/TextFlags.h: Delete old enum types.
* platform/win/DragImageWin.cpp: Migrate off old enum types.
(WebCore::dragLabelFont):
* rendering/RenderEmbeddedObject.cpp: Ditto.
(WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
* rendering/RenderThemeGtk.cpp: Ditto.
(WebCore::RenderThemeGtk::updateCachedSystemFontDescription):
* rendering/RenderThemeIOS.mm: Ditto.
(WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
* rendering/RenderThemeMac.mm: Ditto.
(WebCore::toFontWeight):
* rendering/RenderThemeWin.cpp: Ditto.
(WebCore::fillFontDescription):
Source/WebKit/mac:
Migrate off old enum types.
* WebCoreSupport/PopupMenuMac.mm:
(PopupMenuMac::populate):
* WebView/WebHTMLView.mm:
(fontNameForDescription):
* WebView/WebView.mm:
(-[WebView updateTextTouchBar]):
Source/WebKit/win:
Migrate off old enum types.
* WebKitGraphics.cpp:
(makeFont):
Source/WebKit2:
Migrate off old enum types.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::editorState):
Tools:
Migrate off old enum types.
* TestWebKitAPI/Tests/WebCore/FontCache.cpp:
(TestWebKitAPI::createPlatformFont):
(TestWebKitAPI::compareFonts):
(TestWebKitAPI::TEST_F):
LayoutTests:
* fast/text/font-selection-font-face-parse-expected.txt: Added.
* fast/text/font-selection-font-face-parse.html: Added.
* fast/text/font-selection-font-loading-api-parse-expected.txt: Added.
* fast/text/font-selection-font-loading-api-parse.html: Added.
* fast/text/font-stretch-parse-expected.txt:
* fast/text/font-stretch-parse.html:
* fast/text/font-style-parse-expected.txt: Copied from LayoutTests/fast/text/font-stretch-parse-expected.txt.
* fast/text/font-style-parse.html: Added.
* fast/text/font-weight-parse-expected.txt: Copied from LayoutTests/fast/text/font-stretch-parse-expected.txt.
* fast/text/font-weight-parse.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfasttextfontstretchparseexpectedtxt">trunk/LayoutTests/fast/text/font-stretch-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontstretchparsehtml">trunk/LayoutTests/fast/text/font-stretch-parse.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFacecpp">trunk/Source/WebCore/css/CSSFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceh">trunk/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSetcpp">trunk/Source/WebCore/css/CSSFontFaceSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSeth">trunk/Source/WebCore/css/CSSFontFaceSet.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSPrimitiveValueMappingsh">trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSPropertiesjson">trunk/Source/WebCore/css/CSSProperties.json</a></li>
<li><a href="#trunkSourceWebCorecssCSSSegmentedFontFacecpp">trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssFontFacecpp">trunk/Source/WebCore/css/FontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderCustomh">trunk/Source/WebCore/css/StyleBuilderCustom.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserFastPathscpp">trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditingStylecpp">trunk/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmacEditorMacmm">trunk/Source/WebCore/editing/mac/EditorMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCacheh">trunk/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadecpp">trunk/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontCascadeh">trunk/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptioncpp">trunk/Source/WebCore/platform/graphics/FontDescription.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptionh">trunk/Source/WebCore/platform/graphics/FontDescription.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmcpp">trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmh">trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp">trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm">trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm">trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicswinFontCacheWincpp">trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextFlagsh">trunk/Source/WebCore/platform/text/TextFlags.h</a></li>
<li><a href="#trunkSourceWebCoreplatformwinDragImageWincpp">trunk/Source/WebCore/platform/win/DragImageWin.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderEmbeddedObjectcpp">trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeGtkcpp">trunk/Source/WebCore/rendering/RenderThemeGtk.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeIOSmm">trunk/Source/WebCore/rendering/RenderThemeIOS.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeWincpp">trunk/Source/WebCore/rendering/RenderThemeWin.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm">trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinDOMCoreClassescpp">trunk/Source/WebKit/win/DOMCoreClasses.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitGraphicscpp">trunk/Source/WebKit/win/WebKitGraphics.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebCoreFontCachecpp">trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfasttextfontselectionfontfaceparseexpectedtxt">trunk/LayoutTests/fast/text/font-selection-font-face-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontselectionfontfaceparsehtml">trunk/LayoutTests/fast/text/font-selection-font-face-parse.html</a></li>
<li><a href="#trunkLayoutTestsfasttextfontselectionfontloadingapiparseexpectedtxt">trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontselectionfontloadingapiparsehtml">trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse.html</a></li>
<li><a href="#trunkLayoutTestsfasttextfontstyleparseexpectedtxt">trunk/LayoutTests/fast/text/font-style-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontstyleparsehtml">trunk/LayoutTests/fast/text/font-style-parse.html</a></li>
<li><a href="#trunkLayoutTestsfasttextfontweightparseexpectedtxt">trunk/LayoutTests/fast/text/font-weight-parse-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfasttextfontweightparsehtml">trunk/LayoutTests/fast/text/font-weight-parse.html</a></li>
<li><a href="#trunkSourceWebCorecssFontSelectionValueInlinesh">trunk/Source/WebCore/css/FontSelectionValueInlines.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/LayoutTests/ChangeLog 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Expand font-weight and font-stretch to take any number
+ https://bugs.webkit.org/show_bug.cgi?id=168889
+
+ Reviewed by Simon Fraser.
+
+ * fast/text/font-selection-font-face-parse-expected.txt: Added.
+ * fast/text/font-selection-font-face-parse.html: Added.
+ * fast/text/font-selection-font-loading-api-parse-expected.txt: Added.
+ * fast/text/font-selection-font-loading-api-parse.html: Added.
+ * fast/text/font-stretch-parse-expected.txt:
+ * fast/text/font-stretch-parse.html:
+ * fast/text/font-style-parse-expected.txt: Copied from LayoutTests/fast/text/font-stretch-parse-expected.txt.
+ * fast/text/font-style-parse.html: Added.
+ * fast/text/font-weight-parse-expected.txt: Copied from LayoutTests/fast/text/font-stretch-parse-expected.txt.
+ * fast/text/font-weight-parse.html: Added.
+
</ins><span class="cx"> 2017-03-06 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Mark fast/parser/adoption-agency-unload-iframe-4.html as timing out on platform GTK.
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontselectionfontfaceparseexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-selection-font-face-parse-expected.txt (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-selection-font-face-parse-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-selection-font-face-parse-expected.txt 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+PASS weightTestSheet.cssRules[0].style.fontWeight is "1"
+PASS weightTestSheet.cssRules[1].style.fontWeight is "100"
+PASS weightTestSheet.cssRules[2].style.fontWeight is "200"
+PASS weightTestSheet.cssRules[3].style.fontWeight is "300"
+PASS weightTestSheet.cssRules[4].style.fontWeight is "400"
+PASS weightTestSheet.cssRules[5].style.fontWeight is "normal"
+PASS weightTestSheet.cssRules[6].style.fontWeight is "500"
+PASS weightTestSheet.cssRules[7].style.fontWeight is "600"
+PASS weightTestSheet.cssRules[8].style.fontWeight is "700"
+PASS weightTestSheet.cssRules[9].style.fontWeight is "bold"
+PASS weightTestSheet.cssRules[10].style.fontWeight is "800"
+PASS weightTestSheet.cssRules[11].style.fontWeight is "900"
+PASS weightTestSheet.cssRules[12].style.fontWeight is ""
+PASS weightTestSheet.cssRules[13].style.fontWeight is ""
+PASS weightTestSheet.cssRules[14].style.fontWeight is ""
+PASS weightTestSheet.cssRules[15].style.fontWeight is "7"
+PASS weightTestSheet.cssRules[16].style.fontWeight is "300"
+PASS weightTestSheet.cssRules[17].style.fontWeight is "200"
+PASS stretchTestSheet.cssRules[0].style.fontStretch is "1%"
+PASS stretchTestSheet.cssRules[1].style.fontStretch is "2"
+PASS stretchTestSheet.cssRules[2].style.fontStretch is "ultra-condensed"
+PASS stretchTestSheet.cssRules[3].style.fontStretch is "extra-condensed"
+PASS stretchTestSheet.cssRules[4].style.fontStretch is "condensed"
+PASS stretchTestSheet.cssRules[5].style.fontStretch is "semi-condensed"
+PASS stretchTestSheet.cssRules[6].style.fontStretch is "normal"
+PASS stretchTestSheet.cssRules[7].style.fontStretch is "semi-expanded"
+PASS stretchTestSheet.cssRules[8].style.fontStretch is "expanded"
+PASS stretchTestSheet.cssRules[9].style.fontStretch is "extra-expanded"
+PASS stretchTestSheet.cssRules[10].style.fontStretch is "ultra-expanded"
+PASS stretchTestSheet.cssRules[11].style.fontStretch is ""
+PASS stretchTestSheet.cssRules[12].style.fontStretch is ""
+PASS stretchTestSheet.cssRules[13].style.fontStretch is "7"
+PASS styleTestSheet.cssRules[0].style.fontStyle is "1deg"
+PASS styleTestSheet.cssRules[1].style.fontStyle is "200grad"
+PASS styleTestSheet.cssRules[2].style.fontStyle is "6.28318rad"
+PASS styleTestSheet.cssRules[3].style.fontStyle is "4turn"
+PASS styleTestSheet.cssRules[4].style.fontStyle is "5"
+PASS styleTestSheet.cssRules[5].style.fontStyle is "20"
+PASS styleTestSheet.cssRules[6].style.fontStyle is "italic"
+PASS styleTestSheet.cssRules[7].style.fontStyle is "oblique"
+PASS styleTestSheet.cssRules[8].style.fontStyle is "normal"
+PASS styleTestSheet.cssRules[9].style.fontStyle is ""
+PASS styleTestSheet.cssRules[10].style.fontStyle is ""
+PASS styleTestSheet.cssRules[11].style.fontStyle is "7"
+PASS styleTestSheet.cssRules[12].style.fontStyle is "calc(1441deg)"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextfontselectionfontfaceparsehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-selection-font-face-parse.html (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-selection-font-face-parse.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-selection-font-face-parse.html 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,203 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style id="weightTest">
+@font-face {
+ font-weight: 1;
+}
+@font-face {
+ font-weight: 100;
+}
+@font-face {
+ font-weight: 200;
+}
+@font-face {
+ font-weight: 300;
+}
+@font-face {
+ font-weight: 400;
+}
+@font-face {
+ font-weight: normal;
+}
+@font-face {
+ font-weight: 500;
+}
+@font-face {
+ font-weight: 600;
+}
+@font-face {
+ font-weight: 700;
+}
+@font-face {
+ font-weight: bold;
+}
+@font-face {
+ font-weight: 800;
+}
+@font-face {
+ font-weight: 900;
+}
+@font-face {
+ font-weight: garbage;
+}
+@font-face {
+ font-weight: initial;
+}
+@font-face {
+}
+@font-face {
+ font-weight: calc(3 + 4);
+}
+@font-face {
+ font-weight: calc(100 + 200);
+}
+@font-face {
+ font-weight: calc(150 + 50);
+}
+</style>
+
+<style id="stretchTest">
+@font-face {
+ font-stretch: 1%;
+}
+@font-face {
+ font-stretch: 2;
+}
+@font-face {
+ font-stretch: ultra-condensed;
+}
+@font-face {
+ font-stretch: extra-condensed;
+}
+@font-face {
+ font-stretch: condensed;
+}
+@font-face {
+ font-stretch: semi-condensed;
+}
+@font-face {
+ font-stretch: normal;
+}
+@font-face {
+ font-stretch: semi-expanded;
+}
+@font-face {
+ font-stretch: expanded;
+}
+@font-face {
+ font-stretch: extra-expanded;
+}
+@font-face {
+ font-stretch: ultra-expanded;
+}
+@font-face {
+ font-stretch: garbage;
+}
+@font-face {
+ font-stretch: initial;
+}
+@font-face {
+ font-stretch: calc(3 + 4);
+}
+</style>
+
+<style id="styleTest">
+@font-face {
+ font-style: oblique 1deg;
+}
+@font-face {
+ font-style: oblique 200grad;
+}
+@font-face {
+ font-style: oblique 6.28318rad;
+}
+@font-face {
+ font-style: oblique 4turn;
+}
+@font-face {
+ font-style: oblique 5;
+}
+@font-face {
+ font-style: oblique 20;
+}
+@font-face {
+ font-style: italic;
+}
+@font-face {
+ font-style: oblique;
+}
+@font-face {
+ font-style: normal;
+}
+@font-face {
+ font-style: garbage;
+}
+@font-face {
+ font-style: initial;
+}
+@font-face {
+ font-style: oblique calc(3 + 4);
+}
+@font-face {
+ font-style: oblique calc(4turn + 1deg);
+}
+</style>
+</head>
+<body>
+<script>
+var weightTestSheet = document.getElementById("weightTest").sheet;
+shouldBeEqualToString("weightTestSheet.cssRules[0].style.fontWeight", "1");
+shouldBeEqualToString("weightTestSheet.cssRules[1].style.fontWeight", "100");
+shouldBeEqualToString("weightTestSheet.cssRules[2].style.fontWeight", "200");
+shouldBeEqualToString("weightTestSheet.cssRules[3].style.fontWeight", "300");
+shouldBeEqualToString("weightTestSheet.cssRules[4].style.fontWeight", "400");
+shouldBeEqualToString("weightTestSheet.cssRules[5].style.fontWeight", "normal");
+shouldBeEqualToString("weightTestSheet.cssRules[6].style.fontWeight", "500");
+shouldBeEqualToString("weightTestSheet.cssRules[7].style.fontWeight", "600");
+shouldBeEqualToString("weightTestSheet.cssRules[8].style.fontWeight", "700");
+shouldBeEqualToString("weightTestSheet.cssRules[9].style.fontWeight", "bold");
+shouldBeEqualToString("weightTestSheet.cssRules[10].style.fontWeight", "800");
+shouldBeEqualToString("weightTestSheet.cssRules[11].style.fontWeight", "900");
+shouldBeEqualToString("weightTestSheet.cssRules[12].style.fontWeight", "");
+shouldBeEqualToString("weightTestSheet.cssRules[13].style.fontWeight", "");
+shouldBeEqualToString("weightTestSheet.cssRules[14].style.fontWeight", "");
+shouldBeEqualToString("weightTestSheet.cssRules[15].style.fontWeight", "7");
+shouldBeEqualToString("weightTestSheet.cssRules[16].style.fontWeight", "300");
+shouldBeEqualToString("weightTestSheet.cssRules[17].style.fontWeight", "200");
+
+var stretchTestSheet = document.getElementById("stretchTest").sheet;
+shouldBeEqualToString("stretchTestSheet.cssRules[0].style.fontStretch", "1%");
+shouldBeEqualToString("stretchTestSheet.cssRules[1].style.fontStretch", "2");
+shouldBeEqualToString("stretchTestSheet.cssRules[2].style.fontStretch", "ultra-condensed");
+shouldBeEqualToString("stretchTestSheet.cssRules[3].style.fontStretch", "extra-condensed");
+shouldBeEqualToString("stretchTestSheet.cssRules[4].style.fontStretch", "condensed");
+shouldBeEqualToString("stretchTestSheet.cssRules[5].style.fontStretch", "semi-condensed");
+shouldBeEqualToString("stretchTestSheet.cssRules[6].style.fontStretch", "normal");
+shouldBeEqualToString("stretchTestSheet.cssRules[7].style.fontStretch", "semi-expanded");
+shouldBeEqualToString("stretchTestSheet.cssRules[8].style.fontStretch", "expanded");
+shouldBeEqualToString("stretchTestSheet.cssRules[9].style.fontStretch", "extra-expanded");
+shouldBeEqualToString("stretchTestSheet.cssRules[10].style.fontStretch", "ultra-expanded");
+shouldBeEqualToString("stretchTestSheet.cssRules[11].style.fontStretch", "");
+shouldBeEqualToString("stretchTestSheet.cssRules[12].style.fontStretch", "");
+shouldBeEqualToString("stretchTestSheet.cssRules[13].style.fontStretch", "7");
+
+var styleTestSheet = document.getElementById("styleTest").sheet;
+shouldBeEqualToString("styleTestSheet.cssRules[0].style.fontStyle", "1deg");
+shouldBeEqualToString("styleTestSheet.cssRules[1].style.fontStyle", "200grad");
+shouldBeEqualToString("styleTestSheet.cssRules[2].style.fontStyle", "6.28318rad");
+shouldBeEqualToString("styleTestSheet.cssRules[3].style.fontStyle", "4turn");
+shouldBeEqualToString("styleTestSheet.cssRules[4].style.fontStyle", "5");
+shouldBeEqualToString("styleTestSheet.cssRules[5].style.fontStyle", "20");
+shouldBeEqualToString("styleTestSheet.cssRules[6].style.fontStyle", "italic");
+shouldBeEqualToString("styleTestSheet.cssRules[7].style.fontStyle", "oblique");
+shouldBeEqualToString("styleTestSheet.cssRules[8].style.fontStyle", "normal");
+shouldBeEqualToString("styleTestSheet.cssRules[9].style.fontStyle", "");
+shouldBeEqualToString("styleTestSheet.cssRules[10].style.fontStyle", "");
+shouldBeEqualToString("styleTestSheet.cssRules[11].style.fontStyle", "7");
+shouldBeEqualToString("styleTestSheet.cssRules[12].style.fontStyle", "calc(1441deg)");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontselectionfontloadingapiparseexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse-expected.txt (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse-expected.txt 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+PASS setFontFaceWeight(fontFace, '1') is "1"
+PASS setFontFaceWeight(fontFace, '100') is "100"
+PASS setFontFaceWeight(fontFace, '200') is "200"
+PASS setFontFaceWeight(fontFace, '300') is "300"
+PASS setFontFaceWeight(fontFace, '400') is "normal"
+PASS setFontFaceWeight(fontFace, 'normal') is "normal"
+PASS setFontFaceWeight(fontFace, '500') is "500"
+PASS setFontFaceWeight(fontFace, '600') is "600"
+PASS setFontFaceWeight(fontFace, '700') is "bold"
+PASS setFontFaceWeight(fontFace, 'bold') is "bold"
+PASS setFontFaceWeight(fontFace, '800') is "800"
+PASS setFontFaceWeight(fontFace, '900') is "900"
+PASS setFontFaceWeight(fontFace, 'garbage') threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
+PASS setFontFaceWeight(fontFace, 'initial') threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
+PASS setFontFaceWeight(fontFace, 'calc(3 + 4)') is "7"
+PASS setFontFaceWeight(fontFace, 'calc(100 + 200)') is "300"
+PASS setFontFaceWeight(fontFace, 'calc(150 + 50)') is "200"
+PASS setFontFaceStretch(fontFace, '1%') is "1%"
+PASS setFontFaceStretch(fontFace, '2') is "2%"
+PASS setFontFaceStretch(fontFace, 'ultra-condensed') is "ultra-condensed"
+PASS setFontFaceStretch(fontFace, 'extra-condensed') is "extra-condensed"
+PASS setFontFaceStretch(fontFace, 'condensed') is "condensed"
+PASS setFontFaceStretch(fontFace, 'semi-condensed') is "semi-condensed"
+PASS setFontFaceStretch(fontFace, 'normal') is "normal"
+PASS setFontFaceStretch(fontFace, 'semi-expanded') is "semi-expanded"
+PASS setFontFaceStretch(fontFace, 'expanded') is "expanded"
+PASS setFontFaceStretch(fontFace, 'extra-expanded') is "extra-expanded"
+PASS setFontFaceStretch(fontFace, 'ultra-expanded') is "ultra-expanded"
+PASS setFontFaceStretch(fontFace, 'garbage') threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
+PASS setFontFaceStretch(fontFace, 'initial') threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
+PASS setFontFaceStretch(fontFace, 'calc(3 + 4)') is "7%"
+PASS setFontFaceStyle(fontFace, 'oblique 1deg') is "oblique 1deg"
+PASS setFontFaceStyle(fontFace, 'oblique 200grad') is "oblique 180deg"
+PASS setFontFaceStyle(fontFace, 'oblique 6.28318rad') is "oblique 359.750000deg"
+PASS setFontFaceStyle(fontFace, 'oblique 4turn') is "oblique 1440deg"
+PASS setFontFaceStyle(fontFace, 'oblique 5') is "oblique 5deg"
+PASS setFontFaceStyle(fontFace, 'oblique 20') is "italic"
+PASS setFontFaceStyle(fontFace, 'italic') is "italic"
+PASS setFontFaceStyle(fontFace, 'oblique') is "italic"
+PASS setFontFaceStyle(fontFace, 'normal') is "normal"
+PASS setFontFaceStyle(fontFace, 'garbage') threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
+PASS setFontFaceStyle(fontFace, 'initial') threw exception SyntaxError (DOM Exception 12): The string did not match the expected pattern..
+PASS setFontFaceStyle(fontFace, 'oblique calc(3 + 4)') is "oblique 7deg"
+PASS setFontFaceStyle(fontFace, 'oblique calc(4turn + 1deg)') is "oblique 1441deg"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextfontselectionfontloadingapiparsehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse.html (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-selection-font-loading-api-parse.html 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+function setFontFaceWeight(fontFace, weight) {
+ fontFace.weight = weight;
+ return fontFace.weight;
+}
+
+function setFontFaceStretch(fontFace, stretch) {
+ fontFace.stretch = stretch;
+ return fontFace.stretch;
+}
+
+function setFontFaceStyle(fontFace, style) {
+ fontFace.style = style;
+ return fontFace.style;
+}
+
+var fontFace = new FontFace("asdf", "url('notreal')");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '1')", "1");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '100')", "100");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '200')", "200");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '300')", "300");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '400')", "normal");
+shouldBeEqualToString("setFontFaceWeight(fontFace, 'normal')", "normal");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '500')", "500");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '600')", "600");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '700')", "bold");
+shouldBeEqualToString("setFontFaceWeight(fontFace, 'bold')", "bold");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '800')", "800");
+shouldBeEqualToString("setFontFaceWeight(fontFace, '900')", "900");
+shouldThrow("setFontFaceWeight(fontFace, 'garbage')");
+shouldThrow("setFontFaceWeight(fontFace, 'initial')");
+shouldBeEqualToString("setFontFaceWeight(fontFace, 'calc(3 + 4)')", "7");
+shouldBeEqualToString("setFontFaceWeight(fontFace, 'calc(100 + 200)')", "300");
+shouldBeEqualToString("setFontFaceWeight(fontFace, 'calc(150 + 50)')", "200");
+
+shouldBeEqualToString("setFontFaceStretch(fontFace, '1%')", "1%");
+shouldBeEqualToString("setFontFaceStretch(fontFace, '2')", "2%");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'ultra-condensed')", "ultra-condensed");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'extra-condensed')", "extra-condensed");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'condensed')", "condensed");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'semi-condensed')", "semi-condensed");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'normal')", "normal");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'semi-expanded')", "semi-expanded");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'expanded')", "expanded");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'extra-expanded')", "extra-expanded");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'ultra-expanded')", "ultra-expanded");
+shouldThrow("setFontFaceStretch(fontFace, 'garbage')");
+shouldThrow("setFontFaceStretch(fontFace, 'initial')");
+shouldBeEqualToString("setFontFaceStretch(fontFace, 'calc(3 + 4)')", "7%");
+
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique 1deg')", "oblique 1deg");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique 200grad')", "oblique 180deg");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique 6.28318rad')", "oblique 359.750000deg");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique 4turn')", "oblique 1440deg");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique 5')", "oblique 5deg");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique 20')", "italic");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'italic')", "italic");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique')", "italic");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'normal')", "normal");
+shouldThrow("setFontFaceStyle(fontFace, 'garbage')");
+shouldThrow("setFontFaceStyle(fontFace, 'initial')");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique calc(3 + 4)')", "oblique 7deg");
+shouldBeEqualToString("setFontFaceStyle(fontFace, 'oblique calc(4turn + 1deg)')", "oblique 1441deg");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontstretchparseexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/font-stretch-parse-expected.txt (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-stretch-parse-expected.txt 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/LayoutTests/fast/text/font-stretch-parse-expected.txt 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -19,8 +19,8 @@
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test19')).fontStretch is "normal"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test20')).fontStretch is "extra-expanded"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test1')).font is "normal normal normal normal 16px/18px Times"
</span><del>-PASS window.getComputedStyle(document.getElementById('test2')).font is "normal normal normal 1% 16px/18px Times"
-PASS window.getComputedStyle(document.getElementById('test3')).font is "normal normal normal 2% 16px/18px Times"
</del><ins>+PASS window.getComputedStyle(document.getElementById('test2')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test3')).font is "16px/18px Times"
</ins><span class="cx"> PASS window.getComputedStyle(document.getElementById('test4')).font is "normal normal normal ultra-condensed 16px/18px Times"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test5')).font is "normal normal normal extra-condensed 16px/18px Times"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test6')).font is "normal normal normal condensed 16px/18px Times"
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test12')).font is "normal normal normal ultra-expanded 16px/18px Times"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test13')).font is "normal normal normal normal 16px/18px Times"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test14')).font is "normal normal normal normal 16px/18px Times"
</span><del>-PASS window.getComputedStyle(document.getElementById('test15')).font is "normal normal normal 7% 16px/18px Times"
</del><ins>+PASS window.getComputedStyle(document.getElementById('test15')).font is "16px/18px Times"
</ins><span class="cx"> PASS window.getComputedStyle(document.getElementById('test16')).font is "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test17')).font is "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'"
</span><span class="cx"> PASS window.getComputedStyle(document.getElementById('test18')).font is "normal normal 100 normal 48px/49px 'Helvetica Neue'"
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontstretchparsehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/text/font-stretch-parse.html (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-stretch-parse.html 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/LayoutTests/fast/text/font-stretch-parse.html 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -49,8 +49,8 @@
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test20')).fontStretch", "extra-expanded");
</span><span class="cx">
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).font", "normal normal normal normal 16px/18px Times");
</span><del>-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).font", "normal normal normal 1% 16px/18px Times");
-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).font", "normal normal normal 2% 16px/18px Times");
</del><ins>+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).font", "16px/18px Times");
</ins><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).font", "normal normal normal ultra-condensed 16px/18px Times");
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test5')).font", "normal normal normal extra-condensed 16px/18px Times");
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test6')).font", "normal normal normal condensed 16px/18px Times");
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test12')).font", "normal normal normal ultra-expanded 16px/18px Times");
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test13')).font", "normal normal normal normal 16px/18px Times");
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test14')).font", "normal normal normal normal 16px/18px Times");
</span><del>-shouldBeEqualToString("window.getComputedStyle(document.getElementById('test15')).font", "normal normal normal 7% 16px/18px Times");
</del><ins>+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test15')).font", "16px/18px Times");
</ins><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test16')).font", "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'");
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test17')).font", "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'");
</span><span class="cx"> shouldBeEqualToString("window.getComputedStyle(document.getElementById('test18')).font", "normal normal 100 normal 48px/49px 'Helvetica Neue'");
</span></span></pre></div>
<a id="trunkLayoutTestsfasttextfontstyleparseexpectedtxtfromrev213463trunkLayoutTestsfasttextfontstretchparseexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/text/font-style-parse-expected.txt (from rev 213463, trunk/LayoutTests/fast/text/font-stretch-parse-expected.txt) (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-style-parse-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-style-parse-expected.txt 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+PASS window.getComputedStyle(document.getElementById('test1')).fontStyle is "normal"
+PASS window.getComputedStyle(document.getElementById('test2')).fontStyle is "1deg"
+PASS window.getComputedStyle(document.getElementById('test3')).fontStyle is "180deg"
+PASS window.getComputedStyle(document.getElementById('test4')).fontStyle is "359.75deg"
+PASS window.getComputedStyle(document.getElementById('test5')).fontStyle is "1440deg"
+PASS window.getComputedStyle(document.getElementById('test6')).fontStyle is "5deg"
+PASS window.getComputedStyle(document.getElementById('test7')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test8')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test9')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test10')).fontStyle is "normal"
+PASS window.getComputedStyle(document.getElementById('test11')).fontStyle is "normal"
+PASS window.getComputedStyle(document.getElementById('test12')).fontStyle is "normal"
+PASS window.getComputedStyle(document.getElementById('test13')).fontStyle is "7deg"
+PASS window.getComputedStyle(document.getElementById('test14')).fontStyle is "1441deg"
+PASS window.getComputedStyle(document.getElementById('test15')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test16')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test17')).fontStyle is "normal"
+PASS window.getComputedStyle(document.getElementById('test18')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test19')).fontStyle is "italic"
+PASS window.getComputedStyle(document.getElementById('test20')).fontStyle is "normal"
+PASS window.getComputedStyle(document.getElementById('test1')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test2')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test3')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test4')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test5')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test6')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test7')).font is "italic normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test8')).font is "italic normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test9')).font is "italic normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test10')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test11')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test12')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test13')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test14')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test15')).font is "italic normal 100 normal 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test16')).font is "italic normal 100 normal 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test17')).font is "normal normal 100 normal 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test18')).font is "italic normal normal normal 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test19')).font is "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test20')).font is "normal normal normal normal 16px/18px Times"
+PASS document.getElementById('test1').style.font is ""
+PASS document.getElementById('test15').style.font is "italic 100 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test16').style.font is "italic 100 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test17').style.font is "100 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test18').style.font is "italic 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test19').style.font is "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test20').style.font is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextfontstyleparsehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-style-parse.html (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-style-parse.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-style-parse.html 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,82 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<div style="font: 16px/18px 'Times';">
+<div id="test1"></div>
+<div id="test2" style="font-style: oblique 1deg;"></div>
+<div id="test3" style="font-style: oblique 200grad;"></div>
+<div id="test4" style="font-style: oblique 6.28318rad;"></div>
+<div id="test5" style="font-style: oblique 4turn;"></div>
+<div id="test6" style="font-style: oblique 5;"></div>
+<div id="test7" style="font-style: oblique 20;"></div>
+<div id="test8" style="font-style: italic;"></div>
+<div id="test9" style="font-style: oblique;"></div>
+<div id="test10" style="font-style: normal;"></div>
+<div id="test11" style="font-style: garbage;"></div>
+<div id="test12" style="font-style: initial;"></div>
+<div id="test13" style="font-style: oblique calc(3 + 4);"></div>
+<div id="test14" style="font-style: oblique calc(4turn + 1deg);"></div>
+<div id="test15" style="font: 100 italic 48px/49px 'Helvetica Neue';"></div>
+<div id="test16" style="font: italic 100 48px/49px 'Helvetica Neue';"></div>
+<div id="test17" style="font: 100 48px/49px 'Helvetica Neue';"></div>
+<div style="font-stretch: normal;"><div id="test18" style="font: italic 48px/49px 'Helvetica Neue';"></div></div>
+<div id="test19" style="font: italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue';"></div>
+<div id="test20" style="font: 13deg small-caps 123 extra-expanded 48px/49px 'Helvetica Neue';"></div>
+</div>
+<script>
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).fontStyle", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).fontStyle", "1deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).fontStyle", "180deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).fontStyle", "359.75deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test5')).fontStyle", "1440deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test6')).fontStyle", "5deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test7')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test8')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test9')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test10')).fontStyle", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test11')).fontStyle", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test12')).fontStyle", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test13')).fontStyle", "7deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test14')).fontStyle", "1441deg");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test15')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test16')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test17')).fontStyle", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test18')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test19')).fontStyle", "italic");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test20')).fontStyle", "normal");
+
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test5')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test6')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test7')).font", "italic normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test8')).font", "italic normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test9')).font", "italic normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test10')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test11')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test12')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test13')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test14')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test15')).font", "italic normal 100 normal 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test16')).font", "italic normal 100 normal 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test17')).font", "normal normal 100 normal 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test18')).font", "italic normal normal normal 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test19')).font", "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test20')).font", "normal normal normal normal 16px/18px Times");
+
+shouldBeEqualToString("document.getElementById('test1').style.font", "");
+shouldBeEqualToString("document.getElementById('test15').style.font", "italic 100 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test16').style.font", "italic 100 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test17').style.font", "100 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test18').style.font", "italic 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test19').style.font", "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test20').style.font", "");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextfontweightparseexpectedtxtfromrev213463trunkLayoutTestsfasttextfontstretchparseexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/fast/text/font-weight-parse-expected.txt (from rev 213463, trunk/LayoutTests/fast/text/font-stretch-parse-expected.txt) (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-weight-parse-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/text/font-weight-parse-expected.txt 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+PASS window.getComputedStyle(document.getElementById('test1')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test2')).fontWeight is "1"
+PASS window.getComputedStyle(document.getElementById('test3')).fontWeight is "100"
+PASS window.getComputedStyle(document.getElementById('test4')).fontWeight is "200"
+PASS window.getComputedStyle(document.getElementById('test5')).fontWeight is "300"
+PASS window.getComputedStyle(document.getElementById('test6')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test7')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test8')).fontWeight is "500"
+PASS window.getComputedStyle(document.getElementById('test9')).fontWeight is "600"
+PASS window.getComputedStyle(document.getElementById('test10')).fontWeight is "bold"
+PASS window.getComputedStyle(document.getElementById('test11')).fontWeight is "bold"
+PASS window.getComputedStyle(document.getElementById('test12')).fontWeight is "800"
+PASS window.getComputedStyle(document.getElementById('test13')).fontWeight is "900"
+PASS window.getComputedStyle(document.getElementById('test14')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test15')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test16')).fontWeight is "7"
+PASS window.getComputedStyle(document.getElementById('test17')).fontWeight is "300"
+PASS window.getComputedStyle(document.getElementById('test18')).fontWeight is "200"
+PASS window.getComputedStyle(document.getElementById('test19')).fontWeight is "100"
+PASS window.getComputedStyle(document.getElementById('test20')).fontWeight is "100"
+PASS window.getComputedStyle(document.getElementById('test21')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test22')).fontWeight is "100"
+PASS window.getComputedStyle(document.getElementById('test23')).fontWeight is "100"
+PASS window.getComputedStyle(document.getElementById('test24')).fontWeight is "normal"
+PASS window.getComputedStyle(document.getElementById('test1')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test2')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test3')).font is "normal normal 100 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test4')).font is "normal normal 200 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test5')).font is "normal normal 300 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test6')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test7')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test8')).font is "normal normal 500 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test9')).font is "normal normal 600 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test10')).font is "normal normal bold normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test11')).font is "normal normal bold normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test12')).font is "normal normal 800 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test13')).font is "normal normal 900 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test14')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test15')).font is "normal normal normal normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test16')).font is "16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test17')).font is "normal normal 300 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test18')).font is "normal normal 200 normal 16px/18px Times"
+PASS window.getComputedStyle(document.getElementById('test19')).font is "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test20')).font is "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test21')).font is "normal normal normal extra-condensed 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test22')).font is "normal normal 100 normal 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test23')).font is "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'"
+PASS window.getComputedStyle(document.getElementById('test24')).font is "italic small-caps normal extra-expanded 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test1').style.font is ""
+PASS document.getElementById('test19').style.font is "100 extra-condensed 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test20').style.font is "100 extra-condensed 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test21').style.font is "extra-condensed 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test22').style.font is "100 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test23').style.font is "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'"
+PASS document.getElementById('test24').style.font is "italic small-caps extra-expanded 48px/49px 'Helvetica Neue'"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfasttextfontweightparsehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/text/font-weight-parse.html (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/text/font-weight-parse.html (rev 0)
+++ trunk/LayoutTests/fast/text/font-weight-parse.html 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,94 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<div style="font: 16px/18px 'Times';">
+<div id="test1"></div>
+<div id="test2" style="font-weight: 1;"></div>
+<div id="test3" style="font-weight: 100;"></div>
+<div id="test4" style="font-weight: 200;"></div>
+<div id="test5" style="font-weight: 300;"></div>
+<div id="test6" style="font-weight: 400;"></div>
+<div id="test7" style="font-weight: normal;"></div>
+<div id="test8" style="font-weight: 500;"></div>
+<div id="test9" style="font-weight: 600;"></div>
+<div id="test10" style="font-weight: 700;"></div>
+<div id="test11" style="font-weight: bold;"></div>
+<div id="test12" style="font-weight: 800;"></div>
+<div id="test13" style="font-weight: 900;"></div>
+<div id="test14" style="font-weight: garbage;"></div>
+<div id="test15" style="font-weight: initial;"></div>
+<div id="test16" style="font-weight: calc(3 + 4);"></div>
+<div id="test17" style="font-weight: calc(100 + 200);"></div>
+<div id="test18" style="font-weight: calc(50 + 150);"></div>
+<div id="test19" style="font: 100 extra-condensed 48px/49px 'Helvetica Neue';"></div>
+<div id="test20" style="font: extra-condensed 100 48px/49px 'Helvetica Neue';"></div>
+<div id="test21" style="font: extra-condensed 48px/49px 'Helvetica Neue';"></div>
+<div style="font-weight: 275;"><div id="test22" style="font: 100 48px/49px 'Helvetica Neue';"></div></div>
+<div id="test23" style="font: italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue';"></div>
+<div id="test24" style="font: italic small-caps 123 extra-expanded 48px/49px 'Helvetica Neue';"></div>
+</div>
+<script>
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).fontWeight", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).fontWeight", "1");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).fontWeight", "100");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).fontWeight", "200");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test5')).fontWeight", "300");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test6')).fontWeight", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test7')).fontWeight", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test8')).fontWeight", "500");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test9')).fontWeight", "600");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test10')).fontWeight", "bold");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test11')).fontWeight", "bold");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test12')).fontWeight", "800");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test13')).fontWeight", "900");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test14')).fontWeight", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test15')).fontWeight", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test16')).fontWeight", "7");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test17')).fontWeight", "300");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test18')).fontWeight", "200");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test19')).fontWeight", "100");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test20')).fontWeight", "100");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test21')).fontWeight", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test22')).fontWeight", "100");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test23')).fontWeight", "100");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test24')).fontWeight", "normal");
+
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test1')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test2')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test3')).font", "normal normal 100 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test4')).font", "normal normal 200 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test5')).font", "normal normal 300 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test6')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test7')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test8')).font", "normal normal 500 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test9')).font", "normal normal 600 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test10')).font", "normal normal bold normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test11')).font", "normal normal bold normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test12')).font", "normal normal 800 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test13')).font", "normal normal 900 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test14')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test15')).font", "normal normal normal normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test16')).font", "16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test17')).font", "normal normal 300 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test18')).font", "normal normal 200 normal 16px/18px Times");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test19')).font", "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test20')).font", "normal normal 100 extra-condensed 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test21')).font", "normal normal normal extra-condensed 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test22')).font", "normal normal 100 normal 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test23')).font", "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('test24')).font", "italic small-caps normal extra-expanded 48px/49px 'Helvetica Neue'");
+
+shouldBeEqualToString("document.getElementById('test1').style.font", "");
+shouldBeEqualToString("document.getElementById('test19').style.font", "100 extra-condensed 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test20').style.font", "100 extra-condensed 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test21').style.font", "extra-condensed 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test22').style.font", "100 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test23').style.font", "italic small-caps 100 extra-expanded 48px/49px 'Helvetica Neue'");
+shouldBeEqualToString("document.getElementById('test24').style.font", "italic small-caps extra-expanded 48px/49px 'Helvetica Neue'");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/ChangeLog 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1,3 +1,208 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Expand font-weight and font-stretch to take any number
+ https://bugs.webkit.org/show_bug.cgi?id=168889
+
+ Reviewed by Simon Fraser.
+
+ This patch expands parsing support for font-weight and font-stretch so that they can accept
+ numbers in addition to the keyword values they accepted previously. Eventually, these numbers
+ will be used as inputs to select variation fonts; however, in this patch, the values are just
+ parsed and held in our internal data model. This means that this patch doesn't actually change
+ the general behavior of WebKit; instead, it parses new values, outputs them (via
+ getComputedStyle() and similar functions), and provides them as input to our preexisting font
+ selection algorithm.
+
+ This patch doesn't actually modify anything algorithmically, and therefore, it doesn't include
+ any additional tests for the font selection algorithm. Instead, it tests the parsing of the
+ newly accepted values (both input and output).
+
+ Because our internal data model needs to hold numbers now, this patch also completely eliminates
+ the FontWidth, FontItalic, and FontTraitsMask enum values in favor of FontSelectionValues (which
+ can hold numbers instead of individual enum values). Therefore, every place which we were using
+ these enum values is migrated in this patch to using FontSelectionValues instead.
+
+ Tests: fast/text/font-selection-font-face-parse.html
+ fast/text/font-selection-font-loading-api-parse.html
+ fast/text/font-style-parse.html
+ fast/text/font-weight-parse.html
+
+ * accessibility/AccessibilityRenderObject.cpp: Migrate off of old enum types.
+ (WebCore::AccessibilityRenderObject::hasBoldFont):
+ (WebCore::AccessibilityRenderObject::hasItalicFont):
+ (WebCore::AccessibilityRenderObject::hasPlainText):
+ * accessibility/atk/WebKitAccessibleInterfaceText.cpp: Ditto.
+ (getAttributeSetForAccessibilityObject):
+ * css/CSSComputedStyleDeclaration.cpp: Output newly parsed values.
+ (WebCore::fontWeightFromStyle):
+ (WebCore::fontStretchFromStyle):
+ (WebCore::fontStyleFromStyle):
+ (WebCore::fontShorthandValueForSelectionProperties):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSFontFace.cpp: Migrate off old enum types.
+ (WebCore::calculateWeightRange):
+ (WebCore::CSSFontFace::setWeight):
+ (WebCore::calculateStretchRange):
+ (WebCore::CSSFontFace::setStretch):
+ (WebCore::calculateStyleRange):
+ (WebCore::CSSFontFace::setStyle):
+ (WebCore::CSSFontFace::calculateStyleMask): Deleted.
+ (WebCore::CSSFontFace::calculateWeightMask): Deleted.
+ (WebCore::CSSFontFace::calculateStretch): Deleted.
+ * css/CSSFontFace.h:
+ * css/CSSFontFaceSet.cpp: Migrate off old enum types.
+ (WebCore::CSSFontFaceSet::ensureLocalFontFacesForFamilyRegistered):
+ (WebCore::calculateWeightValue):
+ (WebCore::calculateStretchValue):
+ (WebCore::calculateStyleValue):
+ (WebCore::computeFontSelectionRequest):
+ (WebCore::CSSFontFaceSet::matchingFaces):
+ (WebCore::CSSFontFaceSet::fontFace):
+ (WebCore::computeFontTraitsMask): Deleted.
+ (WebCore::computeFontStretch): Deleted.
+ * css/CSSFontFaceSet.h:
+ * css/CSSFontSelector.cpp: Migrate off old enum types.
+ (WebCore::CSSFontSelector::fontRangesForFamily):
+ * css/CSSPrimitiveValueMappings.h: font-weight and font-style are no longer
+ keyword properties.
+ (WebCore::CSSPrimitiveValue::operator FontWeight): Deleted.
+ (WebCore::CSSPrimitiveValue::operator FontItalic): Deleted.
+ * css/CSSProperties.json: Use the same infrastructure for all three of the
+ font selection properties.
+ * css/CSSSegmentedFontFace.cpp: Migrate off old enum types.
+ (WebCore::CSSSegmentedFontFace::fontRanges):
+ * css/CSSValueKeywords.in: The 100-based font-weight values are now represented
+ as real numbers.
+ * css/FontFace.cpp: Update the string output functions for the new values.
+ (WebCore::rangeIsSingleValue):
+ (WebCore::FontFace::style):
+ (WebCore::FontFace::weight):
+ (WebCore::FontFace::stretch):
+ * css/StyleBuilderConverter.h: Use CSSValue conversion functions to convert
+ to our new data model.
+ (WebCore::StyleBuilderConverter::convertFontWeight):
+ (WebCore::StyleBuilderConverter::convertFontStretch):
+ (WebCore::StyleBuilderConverter::convertFontStyle):
+ * css/StyleBuilderCustom.h: font-weight is no longer a completely custom
+ property.
+ (WebCore::StyleBuilderCustom::applyInitialFontWeight): Deleted.
+ (WebCore::StyleBuilderCustom::applyInheritFontWeight): Deleted.
+ (WebCore::StyleBuilderCustom::applyValueFontWeight): Deleted.
+ * css/parser/CSSParserFastPaths.cpp: font-style is no longer a keyword property.
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ (WebCore::CSSParserFastPaths::isKeywordPropertyID):
+ * css/parser/CSSPropertyParser.cpp: Parse the new values in the font selection
+ properties.
+ (WebCore::consumeFontWeightKeywordValue):
+ (WebCore::consumeFontWeightCSS21):
+ (WebCore::consumeFontWeight):
+ (WebCore::consumeFontStyleKeywordValue):
+ (WebCore::consumeFontStyle):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+ (WebCore::CSSPropertyParser::parseFontFaceDescriptor):
+ (WebCore::CSSPropertyParser::consumeSystemFont):
+ (WebCore::CSSPropertyParser::consumeFont):
+ * editing/EditingStyle.cpp: Migrate off old enum types.
+ (WebCore::fontWeightIsBold):
+ * editing/mac/EditorMac.mm: Ditto.
+ (WebCore::Editor::applyFontStyles):
+ * platform/graphics/FontCache.h: Unify our font selection values into
+ their enclosing struct, FontSelectionCapabilities. Also, clean up utility
+ functions.
+ * platform/graphics/FontCascade.cpp: Migrate off old enum types.
+ (WebCore::FontCascade::FontCascade):
+ * platform/graphics/FontCascade.h: Ditto.
+ (WebCore::FontCascade::italic):
+ (WebCore::FontCascade::weight):
+ * platform/graphics/FontDescription.cpp: Ditto.
+ (WebCore::FontDescription::FontDescription):
+ (WebCore::FontCascadeDescription::lighterWeight):
+ (WebCore::FontCascadeDescription::bolderWeight):
+ (WebCore::FontDescription::traitsMask): Deleted.
+ * platform/graphics/FontDescription.h: Migrate off old enum types.
+ (WebCore::FontDescription::italic):
+ (WebCore::FontDescription::stretch):
+ (WebCore::FontDescription::weight):
+ (WebCore::FontDescription::fontSelectionRequest):
+ (WebCore::FontDescription::computedPixelSize):
+ (WebCore::FontDescription::setItalic):
+ (WebCore::FontDescription::setStretch):
+ (WebCore::FontDescription::setIsItalic):
+ (WebCore::FontDescription::setWeight):
+ (WebCore::FontDescription::operator==):
+ (WebCore::FontCascadeDescription::lighterWeight):
+ (WebCore::FontCascadeDescription::bolderWeight):
+ (WebCore::FontCascadeDescription::initialItalic):
+ (WebCore::FontCascadeDescription::initialWeight):
+ (WebCore::FontCascadeDescription::initialStretch):
+ * platform/graphics/FontSelectionAlgorithm.cpp: Delete code which was only
+ present to convert from the old enum types to the new FontSelectionRequest
+ type.
+ (WebCore::fontSelectionRequestForTraitsMask): Deleted.
+ (WebCore::initialFontSelectionCapabilitiesForTraitsMask): Deleted.
+ (WebCore::fontSelectionCapabilitiesForTraitsMask): Deleted.
+ * platform/graphics/FontSelectionAlgorithm.h: Migrate to new named functions
+ for special values.
+ (WebCore::isItalic):
+ (WebCore::boldWeightValue):
+ (WebCore::normalWeightValue):
+ (WebCore::isFontWeightBold):
+ (WebCore::normalStretchValue):
+ (WebCore::FontSelectionRequest::FontSelectionRequest):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp: Migrate all platforms which
+ compile this file to know about FontDatabase. This simplifies the interaction
+ between @font-face fonts and installed fonts. Also, migrate off old enum types.
+ (WebCore::stretchFromCoreTextTraits):
+ (WebCore::fontWeightFromCoreText):
+ (WebCore::capabilitiesForFontDescriptor):
+ (WebCore::FontCache::getFontSelectionCapabilitiesInFamily):
+ (WebCore::platformFontLookupWithFamily):
+ (WebCore::invalidateFontCache):
+ (WebCore::fontWithFamily):
+ (WebCore::FontCache::createFontPlatformData):
+ (WebCore::lookupFallbackFont):
+ (WebCore::toTraitsMask): Deleted.
+ (WebCore::isFontWeightBold): Deleted.
+ (WebCore::toCoreTextFontWeight): Deleted.
+ (): Deleted.
+ (WebCore::FontDatabase::capabilitiesForFontDescriptor): Deleted.
+ (WebCore::calculateFontSelectionRequest): Deleted.
+ * platform/graphics/freetype/FontCacheFreeType.cpp: Migrate off old enum types.
+ (WebCore::FontCache::getFontSelectionCapabilitiesInFamily):
+ (WebCore::fontWeightToFontconfigWeight):
+ (): Deleted.
+ * platform/graphics/freetype/FontPlatformDataFreeType.cpp: Ditto.
+ (WebCore::FontPlatformData::FontPlatformData):
+ * platform/graphics/ios/FontCacheIOS.mm: Ditto.
+ (WebCore::baseSystemFontDescriptor):
+ (WebCore::systemFontModificationAttributes):
+ (WebCore::systemFontDescriptor):
+ (WebCore::platformFontWithFamilySpecialCase):
+ (WebCore::FontCache::weightOfCTFont): Deleted.
+ * platform/graphics/mac/FontCacheMac.mm: Ditto.
+ (WebCore::toNSFontWeight):
+ (WebCore::platformFontWithFamilySpecialCase):
+ * platform/graphics/win/FontCacheWin.cpp: Ditto.
+ (WebCore::toGDIFontWeight):
+ (WebCore::traitsInFamilyEnumProc):
+ (WebCore::FontCache::getFontSelectionCapabilitiesInFamily):
+ (): Deleted.
+ * platform/mock/MockRealtimeVideoSource.cpp: Ditto.
+ (WebCore::MockRealtimeVideoSource::applySize):
+ * platform/text/TextFlags.h: Delete old enum types.
+ * platform/win/DragImageWin.cpp: Migrate off old enum types.
+ (WebCore::dragLabelFont):
+ * rendering/RenderEmbeddedObject.cpp: Ditto.
+ (WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
+ * rendering/RenderThemeGtk.cpp: Ditto.
+ (WebCore::RenderThemeGtk::updateCachedSystemFontDescription):
+ * rendering/RenderThemeIOS.mm: Ditto.
+ (WebCore::RenderThemeIOS::updateCachedSystemFontDescription):
+ * rendering/RenderThemeMac.mm: Ditto.
+ (WebCore::toFontWeight):
+ * rendering/RenderThemeWin.cpp: Ditto.
+ (WebCore::fillFontDescription):
+
</ins><span class="cx"> 2017-03-06 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Disable autoplay of silent videos in low power mode
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -13873,6 +13873,8 @@
</span><span class="cx"> C28083411C6DC96A001451B6 /* JSFontFaceCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSFontFaceCustom.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C2AB0AF41E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontSelectionAlgorithm.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C2AB0AF51E6B3C6C001348C5 /* FontSelectionAlgorithm.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontSelectionAlgorithm.h; sourceTree = "<group>"; };
</span><ins>+ C2AB0B021E6DE32B001348C5 /* FontSelectionKeywordValues.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontSelectionKeywordValues.h; sourceTree = "<group>"; };
+ C2AB0B031E6DE92C001348C5 /* FontSelectionValueInlines.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FontSelectionValueInlines.h; sourceTree = "<group>"; };
</ins><span class="cx"> C2F4E7881E45AEDF006D7105 /* ComplexTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexTextController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C2F4E7891E45AEDF006D7105 /* ComplexTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComplexTextController.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">@@ -22371,6 +22373,7 @@
</span><span class="cx"> 379919951200DDF400EA041C /* WOFFFileFormat.h */,
</span><span class="cx"> C2AB0AF41E6B3C6C001348C5 /* FontSelectionAlgorithm.cpp */,
</span><span class="cx"> C2AB0AF51E6B3C6C001348C5 /* FontSelectionAlgorithm.h */,
</span><ins>+ C2AB0B021E6DE32B001348C5 /* FontSelectionKeywordValues.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = graphics;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -24217,6 +24220,7 @@
</span><span class="cx"> 3FFFF9A7159D9A550020BBD5 /* WebKitCSSViewportRule.h */,
</span><span class="cx"> 3F2B33E3165ABD3500E3987C /* WebKitCSSViewportRule.idl */,
</span><span class="cx"> 31055BB81E4FE18900EB604E /* WebKitFontFamilyNames.in */,
</span><ins>+ C2AB0B031E6DE92C001348C5 /* FontSelectionValueInlines.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = css;
</span><span class="cx"> sourceTree = "<group>";
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -3500,7 +3500,7 @@
</span><span class="cx"> if (!m_renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return m_renderer->style().fontDescription().weight() >= FontWeightBold;
</del><ins>+ return isFontWeightBold(m_renderer->style().fontDescription().weight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityRenderObject::hasItalicFont() const
</span><span class="lines">@@ -3508,7 +3508,7 @@
</span><span class="cx"> if (!m_renderer)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return m_renderer->style().fontDescription().italic() == FontItalicOn;
</del><ins>+ return isItalic(m_renderer->style().fontDescription().italic());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool AccessibilityRenderObject::hasPlainText() const
</span><span class="lines">@@ -3518,8 +3518,8 @@
</span><span class="cx">
</span><span class="cx"> const RenderStyle& style = m_renderer->style();
</span><span class="cx">
</span><del>- return style.fontDescription().weight() == FontWeightNormal
- && style.fontDescription().italic() == FontItalicOff
</del><ins>+ return style.fontDescription().weight() == normalWeightValue()
+ && style.fontDescription().italic() == normalItalicValue()
</ins><span class="cx"> && style.textDecorationsInEffect() == TextDecorationNone;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceText.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -136,35 +136,7 @@
</span><span class="cx">
</span><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_FAMILY_NAME), fontFamilyName.utf8().data());
</span><span class="cx">
</span><del>- int fontWeight = -1;
- switch (style->fontCascade().weight()) {
- case FontWeight100:
- fontWeight = 100;
- break;
- case FontWeight200:
- fontWeight = 200;
- break;
- case FontWeight300:
- fontWeight = 300;
- break;
- case FontWeight400:
- fontWeight = 400;
- break;
- case FontWeight500:
- fontWeight = 500;
- break;
- case FontWeight600:
- fontWeight = 600;
- break;
- case FontWeight700:
- fontWeight = 700;
- break;
- case FontWeight800:
- fontWeight = 800;
- break;
- case FontWeight900:
- fontWeight = 900;
- }
</del><ins>+ int fontWeight = static_cast<float>(style->fontCascade().weight());
</ins><span class="cx"> if (fontWeight > 0) {
</span><span class="cx"> buffer.reset(g_strdup_printf("%i", fontWeight));
</span><span class="cx"> result = addToAtkAttributeSet(result, atk_text_attribute_get_name(ATK_TEXT_ATTR_WEIGHT), buffer.get());
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx"> #include "DeprecatedCSSOMValue.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><ins>+#include "FontSelectionValueInlines.h"
</ins><span class="cx"> #include "FontTaggedSettings.h"
</span><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="lines">@@ -1912,37 +1913,30 @@
</span><span class="cx"> return zoomAdjustedPixelValue(style.fontDescription().computedSize(), style);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> fontStyleFromStyle(const RenderStyle& style)
</del><ins>+static Ref<CSSPrimitiveValue> fontWeightFromStyle(const RenderStyle& style)
</ins><span class="cx"> {
</span><del>- if (style.fontDescription().italic())
- return CSSValuePool::singleton().createIdentifierValue(CSSValueItalic);
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
</del><ins>+ auto weight = style.fontDescription().weight();
+ if (auto value = fontWeightKeyword(weight))
+ return CSSValuePool::singleton().createIdentifierValue(value.value());
+ return CSSValuePool::singleton().createValue(static_cast<float>(weight), CSSPrimitiveValue::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> fontStretchFromStyle(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> auto stretch = style.fontDescription().stretch();
</span><del>- if (stretch == FontSelectionValue(50))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueUltraCondensed);
- if (stretch == FontSelectionValue(62.5f))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueExtraCondensed);
- if (stretch == FontSelectionValue(75))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueCondensed);
- if (stretch == FontSelectionValue(87.5f))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueSemiCondensed);
- if (stretch == FontSelectionValue(100))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
- if (stretch == FontSelectionValue(112.5f))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueSemiExpanded);
- if (stretch == FontSelectionValue(125))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueExpanded);
- if (stretch == FontSelectionValue(150))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueExtraExpanded);
- if (stretch == FontSelectionValue(200))
- return CSSValuePool::singleton().createIdentifierValue(CSSValueUltraExpanded);
</del><ins>+ if (auto keyword = fontStretchKeyword(stretch))
+ return CSSValuePool::singleton().createIdentifierValue(keyword.value());
</ins><span class="cx"> return CSSValuePool::singleton().createValue(static_cast<float>(stretch), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Ref<CSSPrimitiveValue> fontStyleFromStyle(const RenderStyle& style)
+{
+ auto italic = style.fontDescription().italic();
+ if (auto italicValue = fontStyleKeyword(italic))
+ return CSSValuePool::singleton().createIdentifierValue(italicValue.value());
+ return CSSValuePool::singleton().createValue(static_cast<float>(italic), CSSPrimitiveValue::CSS_DEG);
+}
+
</ins><span class="cx"> static Ref<CSSValue> fontVariantFromStyle(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> if (style.fontDescription().variantSettings().isAllNormal())
</span><span class="lines">@@ -2130,32 +2124,6 @@
</span><span class="cx"> return WTFMove(list);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> fontWeightFromStyle(const RenderStyle& style)
-{
- switch (style.fontDescription().weight()) {
- case FontWeight100:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue100);
- case FontWeight200:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue200);
- case FontWeight300:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue300);
- case FontWeightNormal:
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
- case FontWeight500:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue500);
- case FontWeight600:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue600);
- case FontWeightBold:
- return CSSValuePool::singleton().createIdentifierValue(CSSValueBold);
- case FontWeight800:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue800);
- case FontWeight900:
- return CSSValuePool::singleton().createIdentifierValue(CSSValue900);
- }
- ASSERT_NOT_REACHED();
- return CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
-}
-
</del><span class="cx"> static Ref<CSSValue> fontSynthesisFromStyle(const RenderStyle& style)
</span><span class="cx"> {
</span><span class="cx"> if (style.fontDescription().fontSynthesis() == FontSynthesisNone)
</span><span class="lines">@@ -2556,6 +2524,39 @@
</span><span class="cx"> return propertyValue ? propertyValue->cssText() : emptyString();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static Ref<CSSFontValue> fontShorthandValueForSelectionProperties(const FontDescription& fontDescription)
+{
+ auto computedFont = CSSFontValue::create();
+
+ auto variantCaps = fontDescription.variantCaps();
+ if (variantCaps == FontVariantCaps::Small)
+ computedFont->variant = CSSValuePool::singleton().createIdentifierValue(CSSValueSmallCaps);
+ else if (variantCaps == FontVariantCaps::Normal)
+ computedFont->variant = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
+ else
+ return CSSFontValue::create();
+
+ auto weight = fontDescription.weight();
+ if (auto value = fontWeightKeyword(weight))
+ computedFont->weight = CSSValuePool::singleton().createIdentifierValue(value.value());
+ else if (isCSS21Weight(weight))
+ computedFont->weight = CSSValuePool::singleton().createValue(static_cast<float>(weight), CSSPrimitiveValue::CSS_NUMBER);
+ else
+ return CSSFontValue::create();
+
+ if (auto keyword = fontStretchKeyword(fontDescription.stretch()))
+ computedFont->stretch = CSSValuePool::singleton().createIdentifierValue(keyword.value());
+ else
+ return CSSFontValue::create();
+
+ if (auto italic = fontStyleKeyword(fontDescription.italic()))
+ computedFont->style = CSSValuePool::singleton().createIdentifierValue(italic.value());
+ else
+ return CSSFontValue::create();
+
+ return computedFont;
+}
+
</ins><span class="cx"> RefPtr<CSSValue> ComputedStyleExtractor::propertyValue(CSSPropertyID propertyID, EUpdateLayout updateLayout)
</span><span class="cx"> {
</span><span class="cx"> auto* styledElement = this->styledElement();
</span><span class="lines">@@ -2906,14 +2907,7 @@
</span><span class="cx"> return cssValuePool.createIdentifierValue(CSSValueNone);
</span><span class="cx"> return cssValuePool.createValue(style->floating());
</span><span class="cx"> case CSSPropertyFont: {
</span><del>- auto computedFont = CSSFontValue::create();
- computedFont->style = fontStyleFromStyle(*style);
- if (style->fontDescription().variantCaps() == FontVariantCaps::Small)
- computedFont->variant = CSSValuePool::singleton().createIdentifierValue(CSSValueSmallCaps);
- else
- computedFont->variant = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
- computedFont->weight = fontWeightFromStyle(*style);
- computedFont->stretch = fontStretchFromStyle(*style);
</del><ins>+ auto computedFont = fontShorthandValueForSelectionProperties(style->fontDescription());
</ins><span class="cx"> computedFont->size = fontSizeFromStyle(*style);
</span><span class="cx"> computedFont->lineHeight = lineHeightFromStyle(*style);
</span><span class="cx"> computedFont->family = fontFamilyListFromStyle(*style);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSFontFace.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -124,150 +124,111 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::optional<FontTraitsMask> CSSFontFace::calculateStyleMask(CSSValue& style)
</del><ins>+static FontSelectionRange calculateWeightRange(CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (!is<CSSPrimitiveValue>(style))
- return std::nullopt;
</del><ins>+ // FIXME: Parse range-based values.
+ ASSERT(is<CSSPrimitiveValue>(value));
+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</ins><span class="cx">
</span><del>- switch (downcast<CSSPrimitiveValue>(style).valueID()) {
- case CSSValueNormal:
- return FontStyleNormalMask;
- case CSSValueItalic:
- case CSSValueOblique:
- return FontStyleItalicMask;
- default:
- return FontStyleNormalMask;
</del><ins>+ FontSelectionValue result;
+ if (primitiveValue.isNumber()) {
+ result = FontSelectionValue::clampFloat(primitiveValue.floatValue());
+ return { result, result };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return FontStyleNormalMask;
-}
</del><ins>+ ASSERT(primitiveValue.isValueID());
+ if (auto value = fontWeightValue(primitiveValue.valueID()))
+ result = value.value();
+ else {
+ ASSERT_NOT_REACHED();
+ result = normalWeightValue();
+ }
</ins><span class="cx">
</span><del>-bool CSSFontFace::setStyle(CSSValue& style)
-{
- if (auto mask = calculateStyleMask(style)) {
- m_traitsMask = static_cast<FontTraitsMask>((static_cast<unsigned>(m_traitsMask) & (~FontStyleMask)) | mask.value());
-
- if (m_cssConnection)
- m_cssConnection->mutableProperties().setProperty(CSSPropertyFontStyle, &style);
-
- iterateClients(m_clients, [&](Client& client) {
- client.fontPropertyChanged(*this);
- });
-
- return true;
- }
- return false;
</del><ins>+ return { result, result };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::optional<FontTraitsMask> CSSFontFace::calculateWeightMask(CSSValue& weight)
</del><ins>+void CSSFontFace::setWeight(CSSValue& weight)
</ins><span class="cx"> {
</span><del>- if (!is<CSSPrimitiveValue>(weight))
- return std::nullopt;
</del><ins>+ auto range = calculateWeightRange(weight);
+ setWeight(range);
</ins><span class="cx">
</span><del>- switch (downcast<CSSPrimitiveValue>(weight).valueID()) {
- case CSSValueBold:
- case CSSValueBolder:
- case CSSValue700:
- return FontWeight700Mask;
- case CSSValueNormal:
- case CSSValue400:
- return FontWeight400Mask;
- case CSSValue900:
- return FontWeight900Mask;
- case CSSValue800:
- return FontWeight800Mask;
- case CSSValue600:
- return FontWeight600Mask;
- case CSSValue500:
- return FontWeight500Mask;
- case CSSValue300:
- return FontWeight300Mask;
- case CSSValueLighter:
- case CSSValue200:
- return FontWeight200Mask;
- case CSSValue100:
- return FontWeight100Mask;
- default:
- return FontWeight400Mask;
- }
</del><ins>+ if (m_cssConnection)
+ m_cssConnection->mutableProperties().setProperty(CSSPropertyFontWeight, &weight);
</ins><span class="cx">
</span><del>- return FontWeight400Mask;
</del><ins>+ iterateClients(m_clients, [&](Client& client) {
+ client.fontPropertyChanged(*this);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-std::optional<FontSelectionValue> CSSFontFace::calculateStretch(CSSValue& stretch)
</del><ins>+static FontSelectionRange calculateStretchRange(CSSValue& value)
</ins><span class="cx"> {
</span><del>- if (!is<CSSPrimitiveValue>(stretch))
- return std::nullopt;
</del><ins>+ // FIXME: Parse range-based values.
+ ASSERT(is<CSSPrimitiveValue>(value));
+ const auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</ins><span class="cx">
</span><del>- const auto& primitiveValue = downcast<CSSPrimitiveValue>(stretch);
</del><ins>+ FontSelectionValue result;
</ins><span class="cx"> if (primitiveValue.isPercentage() || primitiveValue.isNumber()) {
</span><del>- auto value = primitiveValue.floatValue();
- if (value < static_cast<float>(FontSelectionValue::minimumValue()))
- return FontSelectionValue::minimumValue();
- if (value > static_cast<float>(FontSelectionValue::maximumValue()))
- return FontSelectionValue::maximumValue();
- return FontSelectionValue(value);
</del><ins>+ result = FontSelectionValue::clampFloat(primitiveValue.floatValue());
+ return { result, result };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- switch (primitiveValue.valueID()) {
- case CSSValueUltraCondensed:
- return FontSelectionValue(50);
- case CSSValueExtraCondensed:
- return FontSelectionValue(62.5f);
- case CSSValueCondensed:
- return FontSelectionValue(75);
- case CSSValueSemiCondensed:
- return FontSelectionValue(87.5f);
- case CSSValueNormal:
- return FontSelectionValue(100);
- case CSSValueSemiExpanded:
- return FontSelectionValue(112.5f);
- case CSSValueExpanded:
- return FontSelectionValue(125);
- case CSSValueExtraExpanded:
- return FontSelectionValue(150);
- case CSSValueUltraExpanded:
- return FontSelectionValue(200);
- default:
</del><ins>+ ASSERT(primitiveValue.isValueID());
+ if (auto value = fontStretchValue(primitiveValue.valueID()))
+ result = value.value();
+ else {
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return std::nullopt;
</del><ins>+ result = normalStretchValue();
</ins><span class="cx"> }
</span><ins>+
+ return { result, result };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSFontFace::setWeight(CSSValue& weight)
</del><ins>+void CSSFontFace::setStretch(CSSValue& style)
</ins><span class="cx"> {
</span><del>- if (auto mask = calculateWeightMask(weight)) {
- m_traitsMask = static_cast<FontTraitsMask>((static_cast<unsigned>(m_traitsMask) & (~FontWeightMask)) | mask.value());
</del><ins>+ auto range = calculateStretchRange(style);
+ setStretch(range);
</ins><span class="cx">
</span><del>- if (m_cssConnection)
- m_cssConnection->mutableProperties().setProperty(CSSPropertyFontWeight, &weight);
</del><ins>+ if (m_cssConnection)
+ m_cssConnection->mutableProperties().setProperty(CSSPropertyFontStretch, &style);
</ins><span class="cx">
</span><del>- iterateClients(m_clients, [&](Client& client) {
- client.fontPropertyChanged(*this);
- });
</del><ins>+ iterateClients(m_clients, [&](Client& client) {
+ client.fontPropertyChanged(*this);
+ });
+}
</ins><span class="cx">
</span><del>- return true;
</del><ins>+static FontSelectionRange calculateItalicRange(CSSValue& value)
+{
+ // FIXME: Parse range-based values.
+ ASSERT(is<CSSPrimitiveValue>(value));
+ const auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+ FontSelectionValue result;
+ if (primitiveValue.isAngle() || primitiveValue.isNumber() || primitiveValue.isCalculated()) {
+ result = FontSelectionValue::clampFloat(primitiveValue.floatValue(CSSPrimitiveValue::CSS_DEG));
+ return { result, result };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return false;
</del><ins>+ ASSERT(primitiveValue.isValueID());
+ if (auto value = fontStyleValue(primitiveValue.valueID()))
+ result = value.value();
+ else {
+ ASSERT_NOT_REACHED();
+ result = normalItalicValue();
+ }
+ return { result, result };
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSFontFace::setStretch(CSSValue& stretch)
</del><ins>+void CSSFontFace::setStyle(CSSValue& style)
</ins><span class="cx"> {
</span><del>- if (auto parsedStretch = calculateStretch(stretch)) {
- m_stretch = FontSelectionRange(parsedStretch.value(), parsedStretch.value());
</del><ins>+ auto range = calculateItalicRange(style);
+ setStyle(range);
</ins><span class="cx">
</span><del>- if (m_cssConnection)
- m_cssConnection->mutableProperties().setProperty(CSSPropertyFontStretch, &stretch);
</del><ins>+ if (m_cssConnection)
+ m_cssConnection->mutableProperties().setProperty(CSSPropertyFontStyle, &style);
</ins><span class="cx">
</span><del>- iterateClients(m_clients, [&](Client& client) {
- client.fontPropertyChanged(*this);
- });
-
- return true;
- }
-
- return false;
</del><ins>+ iterateClients(m_clients, [&](Client& client) {
+ client.fontPropertyChanged(*this);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSFontFace::setUnicodeRange(CSSValue& unicodeRange)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSFontFace.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><span class="cx"> #include "FontSelectionAlgorithm.h"
</span><ins>+#include "FontSelectionValueInlines.h"
</ins><span class="cx"> #include "FontTaggedSettings.h"
</span><span class="cx"> #include "TextFlags.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="lines">@@ -64,9 +65,9 @@
</span><span class="cx"> // FIXME: These functions don't need to have boolean return values.
</span><span class="cx"> // Callers only call this with known-valid CSS values.
</span><span class="cx"> bool setFamilies(CSSValue&);
</span><del>- bool setStyle(CSSValue&);
- bool setWeight(CSSValue&);
- bool setStretch(CSSValue&);
</del><ins>+ void setStyle(CSSValue&);
+ void setWeight(CSSValue&);
+ void setStretch(CSSValue&);
</ins><span class="cx"> bool setUnicodeRange(CSSValue&);
</span><span class="cx"> bool setVariantLigatures(CSSValue&);
</span><span class="cx"> bool setVariantPosition(CSSValue&);
</span><span class="lines">@@ -79,23 +80,22 @@
</span><span class="cx"> enum class Status;
</span><span class="cx"> struct UnicodeRange;
</span><span class="cx"> const CSSValueList* families() const { return m_families.get(); }
</span><del>- FontTraitsMask traitsMask() const { return m_traitsMask; }
- FontSelectionRange stretch() const { return m_stretch; }
</del><ins>+ FontSelectionRange weight() const { return m_fontSelectionCapabilities.weight; }
+ FontSelectionRange stretch() const { return m_fontSelectionCapabilities.width; }
+ FontSelectionRange italic() const { return m_fontSelectionCapabilities.slope; }
+ FontSelectionCapabilities fontSelectionCapabilities() const { return m_fontSelectionCapabilities; }
</ins><span class="cx"> const Vector<UnicodeRange>& ranges() const { return m_ranges; }
</span><span class="cx"> const FontFeatureSettings& featureSettings() const { return m_featureSettings; }
</span><span class="cx"> const FontVariantSettings& variantSettings() const { return m_variantSettings; }
</span><span class="cx"> void setVariantSettings(const FontVariantSettings& variantSettings) { m_variantSettings = variantSettings; }
</span><del>- void setTraitsMask(FontTraitsMask traitsMask) { m_traitsMask = traitsMask; }
- void setStretch(FontSelectionRange stretch) { m_stretch = stretch; }
</del><ins>+ void setWeight(FontSelectionRange weight) { m_fontSelectionCapabilities.weight = weight; }
+ void setStretch(FontSelectionRange stretch) { m_fontSelectionCapabilities.width = stretch; }
+ void setStyle(FontSelectionRange italic) { m_fontSelectionCapabilities.slope = italic; }
+ void setFontSelectionCapabilities(FontSelectionCapabilities capabilities) { m_fontSelectionCapabilities = capabilities; }
</ins><span class="cx"> bool isLocalFallback() const { return m_isLocalFallback; }
</span><span class="cx"> Status status() const { return m_status; }
</span><span class="cx"> StyleRuleFontFace* cssConnection() const { return m_cssConnection.get(); }
</span><del>- FontSelectionCapabilities fontSelectionCapabilities() const { return fontSelectionCapabilitiesForTraitsMask(m_traitsMask, m_stretch); }
</del><span class="cx">
</span><del>- static std::optional<FontTraitsMask> calculateStyleMask(CSSValue& style);
- static std::optional<FontTraitsMask> calculateWeightMask(CSSValue& weight);
- static std::optional<FontSelectionValue> calculateStretch(CSSValue& stretch);
-
</del><span class="cx"> class Client;
</span><span class="cx"> void addClient(Client&);
</span><span class="cx"> void removeClient(Client&);
</span><span class="lines">@@ -168,7 +168,6 @@
</span><span class="cx"> void timeoutFired();
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSValueList> m_families;
</span><del>- FontTraitsMask m_traitsMask { static_cast<FontTraitsMask>(FontStyleNormalMask | FontWeight400Mask) };
</del><span class="cx"> Vector<UnicodeRange> m_ranges;
</span><span class="cx"> FontFeatureSettings m_featureSettings;
</span><span class="cx"> FontVariantSettings m_variantSettings;
</span><span class="lines">@@ -178,8 +177,8 @@
</span><span class="cx"> RefPtr<StyleRuleFontFace> m_cssConnection;
</span><span class="cx"> HashSet<Client*> m_clients;
</span><span class="cx"> WeakPtr<FontFace> m_wrapper;
</span><ins>+ FontSelectionCapabilities m_fontSelectionCapabilities;
</ins><span class="cx"> Status m_status { Status::Pending };
</span><del>- FontSelectionRange m_stretch { FontSelectionValue(100), FontSelectionValue(100) };
</del><span class="cx"> bool m_isLocalFallback { false };
</span><span class="cx"> bool m_sourcesPopulated { false };
</span><span class="cx"> bool m_mayBePurged { true };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSet.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -101,19 +101,18 @@
</span><span class="cx"> if (m_locallyInstalledFacesLookupTable.contains(familyName))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- Vector<FontCache::TraitsAndStretch> traitsAndStretch = FontCache::singleton().getTraitsAndStretchInFamily(familyName);
- if (traitsAndStretch.isEmpty())
</del><ins>+ Vector<FontSelectionCapabilities> capabilities = FontCache::singleton().getFontSelectionCapabilitiesInFamily(familyName);
+ if (capabilities.isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Vector<Ref<CSSFontFace>> faces;
</span><del>- for (auto item : traitsAndStretch) {
</del><ins>+ for (auto item : capabilities) {
</ins><span class="cx"> Ref<CSSFontFace> face = CSSFontFace::create(nullptr, nullptr, nullptr, true);
</span><span class="cx">
</span><span class="cx"> Ref<CSSValueList> familyList = CSSValueList::createCommaSeparated();
</span><span class="cx"> familyList->append(CSSValuePool::singleton().createFontFamilyValue(familyName));
</span><span class="cx"> face->setFamilies(familyList.get());
</span><del>- face->setTraitsMask(item.traits);
- face->setStretch(item.stretch);
</del><ins>+ face->setFontSelectionCapabilities(item);
</ins><span class="cx"> face->adoptSource(std::make_unique<CSSFontFaceSource>(face.get(), familyName));
</span><span class="cx"> ASSERT(!face->allSourcesFailed());
</span><span class="cx"> faces.append(WTFMove(face));
</span><span class="lines">@@ -287,40 +286,91 @@
</span><span class="cx"> return m_faces[i];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::optional<FontTraitsMask> computeFontTraitsMask(MutableStyleProperties& style)
</del><ins>+static std::optional<FontSelectionValue> calculateWeightValue(CSSValue& weight)
</ins><span class="cx"> {
</span><del>- RefPtr<CSSValue> styleValue = style.getPropertyCSSValue(CSSPropertyFontStyle).get();
- if (!styleValue)
- styleValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal).ptr();
</del><ins>+ if (!is<CSSPrimitiveValue>(weight))
+ return std::nullopt;
</ins><span class="cx">
</span><del>- FontTraitsMask styleMask;
- if (auto styleMaskOptional = CSSFontFace::calculateStyleMask(*styleValue))
- styleMask = styleMaskOptional.value();
- else
</del><ins>+ auto& primitiveWeight = downcast<CSSPrimitiveValue>(weight);
+ if (primitiveWeight.isNumber())
+ return FontSelectionValue::clampFloat(primitiveWeight.floatValue());
+
+ if (!primitiveWeight.isValueID())
</ins><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><ins>+ if (auto value = fontWeightValue(primitiveWeight.valueID()))
+ return value.value();
+ ASSERT_NOT_REACHED();
+ return normalWeightValue();
+}
+
+static std::optional<FontSelectionValue> calculateStretchValue(CSSValue& style)
+{
+ if (!is<CSSPrimitiveValue>(style))
+ return std::nullopt;
+
+ auto& primitiveStretch = downcast<CSSPrimitiveValue>(style);
+ if (primitiveStretch.isNumber() || primitiveStretch.isPercentage())
+ return FontSelectionValue::clampFloat(primitiveStretch.floatValue());
+
+ if (!primitiveStretch.isValueID())
+ return std::nullopt;
+
+ if (auto value = fontStretchValue(primitiveStretch.valueID()))
+ return value.value();
+ return normalStretchValue();
+}
+
+static std::optional<FontSelectionValue> calculateStyleValue(CSSValue& style)
+{
+ if (!is<CSSPrimitiveValue>(style))
+ return std::nullopt;
+
+ auto& primitiveSlant = downcast<CSSPrimitiveValue>(style);
+ if (primitiveSlant.isNumber() || primitiveSlant.isAngle())
+ return FontSelectionValue::clampFloat(primitiveSlant.floatValue());
+
+ if (!primitiveSlant.isValueID())
+ return std::nullopt;
+
+ if (auto value = fontStyleValue(downcast<CSSPrimitiveValue>(style).valueID()))
+ return value.value();
+ return normalItalicValue();
+}
+
+static std::optional<FontSelectionRequest> computeFontSelectionRequest(MutableStyleProperties& style)
+{
</ins><span class="cx"> RefPtr<CSSValue> weightValue = style.getPropertyCSSValue(CSSPropertyFontWeight).get();
</span><span class="cx"> if (!weightValue)
</span><span class="cx"> weightValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal).ptr();
</span><span class="cx">
</span><del>- FontTraitsMask weightMask;
- if (auto weightMaskOptional = CSSFontFace::calculateWeightMask(*weightValue))
- weightMask = weightMaskOptional.value();
</del><ins>+ FontSelectionValue weightSelectionValue;
+ if (auto weightOptional = calculateWeightValue(*weightValue))
+ weightSelectionValue = weightOptional.value();
</ins><span class="cx"> else
</span><span class="cx"> return std::nullopt;
</span><span class="cx">
</span><del>- return static_cast<FontTraitsMask>(static_cast<unsigned>(styleMask) | static_cast<unsigned>(weightMask));
-}
-
-static std::optional<FontSelectionValue> computeFontStretch(MutableStyleProperties& style)
-{
</del><span class="cx"> RefPtr<CSSValue> stretchValue = style.getPropertyCSSValue(CSSPropertyFontStretch).get();
</span><span class="cx"> if (!stretchValue)
</span><span class="cx"> stretchValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal).ptr();
</span><span class="cx">
</span><del>- if (auto stretchOptional = CSSFontFace::calculateStretch(*stretchValue))
- return stretchOptional.value();
- return std::nullopt;
</del><ins>+ FontSelectionValue stretchSelectionValue;
+ if (auto stretchOptional = calculateStretchValue(*weightValue))
+ stretchSelectionValue = stretchOptional.value();
+ else
+ return std::nullopt;
+
+ RefPtr<CSSValue> styleValue = style.getPropertyCSSValue(CSSPropertyFontStyle).get();
+ if (!styleValue)
+ styleValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal).ptr();
+
+ FontSelectionValue styleSelectionValue;
+ if (auto styleOptional = calculateStyleValue(*styleValue))
+ styleSelectionValue = styleOptional.value();
+ else
+ return std::nullopt;
+
+ return {{ weightSelectionValue, stretchSelectionValue, styleSelectionValue }};
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static HashSet<UChar32> codePointsFromString(StringView stringView)
</span><span class="lines">@@ -346,18 +396,12 @@
</span><span class="cx"> if (parseResult == CSSParser::ParseResult::Error)
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx">
</span><del>- FontTraitsMask fontTraitsMask;
- if (auto maskOptional = computeFontTraitsMask(style.get()))
- fontTraitsMask = maskOptional.value();
</del><ins>+ FontSelectionRequest request;
+ if (auto fontSelectionRequestOptional = computeFontSelectionRequest(style.get()))
+ request = fontSelectionRequestOptional.value();
</ins><span class="cx"> else
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx">
</span><del>- FontSelectionValue stretch;
- if (auto stretchOptional = computeFontStretch(style.get()))
- stretch = stretchOptional.value();
- else
- return Exception { SYNTAX_ERR };
-
</del><span class="cx"> auto family = style->getPropertyCSSValue(CSSPropertyFontFamily);
</span><span class="cx"> if (!is<CSSValueList>(family.get()))
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="lines">@@ -377,7 +421,7 @@
</span><span class="cx"> for (auto codePoint : codePointsFromString(string)) {
</span><span class="cx"> bool found = false;
</span><span class="cx"> for (auto& family : familyOrder) {
</span><del>- auto* faces = fontFace(fontTraitsMask, stretch, family);
</del><ins>+ auto* faces = fontFace(request, family);
</ins><span class="cx"> if (!faces)
</span><span class="cx"> continue;
</span><span class="cx"> for (auto& constituentFace : faces->constituentFaces()) {
</span><span class="lines">@@ -412,7 +456,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSSegmentedFontFace* CSSFontFaceSet::fontFace(FontTraitsMask traitsMask, FontSelectionValue stretch, const AtomicString& family)
</del><ins>+CSSSegmentedFontFace* CSSFontFaceSet::fontFace(FontSelectionRequest request, const AtomicString& family)
</ins><span class="cx"> {
</span><span class="cx"> auto iterator = m_facesLookupTable.find(family);
</span><span class="cx"> if (iterator == m_facesLookupTable.end())
</span><span class="lines">@@ -419,9 +463,9 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> auto& familyFontFaces = iterator->value;
</span><span class="cx">
</span><del>- auto& segmentedFontFaceCache = m_cache.add(family, HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>()).iterator->value;
</del><ins>+ auto& segmentedFontFaceCache = m_cache.add(family, FontSelectionHashMap()).iterator->value;
</ins><span class="cx">
</span><del>- auto& face = segmentedFontFaceCache.add(traitsMask, nullptr).iterator->value;
</del><ins>+ auto& face = segmentedFontFaceCache.add(request, nullptr).iterator->value;
</ins><span class="cx"> if (face)
</span><span class="cx"> return face.get();
</span><span class="cx">
</span><span class="lines">@@ -430,8 +474,8 @@
</span><span class="cx"> Vector<std::reference_wrapper<CSSFontFace>, 32> candidateFontFaces;
</span><span class="cx"> for (int i = familyFontFaces.size() - 1; i >= 0; --i) {
</span><span class="cx"> CSSFontFace& candidate = familyFontFaces[i];
</span><del>- unsigned candidateTraitsMask = candidate.traitsMask();
- if ((traitsMask & FontStyleNormalMask) && !(candidateTraitsMask & FontStyleNormalMask))
</del><ins>+ auto capabilities = candidate.fontSelectionCapabilities();
+ if (!isItalic(request.slope) && isItalic(capabilities.slope.minimum))
</ins><span class="cx"> continue;
</span><span class="cx"> candidateFontFaces.append(candidate);
</span><span class="cx"> }
</span><span class="lines">@@ -439,8 +483,8 @@
</span><span class="cx"> auto localIterator = m_locallyInstalledFacesLookupTable.find(family);
</span><span class="cx"> if (localIterator != m_locallyInstalledFacesLookupTable.end()) {
</span><span class="cx"> for (auto& candidate : localIterator->value) {
</span><del>- unsigned candidateTraitsMask = candidate->traitsMask();
- if ((traitsMask & FontStyleNormalMask) && !(candidateTraitsMask & FontStyleNormalMask))
</del><ins>+ auto capabilities = candidate->fontSelectionCapabilities();
+ if (!isItalic(request.slope) && isItalic(capabilities.slope.minimum))
</ins><span class="cx"> continue;
</span><span class="cx"> candidateFontFaces.append(candidate);
</span><span class="cx"> }
</span><span class="lines">@@ -451,7 +495,7 @@
</span><span class="cx"> capabilities.reserveInitialCapacity(candidateFontFaces.size());
</span><span class="cx"> for (auto& face : candidateFontFaces)
</span><span class="cx"> capabilities.uncheckedAppend(face.get().fontSelectionCapabilities());
</span><del>- FontSelectionAlgorithm fontSelectionAlgorithm(fontSelectionRequestForTraitsMask(traitsMask, stretch), capabilities);
</del><ins>+ FontSelectionAlgorithm fontSelectionAlgorithm(request, capabilities);
</ins><span class="cx"> std::stable_sort(candidateFontFaces.begin(), candidateFontFaces.end(), [&fontSelectionAlgorithm](const CSSFontFace& first, const CSSFontFace& second) {
</span><span class="cx"> auto firstCapabilities = first.fontSelectionCapabilities();
</span><span class="cx"> auto secondCapabilities = second.fontSelectionCapabilities();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSet.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSet.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSFontFaceSet.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> ExceptionOr<bool> check(const String& font, const String& text);
</span><span class="cx">
</span><del>- CSSSegmentedFontFace* fontFace(FontTraitsMask, FontSelectionValue stretch, const AtomicString& family);
</del><ins>+ CSSSegmentedFontFace* fontFace(FontSelectionRequest, const AtomicString& family);
</ins><span class="cx">
</span><span class="cx"> enum class Status { Loading, Loaded };
</span><span class="cx"> Status status() const { return m_status; }
</span><span class="lines">@@ -98,7 +98,8 @@
</span><span class="cx"> Vector<Ref<CSSFontFace>> m_faces; // We should investigate moving m_faces to FontFaceSet and making it reference FontFaces. This may clean up the font loading design.
</span><span class="cx"> HashMap<String, Vector<Ref<CSSFontFace>>, ASCIICaseInsensitiveHash> m_facesLookupTable;
</span><span class="cx"> HashMap<String, Vector<Ref<CSSFontFace>>, ASCIICaseInsensitiveHash> m_locallyInstalledFacesLookupTable;
</span><del>- HashMap<String, HashMap<unsigned, RefPtr<CSSSegmentedFontFace>>, ASCIICaseInsensitiveHash> m_cache;
</del><ins>+ typedef HashMap<FontSelectionRequestKey, RefPtr<CSSSegmentedFontFace>, FontSelectionRequestKeyHash, WTF::SimpleClassHashTraits<FontSelectionRequestKey>> FontSelectionHashMap;
+ HashMap<String, FontSelectionHashMap, ASCIICaseInsensitiveHash> m_cache;
</ins><span class="cx"> HashMap<StyleRuleFontFace*, CSSFontFace*> m_constituentCSSConnections;
</span><span class="cx"> size_t m_facesPartitionIndex { 0 }; // All entries in m_faces before this index are CSS-connected.
</span><span class="cx"> Status m_status { Status::Loaded };
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -182,12 +182,9 @@
</span><span class="cx">
</span><span class="cx"> if (!fontFace->setFamilies(*fontFamily))
</span><span class="cx"> return;
</span><del>- if (!fontFace->setStyle(*fontStyle))
- return;
- if (!fontFace->setWeight(*fontWeight))
- return;
- if (!fontFace->setStretch(*fontStretch))
- return;
</del><ins>+ fontFace->setStyle(*fontStyle);
+ fontFace->setWeight(*fontWeight);
+ fontFace->setStretch(*fontStretch);
</ins><span class="cx"> if (rangeList && !fontFace->setUnicodeRange(*rangeList))
</span><span class="cx"> return;
</span><span class="cx"> if (variantLigatures && !fontFace->setVariantLigatures(*variantLigatures))
</span><span class="lines">@@ -301,7 +298,7 @@
</span><span class="cx"> bool resolveGenericFamilyFirst = familyName == standardFamily;
</span><span class="cx">
</span><span class="cx"> AtomicString familyForLookup = resolveGenericFamilyFirst ? resolveGenericFamily(m_document, fontDescription, familyName) : familyName;
</span><del>- auto* face = m_cssFontFaceSet->fontFace(fontDescription.traitsMask(), fontDescription.stretch(), familyForLookup);
</del><ins>+ auto* face = m_cssFontFaceSet->fontFace(fontDescription.fontSelectionRequest(), familyForLookup);
</ins><span class="cx"> if (!face) {
</span><span class="cx"> if (!resolveGenericFamilyFirst)
</span><span class="cx"> familyForLookup = resolveGenericFamily(m_document, fontDescription, familyName);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPrimitiveValueMappingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -3679,114 +3679,6 @@
</span><span class="cx"> return AutoSmoothing;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontWeight weight)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (weight) {
- case FontWeight900:
- m_value.valueID = CSSValue900;
- return;
- case FontWeight800:
- m_value.valueID = CSSValue800;
- return;
- case FontWeight700:
- m_value.valueID = CSSValue700;
- return;
- case FontWeight600:
- m_value.valueID = CSSValue600;
- return;
- case FontWeight500:
- m_value.valueID = CSSValue500;
- return;
- case FontWeight400:
- m_value.valueID = CSSValue400;
- return;
- case FontWeight300:
- m_value.valueID = CSSValue300;
- return;
- case FontWeight200:
- m_value.valueID = CSSValue200;
- return;
- case FontWeight100:
- m_value.valueID = CSSValue100;
- return;
- }
-
- ASSERT_NOT_REACHED();
- m_value.valueID = CSSValueNormal;
-}
-
-template<> inline CSSPrimitiveValue::operator FontWeight() const
-{
- ASSERT(isValueID());
-
- switch (m_value.valueID) {
- case CSSValueBold:
- return FontWeightBold;
- case CSSValueNormal:
- return FontWeightNormal;
- case CSSValue900:
- return FontWeight900;
- case CSSValue800:
- return FontWeight800;
- case CSSValue700:
- return FontWeight700;
- case CSSValue600:
- return FontWeight600;
- case CSSValue500:
- return FontWeight500;
- case CSSValue400:
- return FontWeight400;
- case CSSValue300:
- return FontWeight300;
- case CSSValue200:
- return FontWeight200;
- case CSSValue100:
- return FontWeight100;
- default:
- break;
- }
-
- ASSERT_NOT_REACHED();
- return FontWeightNormal;
-}
-
-template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontItalic italic)
- : CSSValue(PrimitiveClass)
-{
- m_primitiveUnitType = CSS_VALUE_ID;
- switch (italic) {
- case FontItalicOff:
- m_value.valueID = CSSValueNormal;
- return;
- case FontItalicOn:
- m_value.valueID = CSSValueItalic;
- return;
- }
-
- ASSERT_NOT_REACHED();
- m_value.valueID = CSSValueNormal;
-}
-
-template<> inline CSSPrimitiveValue::operator FontItalic() const
-{
- ASSERT(isValueID());
-
- switch (m_value.valueID) {
- case CSSValueOblique:
- // FIXME: oblique is the same as italic for the moment...
- case CSSValueItalic:
- return FontItalicOn;
- case CSSValueNormal:
- return FontItalicOff;
- default:
- break;
- }
- ASSERT_NOT_REACHED();
- return FontItalicOff;
-}
-
</del><span class="cx"> template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontSmallCaps smallCaps)
</span><span class="cx"> : CSSValue(PrimitiveClass)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSPropertiesjson"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSProperties.json (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSProperties.json 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSProperties.json 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -297,7 +297,8 @@
</span><span class="cx"> "codegen-properties": {
</span><span class="cx"> "name-for-methods": "Italic",
</span><span class="cx"> "font-property": true,
</span><del>- "high-priority": true
</del><ins>+ "high-priority": true,
+ "converter": "FontStyle"
</ins><span class="cx"> },
</span><span class="cx"> "specification": {
</span><span class="cx"> "category": "css-fonts",
</span><span class="lines">@@ -307,8 +308,10 @@
</span><span class="cx"> "font-weight": {
</span><span class="cx"> "inherited": true,
</span><span class="cx"> "codegen-properties": {
</span><del>- "custom": "All",
- "high-priority": true
</del><ins>+ "name-for-methods": "Weight",
+ "font-property": true,
+ "high-priority": true,
+ "converter": "FontWeight"
</ins><span class="cx"> },
</span><span class="cx"> "specification": {
</span><span class="cx"> "category": "css-fonts",
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSSegmentedFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSSegmentedFontFace.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> FontRanges CSSSegmentedFontFace::fontRanges(const FontDescription& fontDescription)
</span><span class="cx"> {
</span><del>- FontTraitsMask desiredTraitsMask = fontDescription.traitsMask();
</del><ins>+ auto desiredRequest = fontDescription.fontSelectionRequest();
</ins><span class="cx">
</span><span class="cx"> auto addResult = m_cache.add(FontDescriptionKey(fontDescription), FontRanges());
</span><span class="cx"> auto& result = addResult.iterator->value;
</span><span class="lines">@@ -117,9 +117,9 @@
</span><span class="cx"> if (face->allSourcesFailed())
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- FontTraitsMask traitsMask = face->traitsMask();
- bool syntheticBold = (fontDescription.fontSynthesis() & FontSynthesisWeight) && !(traitsMask & (FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask)) && (desiredTraitsMask & (FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask));
- bool syntheticItalic = (fontDescription.fontSynthesis() & FontSynthesisStyle) && !(traitsMask & FontStyleItalicMask) && (desiredTraitsMask & FontStyleItalicMask);
</del><ins>+ auto selectionCapabilities = face->fontSelectionCapabilities();
+ bool syntheticBold = (fontDescription.fontSynthesis() & FontSynthesisWeight) && !isFontWeightBold(selectionCapabilities.weight.maximum) && isFontWeightBold(desiredRequest.weight);
+ bool syntheticItalic = (fontDescription.fontSynthesis() & FontSynthesisStyle) && !isItalic(selectionCapabilities.slope.maximum) && isItalic(desiredRequest.slope);
</ins><span class="cx">
</span><span class="cx"> // This doesn't trigger an unnecessary download because every element styled with this family will need font metrics in order to run layout.
</span><span class="cx"> // Metrics used for layout come from FontRanges::fontForFirstRange(), which assumes that the first font is non-null.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -125,15 +125,7 @@
</span><span class="cx"> bold
</span><span class="cx"> bolder
</span><span class="cx"> lighter
</span><del>-100
-200
-300
-400
-500
-600
-700
-800
-900
</del><ins>+
</ins><span class="cx"> //
</span><span class="cx"> // CSS_PROP_FONT_SIZE:
</span><span class="cx"> //
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/FontFace.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -163,12 +163,11 @@
</span><span class="cx"> if (style.isEmpty())
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx">
</span><del>- bool success = false;
- if (auto value = parseString(style, CSSPropertyFontStyle))
- success = m_backing->setStyle(*value);
- if (!success)
- return Exception { SYNTAX_ERR };
- return { };
</del><ins>+ if (auto value = parseString(style, CSSPropertyFontStyle)) {
+ m_backing->setStyle(*value);
+ return { };
+ }
+ return Exception { SYNTAX_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> FontFace::setWeight(const String& weight)
</span><span class="lines">@@ -176,12 +175,11 @@
</span><span class="cx"> if (weight.isEmpty())
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx">
</span><del>- bool success = false;
- if (auto value = parseString(weight, CSSPropertyFontWeight))
- success = m_backing->setWeight(*value);
- if (!success)
- return Exception { SYNTAX_ERR };
- return { };
</del><ins>+ if (auto value = parseString(weight, CSSPropertyFontWeight)) {
+ m_backing->setWeight(*value);
+ return { };
+ }
+ return Exception { SYNTAX_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> FontFace::setStretch(const String& stretch)
</span><span class="lines">@@ -189,12 +187,11 @@
</span><span class="cx"> if (stretch.isEmpty())
</span><span class="cx"> return Exception { SYNTAX_ERR };
</span><span class="cx">
</span><del>- bool success = false;
- if (auto value = parseString(stretch, CSSPropertyFontStretch))
- success = m_backing->setStretch(*value);
- if (!success)
- return Exception { SYNTAX_ERR };
- return { };
</del><ins>+ if (auto value = parseString(stretch, CSSPropertyFontStretch)) {
+ m_backing->setStretch(*value);
+ return { };
+ }
+ return Exception { SYNTAX_ERR };
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ExceptionOr<void> FontFace::setUnicodeRange(const String& unicodeRange)
</span><span class="lines">@@ -283,44 +280,55 @@
</span><span class="cx"> return m_backing->families()->cssText();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool rangeIsSingleValue(FontSelectionRange range, FontSelectionValue value)
+{
+ return range.minimum == value && range.maximum == value;
+};
+
</ins><span class="cx"> String FontFace::style() const
</span><span class="cx"> {
</span><span class="cx"> m_backing->updateStyleIfNeeded();
</span><del>- switch (m_backing->traitsMask() & FontStyleMask) {
- case FontStyleNormalMask:
- return String("normal", String::ConstructFromLiteral);
- case FontStyleItalicMask:
- return String("italic", String::ConstructFromLiteral);
</del><ins>+ auto style = m_backing->italic();
+
+ if (rangeIsSingleValue(style, italicValue()))
+ return ASCIILiteral("italic");
+ if (rangeIsSingleValue(style, normalItalicValue()))
+ return ASCIILiteral("normal");
+
+ if (style.minimum == style.maximum) {
+ auto value = static_cast<float>(style.minimum);
+ if (value >= 0) {
+ auto floored = std::floor(value);
+ if (floored == value)
+ return String::format("oblique %ddeg", static_cast<int>(floored));
+ }
+ return String::format("oblique %fdeg", static_cast<float>(style.minimum));
</ins><span class="cx"> }
</span><del>- ASSERT_NOT_REACHED();
- return String("normal", String::ConstructFromLiteral);
</del><ins>+
+ return String::format("oblique %fdeg-%fdeg", static_cast<float>(style.minimum), static_cast<float>(style.maximum));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String FontFace::weight() const
</span><span class="cx"> {
</span><span class="cx"> m_backing->updateStyleIfNeeded();
</span><del>- switch (m_backing->traitsMask() & FontWeightMask) {
- case FontWeight100Mask:
- return String("100", String::ConstructFromLiteral);
- case FontWeight200Mask:
- return String("200", String::ConstructFromLiteral);
- case FontWeight300Mask:
- return String("300", String::ConstructFromLiteral);
- case FontWeight400Mask:
- return String("normal", String::ConstructFromLiteral);
- case FontWeight500Mask:
- return String("500", String::ConstructFromLiteral);
- case FontWeight600Mask:
- return String("600", String::ConstructFromLiteral);
- case FontWeight700Mask:
- return String("bold", String::ConstructFromLiteral);
- case FontWeight800Mask:
- return String("800", String::ConstructFromLiteral);
- case FontWeight900Mask:
- return String("900", String::ConstructFromLiteral);
</del><ins>+ auto weight = m_backing->weight();
+
+ if (rangeIsSingleValue(weight, normalWeightValue()))
+ return ASCIILiteral("normal");
+ if (rangeIsSingleValue(weight, boldWeightValue()))
+ return ASCIILiteral("bold");
+
+ if (weight.minimum == weight.maximum) {
+ auto value = static_cast<float>(weight.minimum);
+ if (value >= 0) {
+ auto floored = std::floor(value);
+ if (floored == value)
+ return String::format("%d", static_cast<int>(floored));
+ }
+ return String::format("%f", static_cast<float>(weight.minimum));
</ins><span class="cx"> }
</span><del>- ASSERT_NOT_REACHED();
- return String("normal", String::ConstructFromLiteral);
</del><ins>+
+ return String::format("%f-%f", static_cast<float>(weight.minimum), static_cast<float>(weight.maximum));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String FontFace::stretch() const
</span><span class="lines">@@ -328,30 +336,36 @@
</span><span class="cx"> m_backing->updateStyleIfNeeded();
</span><span class="cx"> auto stretch = m_backing->stretch();
</span><span class="cx">
</span><del>- auto rangeIsSingleValue = [](FontSelectionRange range, FontSelectionValue value) -> bool {
- return range.minimum == value && range.maximum == value;
- };
-
- if (rangeIsSingleValue(stretch, FontSelectionValue(50)))
</del><ins>+ if (rangeIsSingleValue(stretch, ultraCondensedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("ultra-condensed");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(62.5f)))
</del><ins>+ if (rangeIsSingleValue(stretch, extraCondensedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("extra-condensed");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(75)))
</del><ins>+ if (rangeIsSingleValue(stretch, condensedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("condensed");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(87.5f)))
</del><ins>+ if (rangeIsSingleValue(stretch, semiCondensedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("semi-condensed");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(100)))
</del><ins>+ if (rangeIsSingleValue(stretch, normalStretchValue()))
</ins><span class="cx"> return ASCIILiteral("normal");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(112.5f)))
</del><ins>+ if (rangeIsSingleValue(stretch, semiExpandedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("semi-expanded");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(125)))
</del><ins>+ if (rangeIsSingleValue(stretch, expandedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("expanded");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(150)))
</del><ins>+ if (rangeIsSingleValue(stretch, extraExpandedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("extra-expanded");
</span><del>- if (rangeIsSingleValue(stretch, FontSelectionValue(200)))
</del><ins>+ if (rangeIsSingleValue(stretch, ultraExpandedStretchValue()))
</ins><span class="cx"> return ASCIILiteral("ultra-expanded");
</span><span class="cx">
</span><del>- return String::format("%f-%f", static_cast<float>(stretch.minimum), static_cast<float>(stretch.maximum));
</del><ins>+ if (stretch.minimum == stretch.maximum) {
+ auto value = static_cast<float>(stretch.minimum);
+ if (value >= 0) {
+ auto floored = std::floor(value);
+ if (floored == value)
+ return String::format("%d%%", static_cast<int>(floored));
+ }
+ return String::format("%f%%", static_cast<float>(stretch.minimum));
+ }
+
+ return String::format("%f%%-%f%%", static_cast<float>(stretch.minimum), static_cast<float>(stretch.maximum));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String FontFace::unicodeRange() const
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontSelectionValueInlinesh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/css/FontSelectionValueInlines.h (0 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontSelectionValueInlines.h (rev 0)
+++ trunk/Source/WebCore/css/FontSelectionValueInlines.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -0,0 +1,146 @@
</span><ins>+/*
+ * Copyright (C) 2017 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include "CSSValueKeywords.h"
+#include "FontSelectionAlgorithm.h"
+
+namespace WebCore {
+
+inline bool isCSS21Weight(FontSelectionValue weight)
+{
+ return weight == FontSelectionValue(100)
+ || weight == FontSelectionValue(200)
+ || weight == FontSelectionValue(300)
+ || weight == FontSelectionValue(400)
+ || weight == FontSelectionValue(500)
+ || weight == FontSelectionValue(600)
+ || weight == FontSelectionValue(700)
+ || weight == FontSelectionValue(800)
+ || weight == FontSelectionValue(900);
+}
+
+inline bool isCSS21Weight(int weight)
+{
+ return !((weight % 100) || weight < 100 || weight > 900);
+}
+
+inline std::optional<CSSValueID> fontWeightKeyword(FontSelectionValue weight)
+{
+ if (weight == normalWeightValue())
+ return CSSValueNormal;
+ if (weight == boldWeightValue())
+ return CSSValueBold;
+ return std::nullopt;
+}
+
+inline std::optional<FontSelectionValue> fontWeightValue(CSSValueID value)
+{
+ switch (value) {
+ case CSSValueNormal:
+ return normalWeightValue();
+ case CSSValueBold:
+ case CSSValueBolder:
+ return boldWeightValue();
+ case CSSValueLighter:
+ return lightWeightValue();
+ default:
+ return std::nullopt;
+ }
+}
+
+inline std::optional<CSSValueID> fontStretchKeyword(FontSelectionValue stretch)
+{
+ if (stretch == ultraCondensedStretchValue())
+ return CSSValueUltraCondensed;
+ if (stretch == extraCondensedStretchValue())
+ return CSSValueExtraCondensed;
+ if (stretch == condensedStretchValue())
+ return CSSValueCondensed;
+ if (stretch == semiCondensedStretchValue())
+ return CSSValueSemiCondensed;
+ if (stretch == normalStretchValue())
+ return CSSValueNormal;
+ if (stretch == semiExpandedStretchValue())
+ return CSSValueSemiExpanded;
+ if (stretch == expandedStretchValue())
+ return CSSValueExpanded;
+ if (stretch == extraExpandedStretchValue())
+ return CSSValueExtraExpanded;
+ if (stretch == ultraExpandedStretchValue())
+ return CSSValueUltraExpanded;
+ return std::nullopt;
+}
+
+inline std::optional<FontSelectionValue> fontStretchValue(CSSValueID value)
+{
+ switch (value) {
+ case CSSValueUltraCondensed:
+ return ultraCondensedStretchValue();
+ case CSSValueExtraCondensed:
+ return extraCondensedStretchValue();
+ case CSSValueCondensed:
+ return condensedStretchValue();
+ case CSSValueSemiCondensed:
+ return semiCondensedStretchValue();
+ case CSSValueNormal:
+ return normalStretchValue();
+ case CSSValueSemiExpanded:
+ return semiExpandedStretchValue();
+ case CSSValueExpanded:
+ return expandedStretchValue();
+ case CSSValueExtraExpanded:
+ return extraExpandedStretchValue();
+ case CSSValueUltraExpanded:
+ return ultraExpandedStretchValue();
+ default:
+ return std::nullopt;
+ }
+}
+
+inline std::optional<CSSValueID> fontStyleKeyword(FontSelectionValue style)
+{
+ if (style == normalItalicValue())
+ return CSSValueNormal;
+ if (style == italicValue())
+ return CSSValueItalic;
+ return std::nullopt;
+}
+
+inline std::optional<FontSelectionValue> fontStyleValue(CSSValueID value)
+{
+ switch (value) {
+ case CSSValueNormal:
+ return normalItalicValue();
+ case CSSValueOblique:
+ case CSSValueItalic:
+ return italicValue();
+ default:
+ return std::nullopt;
+ }
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> #include "CSSImageValue.h"
</span><span class="cx"> #include "CSSPrimitiveValue.h"
</span><span class="cx"> #include "CSSReflectValue.h"
</span><ins>+#include "FontSelectionValueInlines.h"
</ins><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "LayoutUnit.h"
</span><span class="cx"> #include "Length.h"
</span><span class="lines">@@ -114,7 +115,9 @@
</span><span class="cx"> static bool convertOverflowScrolling(StyleResolver&, const CSSValue&);
</span><span class="cx"> #endif
</span><span class="cx"> static FontFeatureSettings convertFontFeatureSettings(StyleResolver&, const CSSValue&);
</span><ins>+ static FontSelectionValue convertFontWeight(StyleResolver&, const CSSValue&);
</ins><span class="cx"> static FontSelectionValue convertFontStretch(StyleResolver&, const CSSValue&);
</span><ins>+ static FontSelectionValue convertFontStyle(StyleResolver&, const CSSValue&);
</ins><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> static FontVariationSettings convertFontVariationSettings(StyleResolver&, const CSSValue&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1154,46 +1157,60 @@
</span><span class="cx"> return settings;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline FontSelectionValue StyleBuilderConverter::convertFontStretch(StyleResolver&, const CSSValue& value)
</del><ins>+inline FontSelectionValue StyleBuilderConverter::convertFontWeight(StyleResolver& styleResolver, const CSSValue& value)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(is<CSSPrimitiveValue>(value));
</span><del>- const auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
- if (primitiveValue.isPercentage() || primitiveValue.isNumber()) {
- auto value = primitiveValue.floatValue();
- if (value <= static_cast<float>(FontSelectionValue::maximumValue())
- && value >= static_cast<float>(FontSelectionValue::minimumValue()))
- return FontSelectionValue(value);
- if (value < static_cast<float>(FontSelectionValue::minimumValue()))
- return FontSelectionValue::minimumValue();
- ASSERT(value > static_cast<float>(FontSelectionValue::maximumValue()));
- return FontSelectionValue::maximumValue();
- }
</del><ins>+ auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
</ins><span class="cx">
</span><ins>+ if (primitiveValue.isNumber())
+ return FontSelectionValue::clampFloat(primitiveValue.floatValue());
+
+ ASSERT(primitiveValue.isValueID());
</ins><span class="cx"> switch (primitiveValue.valueID()) {
</span><del>- case CSSValueUltraCondensed:
- return FontSelectionValue(50);
- case CSSValueExtraCondensed:
- return FontSelectionValue(62.5f);
- case CSSValueCondensed:
- return FontSelectionValue(75);
- case CSSValueSemiCondensed:
- return FontSelectionValue(87.5f);
</del><span class="cx"> case CSSValueNormal:
</span><del>- return FontSelectionValue(100);
- case CSSValueSemiExpanded:
- return FontSelectionValue(112.5f);
- case CSSValueExpanded:
- return FontSelectionValue(125);
- case CSSValueExtraExpanded:
- return FontSelectionValue(150);
- case CSSValueUltraExpanded:
- return FontSelectionValue(200);
</del><ins>+ return normalWeightValue();
+ case CSSValueBold:
+ return boldWeightValue();
+ case CSSValueBolder:
+ return FontCascadeDescription::bolderWeight(styleResolver.parentStyle()->fontDescription().weight());
+ case CSSValueLighter:
+ return FontCascadeDescription::lighterWeight(styleResolver.parentStyle()->fontDescription().weight());
</ins><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><del>- return FontSelectionValue(100);
</del><ins>+ return normalWeightValue();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline FontSelectionValue StyleBuilderConverter::convertFontStretch(StyleResolver&, const CSSValue& value)
+{
+ ASSERT(is<CSSPrimitiveValue>(value));
+ const auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+ if (primitiveValue.isPercentage() || primitiveValue.isNumber())
+ return FontSelectionValue::clampFloat(primitiveValue.floatValue());
+
+ ASSERT(primitiveValue.isValueID());
+ if (auto value = fontStretchValue(primitiveValue.valueID()))
+ return value.value();
+ ASSERT_NOT_REACHED();
+ return normalStretchValue();
+}
+
+inline FontSelectionValue StyleBuilderConverter::convertFontStyle(StyleResolver&, const CSSValue& value)
+{
+ ASSERT(is<CSSPrimitiveValue>(value));
+ const auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
+
+ if (primitiveValue.isAngle() || primitiveValue.isNumber() || primitiveValue.isCalculated())
+ return FontSelectionValue::clampFloat(primitiveValue.floatValue(CSSPrimitiveValue::CSS_DEG));
+
+ ASSERT(primitiveValue.isValueID());
+ if (auto value = fontStyleValue(primitiveValue.valueID()))
+ return value.value();
+ ASSERT_NOT_REACHED();
+ return normalItalicValue();
+}
+
</ins><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="cx"> inline FontVariationSettings StyleBuilderConverter::convertFontVariationSettings(StyleResolver&, const CSSValue& value)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderCustom.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderCustom.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/StyleBuilderCustom.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -81,7 +81,6 @@
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(Fill);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(FontFamily);
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(FontSize);
</span><del>- DECLARE_PROPERTY_CUSTOM_HANDLERS(FontWeight);
</del><span class="cx"> #if ENABLE(CSS_IMAGE_RESOLUTION)
</span><span class="cx"> DECLARE_PROPERTY_CUSTOM_HANDLERS(ImageResolution);
</span><span class="cx"> #endif
</span><span class="lines">@@ -1295,42 +1294,6 @@
</span><span class="cx"> svgStyle.setShadow(std::make_unique<ShadowData>(location, blur, 0, Normal, false, color.isValid() ? color : Color::transparent));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void StyleBuilderCustom::applyInitialFontWeight(StyleResolver& styleResolver)
-{
- auto fontDescription = styleResolver.fontDescription();
- fontDescription.setWeight(FontWeightNormal);
- styleResolver.setFontDescription(fontDescription);
-}
-
-inline void StyleBuilderCustom::applyInheritFontWeight(StyleResolver& styleResolver)
-{
- auto fontDescription = styleResolver.fontDescription();
- fontDescription.setWeight(styleResolver.parentFontDescription().weight());
- styleResolver.setFontDescription(fontDescription);
-}
-
-inline void StyleBuilderCustom::applyValueFontWeight(StyleResolver& styleResolver, CSSValue& value)
-{
- auto& primitiveValue = downcast<CSSPrimitiveValue>(value);
- auto fontDescription = styleResolver.fontDescription();
- switch (primitiveValue.valueID()) {
- case CSSValueInvalid:
- ASSERT_NOT_REACHED();
- break;
- case CSSValueBolder:
- fontDescription.setWeight(styleResolver.parentStyle()->fontDescription().weight());
- fontDescription.setWeight(fontDescription.bolderWeight());
- break;
- case CSSValueLighter:
- fontDescription.setWeight(styleResolver.parentStyle()->fontDescription().weight());
- fontDescription.setWeight(fontDescription.lighterWeight());
- break;
- default:
- fontDescription.setWeight(primitiveValue);
- }
- styleResolver.setFontDescription(fontDescription);
-}
-
</del><span class="cx"> inline void StyleBuilderCustom::applyInitialColumnGap(StyleResolver& styleResolver)
</span><span class="cx"> {
</span><span class="cx"> styleResolver.style()->setHasNormalColumnGap();
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserFastPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -559,8 +559,6 @@
</span><span class="cx"> return valueID == CSSValueShow || valueID == CSSValueHide;
</span><span class="cx"> case CSSPropertyFloat: // left | right | none
</span><span class="cx"> return valueID == CSSValueLeft || valueID == CSSValueRight || valueID == CSSValueNone;
</span><del>- case CSSPropertyFontStyle: // normal | italic | oblique
- return valueID == CSSValueNormal || valueID == CSSValueItalic || valueID == CSSValueOblique;
</del><span class="cx"> case CSSPropertyImageRendering: // auto | optimizeContrast | pixelated | optimizeSpeed | crispEdges | optimizeQuality | webkit-crispEdges
</span><span class="cx"> return valueID == CSSValueAuto || valueID == CSSValueOptimizeSpeed || valueID == CSSValueOptimizeQuality || valueID == CSSValueWebkitCrispEdges || valueID == CSSValueWebkitOptimizeContrast || valueID == CSSValueCrispEdges || valueID == CSSValuePixelated;
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="lines">@@ -831,7 +829,6 @@
</span><span class="cx"> case CSSPropertyFlexDirection:
</span><span class="cx"> case CSSPropertyFlexWrap:
</span><span class="cx"> case CSSPropertyFloat:
</span><del>- case CSSPropertyFontStyle:
</del><span class="cx"> case CSSPropertyFontVariantAlternates:
</span><span class="cx"> case CSSPropertyFontVariantCaps:
</span><span class="cx"> case CSSPropertyFontVariantPosition:
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -864,19 +864,30 @@
</span><span class="cx"> return consumeIdent<CSSValueNormal, CSSValueSmallCaps>(range);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSPrimitiveValue> consumeFontWeight(CSSParserTokenRange& range)
</del><ins>+static RefPtr<CSSPrimitiveValue> consumeFontWeightKeywordValue(CSSParserTokenRange& range)
</ins><span class="cx"> {
</span><del>- const CSSParserToken& token = range.peek();
- if (token.id() >= CSSValueNormal && token.id() <= CSSValueLighter)
- return consumeIdent(range);
</del><ins>+ return consumeIdent<CSSValueNormal, CSSValueBold, CSSValueBolder, CSSValueLighter>(range);
+}
+
+static RefPtr<CSSPrimitiveValue> consumeFontWeightCSS21(CSSParserTokenRange& range)
+{
+ if (auto result = consumeFontWeightKeywordValue(range))
+ return result;
</ins><span class="cx"> int weight;
</span><span class="cx"> if (!consumePositiveIntegerRaw(range, weight))
</span><span class="cx"> return nullptr;
</span><del>- if ((weight % 100) || weight < 100 || weight > 900)
</del><ins>+ if (!isCSS21Weight(weight))
</ins><span class="cx"> return nullptr;
</span><del>- return CSSValuePool::singleton().createIdentifierValue(static_cast<CSSValueID>(CSSValue100 + weight / 100 - 1));
</del><ins>+ return CSSValuePool::singleton().createValue(weight, CSSPrimitiveValue::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSPrimitiveValue> consumeFontWeight(CSSParserTokenRange& range)
+{
+ if (auto result = consumeFontWeightKeywordValue(range))
+ return result;
+ return consumeNumber(range, ValueRangeAll);
+}
+
</ins><span class="cx"> static RefPtr<CSSPrimitiveValue> consumeFontStretchKeywordValue(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx"> return consumeIdent<CSSValueUltraCondensed, CSSValueExtraCondensed, CSSValueCondensed, CSSValueSemiCondensed, CSSValueNormal, CSSValueSemiExpanded, CSSValueExpanded, CSSValueExtraExpanded, CSSValueUltraExpanded>(range);
</span><span class="lines">@@ -891,6 +902,28 @@
</span><span class="cx"> return consumeNumber(range, ValueRangeAll);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSPrimitiveValue> consumeFontStyleKeywordValue(CSSParserTokenRange& range)
+{
+ return consumeIdent<CSSValueNormal, CSSValueItalic, CSSValueOblique>(range);
+}
+
+static RefPtr<CSSPrimitiveValue> consumeFontStyle(CSSParserTokenRange& range, CSSParserMode cssParserMode)
+{
+ if (auto result = consumeFontStyleKeywordValue(range)) {
+ if (result->valueID() == CSSValueOblique) {
+ if (range.atEnd())
+ return result;
+ if (auto angle = consumeAngle(range, cssParserMode))
+ return angle;
+ if (auto number = consumeNumber(range, ValueRangeAll))
+ return number;
+ return nullptr;
+ }
+ return result;
+ }
+ return nullptr;
+}
+
</ins><span class="cx"> static String concatenateFamilyName(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx"> StringBuilder builder;
</span><span class="lines">@@ -3666,6 +3699,8 @@
</span><span class="cx"> return consumeFontWeight(m_range);
</span><span class="cx"> case CSSPropertyFontStretch:
</span><span class="cx"> return consumeFontStretch(m_range);
</span><ins>+ case CSSPropertyFontStyle:
+ return consumeFontStyle(m_range, m_context.mode);
</ins><span class="cx"> case CSSPropertyFontSynthesis:
</span><span class="cx"> return consumeFontSynthesis(m_range);
</span><span class="cx"> #if ENABLE(VARIATION_FONTS)
</span><span class="lines">@@ -4184,16 +4219,18 @@
</span><span class="cx"> case CSSPropertyUnicodeRange:
</span><span class="cx"> parsedValue = consumeFontFaceUnicodeRange(m_range);
</span><span class="cx"> break;
</span><ins>+ case CSSPropertyFontWeight:
+ // FIXME: Parse range-based values.
+ parsedValue = consumeFontWeight(m_range);
+ break;
</ins><span class="cx"> case CSSPropertyFontStretch:
</span><ins>+ // FIXME: Parse range-based values.
</ins><span class="cx"> parsedValue = consumeFontStretch(m_range);
</span><span class="cx"> break;
</span><del>- case CSSPropertyFontStyle: {
- CSSValueID id = m_range.consumeIncludingWhitespace().id();
- if (!CSSParserFastPaths::isValidKeywordPropertyAndValue(propId, id, m_context.mode))
- return false;
- parsedValue = CSSValuePool::singleton().createIdentifierValue(id);
</del><ins>+ case CSSPropertyFontStyle:
+ // FIXME: Parse range-based values.
+ parsedValue = consumeFontStyle(m_range, m_context.mode);
</ins><span class="cx"> break;
</span><del>- }
</del><span class="cx"> case CSSPropertyFontVariantCaps:
</span><span class="cx"> parsedValue = consumeFontVariantCaps(m_range);
</span><span class="cx"> break;
</span><span class="lines">@@ -4214,9 +4251,6 @@
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyFontVariant:
</span><span class="cx"> return consumeFontVariantShorthand(false);
</span><del>- case CSSPropertyFontWeight:
- parsedValue = consumeFontWeight(m_range);
- break;
</del><span class="cx"> case CSSPropertyFontFeatureSettings:
</span><span class="cx"> parsedValue = consumeFontFeatureSettings(m_range);
</span><span class="cx"> break;
</span><span class="lines">@@ -4243,8 +4277,8 @@
</span><span class="cx"> if (!fontDescription.isAbsoluteSize())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- addProperty(CSSPropertyFontStyle, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(fontDescription.italic() == FontItalicOn ? CSSValueItalic : CSSValueNormal), important);
- addProperty(CSSPropertyFontWeight, CSSPropertyFont, CSSValuePool::singleton().createValue(fontDescription.weight()), important);
</del><ins>+ addProperty(CSSPropertyFontStyle, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(isItalic(fontDescription.italic()) ? CSSValueItalic : CSSValueNormal), important);
+ addProperty(CSSPropertyFontWeight, CSSPropertyFont, CSSValuePool::singleton().createValue(static_cast<float>(fontDescription.weight())), important);
</ins><span class="cx"> addProperty(CSSPropertyFontSize, CSSPropertyFont, CSSValuePool::singleton().createValue(fontDescription.specifiedSize(), CSSPrimitiveValue::CSS_PX), important);
</span><span class="cx"> Ref<CSSValueList> fontFamilyList = CSSValueList::createCommaSeparated();
</span><span class="cx"> fontFamilyList->append(CSSValuePool::singleton().createFontFamilyValue(fontDescription.familyAt(0), FromSystemFontID::Yes));
</span><span class="lines">@@ -4274,9 +4308,10 @@
</span><span class="cx">
</span><span class="cx"> while (!m_range.atEnd()) {
</span><span class="cx"> CSSValueID id = m_range.peek().id();
</span><del>- if (!fontStyle && CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyFontStyle, id, m_context.mode)) {
- fontStyle = consumeIdent(m_range);
- continue;
</del><ins>+ if (!fontStyle) {
+ fontStyle = consumeFontStyleKeywordValue(m_range);
+ if (fontStyle)
+ continue;
</ins><span class="cx"> }
</span><span class="cx"> if (!fontVariantCaps && (id == CSSValueNormal || id == CSSValueSmallCaps)) {
</span><span class="cx"> // Font variant in the shorthand is particular, it only accepts normal or small-caps.
</span><span class="lines">@@ -4286,7 +4321,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (!fontWeight) {
</span><del>- fontWeight = consumeFontWeight(m_range);
</del><ins>+ fontWeight = consumeFontWeightCSS21(m_range);
</ins><span class="cx"> if (fontWeight)
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/EditingStyle.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/EditingStyle.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/editing/EditingStyle.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1738,28 +1738,18 @@
</span><span class="cx"> if (!is<CSSPrimitiveValue>(fontWeight))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // Because b tag can only bold text, there are only two states in plain html: bold and not bold.
- // Collapse all other values to either one of these two states for editing purposes.
- switch (downcast<CSSPrimitiveValue>(fontWeight).valueID()) {
- case CSSValue100:
- case CSSValue200:
- case CSSValue300:
- case CSSValue400:
- case CSSValue500:
</del><ins>+ auto& primitiveValue = downcast<CSSPrimitiveValue>(fontWeight);
+ switch (primitiveValue.valueID()) {
</ins><span class="cx"> case CSSValueNormal:
</span><span class="cx"> return false;
</span><span class="cx"> case CSSValueBold:
</span><del>- case CSSValue600:
- case CSSValue700:
- case CSSValue800:
- case CSSValue900:
</del><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ASSERT_NOT_REACHED(); // For CSSValueBolder and CSSValueLighter
- return false;
</del><ins>+ ASSERT(primitiveValue.isNumber());
+ return primitiveValue.floatValue() >= static_cast<float>(boldThreshold());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/mac/EditorMac.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/mac/EditorMac.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/editing/mac/EditorMac.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -492,7 +492,7 @@
</span><span class="cx"> Ref<MutableStyleProperties> style = MutableStyleProperties::create();
</span><span class="cx"> style->setProperty(CSSPropertyFontFamily, cssValuePool.createFontFamilyValue(fontFamily));
</span><span class="cx"> style->setProperty(CSSPropertyFontStyle, (fontTraits & NSFontItalicTrait) ? CSSValueItalic : CSSValueNormal);
</span><del>- style->setProperty(CSSPropertyFontWeight, cssValuePool.createValue(fontTraits & NSFontBoldTrait ? FontWeightBold : FontWeightNormal));
</del><ins>+ style->setProperty(CSSPropertyFontWeight, (fontTraits & NSFontBoldTrait) ? CSSValueBold : CSSValueNormal);
</ins><span class="cx"> style->setProperty(CSSPropertyFontSize, cssValuePool.createValue(fontSize, CSSPrimitiveValue::CSS_PX));
</span><span class="cx"> applyStyleToSelection(style.ptr(), EditActionSetFont);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCache.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCache.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontCache.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -188,9 +188,6 @@
</span><span class="cx"> Vector<String> systemFontFamilies();
</span><span class="cx"> void platformInit();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- static float weightOfCTFont(CTFontRef);
-#endif
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> WEBCORE_EXPORT static void setFontWhitelist(const Vector<String>&);
</span><span class="cx"> #endif
</span><span class="lines">@@ -203,11 +200,7 @@
</span><span class="cx">
</span><span class="cx"> // This function exists so CSSFontSelector can have a unified notion of preinstalled fonts and @font-face.
</span><span class="cx"> // It comes into play when you create an @font-face which shares a family name as a preinstalled font.
</span><del>- struct TraitsAndStretch {
- FontTraitsMask traits;
- FontSelectionRange stretch;
- };
- Vector<TraitsAndStretch> getTraitsAndStretchInFamily(const AtomicString&);
</del><ins>+ Vector<FontSelectionCapabilities> getFontSelectionCapabilitiesInFamily(const AtomicString&);
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RefPtr<Font> fontForFamily(const FontDescription&, const AtomicString&, const FontFeatureSettings* fontFaceFeatures = nullptr, const FontVariantSettings* fontFaceVariantSettings = nullptr, bool checkingAlternateName = false);
</span><span class="cx"> WEBCORE_EXPORT Ref<Font> lastResortFallbackFont(const FontDescription&);
</span><span class="lines">@@ -286,13 +279,11 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> RetainPtr<CTFontRef> preparePlatformFont(CTFontRef, TextRenderingMode, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const FontFeatureSettings& features, const FontVariantSettings&, const FontVariationSettings&);
</span><del>-FontWeight fontWeightFromCoreText(CGFloat weight);
-uint16_t toCoreTextFontWeight(FontWeight);
-bool isFontWeightBold(FontWeight);
</del><span class="cx"> SynthesisPair computeNecessarySynthesis(CTFontRef, const FontDescription&, bool isPlatformFont = false);
</span><del>-RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight, CTFontSymbolicTraits, float size);
-RetainPtr<CTFontRef> platformFontWithFamily(const AtomicString& family, CTFontSymbolicTraits, FontWeight, TextRenderingMode, float size);
</del><ins>+RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest, float size);
+RetainPtr<CTFontRef> platformFontWithFamily(const AtomicString& family, FontSelectionRequest, TextRenderingMode, float size);
</ins><span class="cx"> bool requiresCustomFallbackFont(UChar32 character);
</span><ins>+FontSelectionCapabilities capabilitiesForFontDescriptor(CTFontDescriptorRef);
</ins><span class="cx">
</span><span class="cx"> #else
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> m_fontDescription.setSpecifiedSize(CTFontGetSize(fontData.font()));
</span><span class="cx"> m_fontDescription.setComputedSize(CTFontGetSize(fontData.font()));
</span><span class="cx"> m_fontDescription.setIsItalic(CTFontGetSymbolicTraits(fontData.font()) & kCTFontTraitItalic);
</span><del>- m_fontDescription.setWeight((CTFontGetSymbolicTraits(fontData.font()) & kCTFontTraitBold) ? FontWeightBold : FontWeightNormal);
</del><ins>+ m_fontDescription.setWeight((CTFontGetSymbolicTraits(fontData.font()) & kCTFontTraitBold) ? boldWeightValue() : normalWeightValue());
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontCascade.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontCascade.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontCascade.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -164,8 +164,8 @@
</span><span class="cx"> unsigned familyCount() const { return m_fontDescription.familyCount(); }
</span><span class="cx"> const AtomicString& familyAt(unsigned i) const { return m_fontDescription.familyAt(i); }
</span><span class="cx">
</span><del>- FontItalic italic() const { return m_fontDescription.italic(); }
- FontWeight weight() const { return m_fontDescription.weight(); }
</del><ins>+ FontSelectionValue italic() const { return m_fontDescription.italic(); }
+ FontSelectionValue weight() const { return m_fontDescription.weight(); }
</ins><span class="cx"> FontWidthVariant widthVariant() const { return m_fontDescription.widthVariant(); }
</span><span class="cx">
</span><span class="cx"> bool isPlatformFont() const { return m_fonts->isForPlatformFont(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -42,7 +42,8 @@
</span><span class="cx"> char c;
</span><span class="cx"> #endif
</span><span class="cx"> AtomicString string;
</span><del>- float size[2];
</del><ins>+ int16_t fontSelectionRequest[3];
+ float size;
</ins><span class="cx"> unsigned bitfields1;
</span><span class="cx"> unsigned bitfields2 : 22;
</span><span class="cx"> void* array;
</span><span class="lines">@@ -53,11 +54,10 @@
</span><span class="cx"> COMPILE_ASSERT(sizeof(FontCascadeDescription) == sizeof(SameSizeAsFontCascadeDescription), FontCascadeDescription_should_stay_small);
</span><span class="cx">
</span><span class="cx"> FontDescription::FontDescription()
</span><del>- : m_orientation(Horizontal)
</del><ins>+ : m_fontSelectionRequest(FontCascadeDescription::initialWeight(), FontCascadeDescription::initialStretch(), FontCascadeDescription::initialItalic())
+ , m_orientation(Horizontal)
</ins><span class="cx"> , m_nonCJKGlyphOrientation(static_cast<unsigned>(NonCJKGlyphOrientation::Mixed))
</span><span class="cx"> , m_widthVariant(RegularWidth)
</span><del>- , m_italic(FontItalicOff)
- , m_weight(FontWeightNormal)
</del><span class="cx"> , m_renderingMode(static_cast<unsigned>(FontRenderingMode::Normal))
</span><span class="cx"> , m_textRendering(AutoTextRendering)
</span><span class="cx"> , m_script(USCRIPT_COMMON)
</span><span class="lines">@@ -80,13 +80,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontTraitsMask FontDescription::traitsMask() const
-{
- return static_cast<FontTraitsMask>((m_italic ? FontStyleItalicMask : FontStyleNormalMask)
- | (FontWeight100Mask << (m_weight - FontWeight100)));
-
-}
-
</del><span class="cx"> void FontDescription::setLocale(const AtomicString& locale)
</span><span class="cx"> {
</span><span class="cx"> m_locale = locale;
</span><span class="lines">@@ -102,48 +95,26 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontWeight FontCascadeDescription::lighterWeight(void) const
</del><ins>+FontSelectionValue FontCascadeDescription::lighterWeight(FontSelectionValue weight)
</ins><span class="cx"> {
</span><del>- switch (weight()) {
- case FontWeight100:
- case FontWeight200:
- case FontWeight300:
- case FontWeight400:
- case FontWeight500:
- return FontWeight100;
-
- case FontWeight600:
- case FontWeight700:
- return FontWeight400;
-
- case FontWeight800:
- case FontWeight900:
- return FontWeight700;
- }
- ASSERT_NOT_REACHED();
- return FontWeightNormal;
</del><ins>+ if (weight < FontSelectionValue(100))
+ return weight;
+ if (weight < FontSelectionValue(550))
+ return FontSelectionValue(100);
+ if (weight < FontSelectionValue(750))
+ return FontSelectionValue(400);
+ return FontSelectionValue(700);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-FontWeight FontCascadeDescription::bolderWeight(void) const
</del><ins>+FontSelectionValue FontCascadeDescription::bolderWeight(FontSelectionValue weight)
</ins><span class="cx"> {
</span><del>- switch (weight()) {
- case FontWeight100:
- case FontWeight200:
- case FontWeight300:
- return FontWeight400;
-
- case FontWeight400:
- case FontWeight500:
- return FontWeight700;
-
- case FontWeight600:
- case FontWeight700:
- case FontWeight800:
- case FontWeight900:
- return FontWeight900;
- }
- ASSERT_NOT_REACHED();
- return FontWeightNormal;
</del><ins>+ if (weight < FontSelectionValue(350))
+ return FontSelectionValue(400);
+ if (weight < FontSelectionValue(550))
+ return FontSelectionValue(700);
+ if (weight < FontSelectionValue(900))
+ return FontSelectionValue(900);
+ return weight;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TEXT_AUTOSIZING)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -46,12 +46,11 @@
</span><span class="cx"> bool operator!=(const FontDescription& other) const { return !(*this == other); }
</span><span class="cx">
</span><span class="cx"> float computedSize() const { return m_computedSize; }
</span><del>- FontItalic italic() const { return static_cast<FontItalic>(m_italic); }
- FontSelectionValue stretch() const { return m_stretch; }
</del><ins>+ FontSelectionValue italic() const { return m_fontSelectionRequest.slope; }
+ FontSelectionValue stretch() const { return m_fontSelectionRequest.width; }
+ FontSelectionValue weight() const { return m_fontSelectionRequest.weight; }
+ FontSelectionRequest fontSelectionRequest() const { return m_fontSelectionRequest; }
</ins><span class="cx"> int computedPixelSize() const { return int(m_computedSize + 0.5f); }
</span><del>- FontWeight weight() const { return static_cast<FontWeight>(m_weight); }
- FontWeight lighterWeight() const;
- FontWeight bolderWeight() const;
</del><span class="cx"> FontRenderingMode renderingMode() const { return static_cast<FontRenderingMode>(m_renderingMode); }
</span><span class="cx"> TextRenderingMode textRenderingMode() const { return static_cast<TextRenderingMode>(m_textRendering); }
</span><span class="cx"> UScriptCode script() const { return static_cast<UScriptCode>(m_script); }
</span><span class="lines">@@ -98,10 +97,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void setComputedSize(float s) { m_computedSize = clampToFloat(s); }
</span><del>- void setItalic(FontItalic i) { m_italic = i; }
- void setStretch(FontSelectionValue stretch) { m_stretch = stretch; }
- void setIsItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); }
- void setWeight(FontWeight w) { m_weight = w; }
</del><ins>+ void setItalic(FontSelectionValue italic) { m_fontSelectionRequest.slope = italic; }
+ void setStretch(FontSelectionValue stretch) { m_fontSelectionRequest.width = stretch; }
+ void setIsItalic(bool i) { setItalic(i ? italicValue() : normalItalicValue()); }
+ void setWeight(FontSelectionValue weight) { m_fontSelectionRequest.weight = weight; }
</ins><span class="cx"> void setRenderingMode(FontRenderingMode mode) { m_renderingMode = static_cast<unsigned>(mode); }
</span><span class="cx"> void setTextRenderingMode(TextRenderingMode rendering) { m_textRendering = rendering; }
</span><span class="cx"> void setOrientation(FontOrientation orientation) { m_orientation = orientation; }
</span><span class="lines">@@ -129,8 +128,6 @@
</span><span class="cx"> void setVariantEastAsianWidth(FontVariantEastAsianWidth variant) { m_variantEastAsianWidth = static_cast<unsigned>(variant); }
</span><span class="cx"> void setVariantEastAsianRuby(FontVariantEastAsianRuby variant) { m_variantEastAsianRuby = static_cast<unsigned>(variant); }
</span><span class="cx">
</span><del>- FontTraitsMask traitsMask() const;
-
</del><span class="cx"> private:
</span><span class="cx"> // FIXME: Investigate moving these into their own object on the heap (to save memory).
</span><span class="cx"> FontFeatureSettings m_featureSettings;
</span><span class="lines">@@ -137,13 +134,11 @@
</span><span class="cx"> FontVariationSettings m_variationSettings;
</span><span class="cx"> AtomicString m_locale;
</span><span class="cx">
</span><ins>+ FontSelectionRequest m_fontSelectionRequest;
</ins><span class="cx"> float m_computedSize { 0 }; // Computed size adjusted for the minimum font size and the zoom factor.
</span><del>- FontSelectionValue m_stretch { 100 }; // Stretch, or "width," of the font
</del><span class="cx"> unsigned m_orientation : 1; // FontOrientation - Whether the font is rendering on a horizontal line or a vertical line.
</span><span class="cx"> unsigned m_nonCJKGlyphOrientation : 1; // NonCJKGlyphOrientation - Only used by vertical text. Determines the default orientation for non-ideograph glyphs.
</span><span class="cx"> unsigned m_widthVariant : 2; // FontWidthVariant
</span><del>- unsigned m_italic : 1; // FontItalic
- unsigned m_weight : 8; // FontWeight
</del><span class="cx"> unsigned m_renderingMode : 1; // Used to switch between CG and GDI text on Windows.
</span><span class="cx"> unsigned m_textRendering : 2; // TextRenderingMode
</span><span class="cx"> unsigned m_script : 7; // Used to help choose an appropriate font for generic font families.
</span><span class="lines">@@ -168,9 +163,7 @@
</span><span class="cx"> inline bool FontDescription::operator==(const FontDescription& other) const
</span><span class="cx"> {
</span><span class="cx"> return m_computedSize == other.m_computedSize
</span><del>- && m_stretch == other.m_stretch
- && m_italic == other.m_italic
- && m_weight == other.m_weight
</del><ins>+ && m_fontSelectionRequest == other.m_fontSelectionRequest
</ins><span class="cx"> && m_renderingMode == other.m_renderingMode
</span><span class="cx"> && m_textRendering == other.m_textRendering
</span><span class="cx"> && m_orientation == other.m_orientation
</span><span class="lines">@@ -214,8 +207,10 @@
</span><span class="cx">
</span><span class="cx"> float specifiedSize() const { return m_specifiedSize; }
</span><span class="cx"> bool isAbsoluteSize() const { return m_isAbsoluteSize; }
</span><del>- FontWeight lighterWeight() const;
- FontWeight bolderWeight() const;
</del><ins>+ FontSelectionValue lighterWeight() const { return lighterWeight(weight()); }
+ FontSelectionValue bolderWeight() const { return bolderWeight(weight()); }
+ static FontSelectionValue lighterWeight(FontSelectionValue);
+ static FontSelectionValue bolderWeight(FontSelectionValue);
</ins><span class="cx">
</span><span class="cx"> // only use fixed default size when there is only one font family, and that family is "monospace"
</span><span class="cx"> bool useFixedDefaultSize() const { return familyCount() == 1 && firstFamily() == monospaceFamily; }
</span><span class="lines">@@ -265,8 +260,9 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // Initial values for font properties.
</span><del>- static FontItalic initialItalic() { return FontItalicOff; }
- static FontSelectionValue initialStretch() { return FontSelectionValue(100); }
</del><ins>+ static FontSelectionValue initialItalic() { return normalItalicValue(); }
+ static FontSelectionValue initialWeight() { return normalWeightValue(); }
+ static FontSelectionValue initialStretch() { return normalStretchValue(); }
</ins><span class="cx"> static FontSmallCaps initialSmallCaps() { return FontSmallCapsOff; }
</span><span class="cx"> static Kerning initialKerning() { return Kerning::Auto; }
</span><span class="cx"> static FontSmoothingMode initialFontSmoothing() { return AutoSmoothing; }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> if (width.includes(m_request.width))
</span><span class="cx"> return { FontSelectionValue(), m_request.width };
</span><span class="cx">
</span><del>- if (m_request.width >= FontSelectionValue(100)) {
</del><ins>+ if (m_request.width >= normalStretchValue()) {
</ins><span class="cx"> if (width.minimum > m_request.width)
</span><span class="cx"> return { width.minimum - m_request.width, width.minimum };
</span><span class="cx"> ASSERT(width.maximum < m_request.width);
</span><span class="lines">@@ -152,88 +152,4 @@
</span><span class="cx"> return result.value_or(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontSelectionRequest fontSelectionRequestForTraitsMask(FontTraitsMask traitsMask, FontSelectionValue stretch)
-{
- FontSelectionRequest result;
- if (traitsMask & FontWeight100Mask)
- result.weight = FontSelectionValue(100);
- else if (traitsMask & FontWeight200Mask)
- result.weight = FontSelectionValue(200);
- else if (traitsMask & FontWeight300Mask)
- result.weight = FontSelectionValue(300);
- else if (traitsMask & FontWeight400Mask)
- result.weight = FontSelectionValue(400);
- else if (traitsMask & FontWeight500Mask)
- result.weight = FontSelectionValue(500);
- else if (traitsMask & FontWeight600Mask)
- result.weight = FontSelectionValue(600);
- else if (traitsMask & FontWeight700Mask)
- result.weight = FontSelectionValue(700);
- else if (traitsMask & FontWeight800Mask)
- result.weight = FontSelectionValue(800);
- else {
- ASSERT(traitsMask & FontWeight900Mask);
- result.weight = FontSelectionValue(900);
- }
-
- result.width = stretch;
-
- if (traitsMask & FontStyleNormalMask)
- result.slope = FontSelectionValue();
- else {
- ASSERT(traitsMask & FontStyleItalicMask);
- result.slope = italicThreshold();
- }
-
- return result;
</del><span class="cx"> }
</span><del>-
-static FontSelectionCapabilities initialFontSelectionCapabilitiesForTraitsMask(FontTraitsMask traitsMask)
-{
- FontSelectionCapabilities result;
- if (traitsMask & FontWeight100Mask)
- result.weight = { FontSelectionValue(100), FontSelectionValue(100) };
- else if (traitsMask & FontWeight200Mask)
- result.weight = { FontSelectionValue(200), FontSelectionValue(200) };
- else if (traitsMask & FontWeight300Mask)
- result.weight = { FontSelectionValue(300), FontSelectionValue(300) };
- else if (traitsMask & FontWeight400Mask)
- result.weight = { FontSelectionValue(400), FontSelectionValue(400) };
- else if (traitsMask & FontWeight500Mask)
- result.weight = { FontSelectionValue(500), FontSelectionValue(500) };
- else if (traitsMask & FontWeight600Mask)
- result.weight = { FontSelectionValue(600), FontSelectionValue(600) };
- else if (traitsMask & FontWeight700Mask)
- result.weight = { FontSelectionValue(700), FontSelectionValue(700) };
- else if (traitsMask & FontWeight800Mask)
- result.weight = { FontSelectionValue(800), FontSelectionValue(800) };
- else {
- ASSERT(traitsMask & FontWeight900Mask);
- result.weight = { FontSelectionValue(900), FontSelectionValue(900) };
- }
-
- if (traitsMask & FontStyleNormalMask)
- result.slope = { FontSelectionValue(), FontSelectionValue() };
- else {
- ASSERT(traitsMask & FontStyleItalicMask);
- result.slope = { italicThreshold(), italicThreshold() };
- }
-
- return result;
-}
-
-FontSelectionCapabilities fontSelectionCapabilitiesForTraitsMask(FontTraitsMask traitsMask, FontSelectionValue stretch)
-{
- FontSelectionCapabilities result = initialFontSelectionCapabilitiesForTraitsMask(traitsMask);
- result.width = { stretch, stretch };
- return result;
-}
-
-FontSelectionCapabilities fontSelectionCapabilitiesForTraitsMask(FontTraitsMask traitsMask, FontSelectionRange stretch)
-{
- FontSelectionCapabilities result = initialFontSelectionCapabilitiesForTraitsMask(traitsMask);
- result.width = stretch;
- return result;
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontSelectionAlgorithmh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/FontSelectionAlgorithm.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -88,6 +88,15 @@
</span><span class="cx"> return result.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ static FontSelectionValue clampFloat(float value)
+ {
+ if (value < static_cast<float>(FontSelectionValue::minimumValue()))
+ return FontSelectionValue::minimumValue();
+ if (value > static_cast<float>(FontSelectionValue::maximumValue()))
+ return FontSelectionValue::maximumValue();
+ return FontSelectionValue(value);
+ }
+
</ins><span class="cx"> private:
</span><span class="cx"> enum class RawTag { RawTag };
</span><span class="cx">
</span><span class="lines">@@ -161,6 +170,23 @@
</span><span class="cx"> return result.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline bool isItalic(FontSelectionValue fontWeight)
+{
+ return fontWeight >= italicThreshold();
+}
+
+static inline FontSelectionValue normalItalicValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue();
+ return result.get();
+}
+
+static inline FontSelectionValue italicValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(20);
+ return result.get();
+}
+
</ins><span class="cx"> static inline FontSelectionValue boldThreshold()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(600);
</span><span class="lines">@@ -167,6 +193,29 @@
</span><span class="cx"> return result.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline FontSelectionValue boldWeightValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(700);
+ return result.get();
+}
+
+static inline FontSelectionValue normalWeightValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(400);
+ return result.get();
+}
+
+static inline FontSelectionValue lightWeightValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(200);
+ return result.get();
+}
+
+static inline bool isFontWeightBold(FontSelectionValue fontWeight)
+{
+ return fontWeight >= boldThreshold();
+}
+
</ins><span class="cx"> static inline FontSelectionValue weightSearchThreshold()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(500);
</span><span class="lines">@@ -173,6 +222,60 @@
</span><span class="cx"> return result.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline FontSelectionValue ultraCondensedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(50);
+ return result.get();
+}
+
+static inline FontSelectionValue extraCondensedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(62.5f);
+ return result.get();
+}
+
+static inline FontSelectionValue condensedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(75);
+ return result.get();
+}
+
+static inline FontSelectionValue semiCondensedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(87.5f);
+ return result.get();
+}
+
+static inline FontSelectionValue normalStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(100);
+ return result.get();
+}
+
+static inline FontSelectionValue semiExpandedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(112.5f);
+ return result.get();
+}
+
+static inline FontSelectionValue expandedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(125);
+ return result.get();
+}
+
+static inline FontSelectionValue extraExpandedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(150);
+ return result.get();
+}
+
+static inline FontSelectionValue ultraExpandedStretchValue()
+{
+ static NeverDestroyed<FontSelectionValue> result = FontSelectionValue(200);
+ return result.get();
+}
+
</ins><span class="cx"> // [Inclusive, Inclusive]
</span><span class="cx"> struct FontSelectionRange {
</span><span class="cx"> FontSelectionRange(FontSelectionValue minimum, FontSelectionValue maximum)
</span><span class="lines">@@ -214,6 +317,15 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct FontSelectionRequest {
</span><ins>+ FontSelectionRequest() = default;
+
+ FontSelectionRequest(FontSelectionValue weight, FontSelectionValue width, FontSelectionValue slope)
+ : weight(weight)
+ , width(width)
+ , slope(slope)
+ {
+ }
+
</ins><span class="cx"> bool operator==(const FontSelectionRequest& other) const
</span><span class="cx"> {
</span><span class="cx"> return weight == other.weight
</span><span class="lines">@@ -289,9 +401,9 @@
</span><span class="cx"> slope.expand(capabilities.slope);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FontSelectionRange weight { FontSelectionValue(400), FontSelectionValue(400) };
- FontSelectionRange width { FontSelectionValue(100), FontSelectionValue(100) };
- FontSelectionRange slope { FontSelectionValue(), FontSelectionValue() };
</del><ins>+ FontSelectionRange weight { normalWeightValue(), normalWeightValue() };
+ FontSelectionRange width { normalStretchValue(), normalStretchValue() };
+ FontSelectionRange slope { normalItalicValue(), normalItalicValue() };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FontSelectionAlgorithm {
</span><span class="lines">@@ -358,8 +470,4 @@
</span><span class="cx"> std::unique_ptr<bool[]> m_filter;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-FontSelectionRequest fontSelectionRequestForTraitsMask(FontTraitsMask, FontSelectionValue stretch);
-FontSelectionCapabilities fontSelectionCapabilitiesForTraitsMask(FontTraitsMask, FontSelectionValue stretch);
-FontSelectionCapabilities fontSelectionCapabilitiesForTraitsMask(FontTraitsMask, FontSelectionRange stretch);
-
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -551,83 +551,6 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontWeight fontWeightFromCoreText(CGFloat weight)
-{
- if (weight < -0.6)
- return FontWeight100;
- if (weight < -0.365)
- return FontWeight200;
- if (weight < -0.115)
- return FontWeight300;
- if (weight < 0.130)
- return FontWeight400;
- if (weight < 0.235)
- return FontWeight500;
- if (weight < 0.350)
- return FontWeight600;
- if (weight < 0.500)
- return FontWeight700;
- if (weight < 0.700)
- return FontWeight800;
- return FontWeight900;
-}
-
-static inline FontTraitsMask toTraitsMask(CTFontSymbolicTraits ctFontTraits, CGFloat weight)
-{
- FontTraitsMask weightMask;
- switch (fontWeightFromCoreText(weight)) {
- case FontWeight100:
- weightMask = FontWeight100Mask;
- break;
- case FontWeight200:
- weightMask = FontWeight200Mask;
- break;
- case FontWeight300:
- weightMask = FontWeight300Mask;
- break;
- case FontWeight400:
- weightMask = FontWeight400Mask;
- break;
- case FontWeight500:
- weightMask = FontWeight500Mask;
- break;
- case FontWeight600:
- weightMask = FontWeight600Mask;
- break;
- case FontWeight700:
- weightMask = FontWeight700Mask;
- break;
- case FontWeight800:
- weightMask = FontWeight800Mask;
- break;
- case FontWeight900:
- weightMask = FontWeight900Mask;
- break;
- }
- return static_cast<FontTraitsMask>(((ctFontTraits & kCTFontTraitItalic) ? FontStyleItalicMask : FontStyleNormalMask) | weightMask);
-}
-
-bool isFontWeightBold(FontWeight fontWeight)
-{
- return fontWeight >= FontWeight600;
-}
-
-uint16_t toCoreTextFontWeight(FontWeight fontWeight)
-{
- static const int coreTextFontWeights[] = {
- 100, // FontWeight100
- 200, // FontWeight200
- 300, // FontWeight300
- 400, // FontWeight400
- 500, // FontWeight500
- 600, // FontWeight600
- 700, // FontWeight700
- 800, // FontWeight800
- 900, // FontWeight900
- };
- return coreTextFontWeights[fontWeight];
-}
-
</del><span class="cx"> RefPtr<Font> FontCache::similarFont(const FontDescription& description, const AtomicString& family)
</span><span class="cx"> {
</span><span class="cx"> // Attempt to find an appropriate font using a match based on the presence of keywords in
</span><span class="lines">@@ -672,42 +595,9 @@
</span><span class="cx"> ASSERT_UNUSED(success, success);
</span><span class="cx"> return FontSelectionValue(ctWidth < 0.5 ? ctWidth * 50 + 100 : ctWidth * 150 + 50);
</span><span class="cx"> }
</span><del>- return FontSelectionValue(100);
</del><ins>+ return normalStretchValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-auto FontCache::getTraitsAndStretchInFamily(const AtomicString& familyName) -> Vector<TraitsAndStretch>
-{
- auto familyNameStr = familyName.string().createCFString();
- CFTypeRef keys[] = { kCTFontFamilyNameAttribute };
- CFTypeRef values[] = { familyNameStr.get() };
- auto attributes = adoptCF(CFDictionaryCreate(kCFAllocatorDefault, keys, values, WTF_ARRAY_LENGTH(keys), &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
- auto fontDescriptor = adoptCF(CTFontDescriptorCreateWithAttributes(attributes.get()));
- auto matchedDescriptors = adoptCF(CTFontDescriptorCreateMatchingFontDescriptors(fontDescriptor.get(), nullptr));
- if (!matchedDescriptors)
- return { };
-
- CFIndex numMatches = CFArrayGetCount(matchedDescriptors.get());
- if (!numMatches)
- return { };
-
- Vector<TraitsAndStretch> result;
- result.reserveInitialCapacity(numMatches);
- for (CFIndex i = 0; i < numMatches; ++i) {
- auto traits = adoptCF((CFDictionaryRef)CTFontDescriptorCopyAttribute((CTFontDescriptorRef)CFArrayGetValueAtIndex(matchedDescriptors.get(), i), kCTFontTraitsAttribute));
- CFNumberRef resultRef = (CFNumberRef)CFDictionaryGetValue(traits.get(), kCTFontSymbolicTrait);
- CFNumberRef weightRef = (CFNumberRef)CFDictionaryGetValue(traits.get(), kCTFontWeightTrait);
- if (resultRef && weightRef) {
- CTFontSymbolicTraits symbolicTraits;
- CFNumberGetValue(resultRef, kCFNumberIntType, &symbolicTraits);
- CGFloat weight = 0;
- CFNumberGetValue(weightRef, kCFNumberCGFloatType, &weight);
- auto stretch = stretchFromCoreTextTraits(traits.get());
- result.uncheckedAppend({ toTraitsMask(symbolicTraits, weight), { stretch, stretch } });
- }
- }
- return result;
-}
-
</del><span class="cx"> static void invalidateFontCache();
</span><span class="cx">
</span><span class="cx"> static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCenterRef, void* observer, CFStringRef name, const void *, CFDictionaryRef)
</span><span class="lines">@@ -801,7 +691,28 @@
</span><span class="cx"> return family[0] == '.';
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !SHOULD_USE_CORE_TEXT_FONT_LOOKUP
</del><ins>+#if SHOULD_USE_CORE_TEXT_FONT_LOOKUP
+static FontSelectionValue fontWeightFromCoreText(CGFloat weight)
+{
+ if (weight < -0.6)
+ return FontSelectionValue(100);
+ if (weight < -0.365)
+ return FontSelectionValue(200);
+ if (weight < -0.115)
+ return FontSelectionValue(300);
+ if (weight < 0.130)
+ return FontSelectionValue(400);
+ if (weight < 0.235)
+ return FontSelectionValue(500);
+ if (weight < 0.350)
+ return FontSelectionValue(600);
+ if (weight < 0.500)
+ return FontSelectionValue(700);
+ if (weight < 0.700)
+ return FontSelectionValue(800);
+ return FontSelectionValue(900);
+}
+#endif
</ins><span class="cx">
</span><span class="cx"> class FontDatabase {
</span><span class="cx"> public:
</span><span class="lines">@@ -899,49 +810,62 @@
</span><span class="cx"> m_postScriptNameToFontDescriptors.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static FontSelectionCapabilities capabilitiesForFontDescriptor(CTFontDescriptorRef fontDescriptor)
- {
- if (!fontDescriptor)
- return { };
</del><ins>+private:
+ friend class NeverDestroyed<FontDatabase>;
</ins><span class="cx">
</span><del>- auto traits = adoptCF(static_cast<CFDictionaryRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontTraitsAttribute)));
- FontSelectionValue width;
- FontSelectionValue slant;
- FontSelectionValue weight;
- if (traits) {
- width = stretchFromCoreTextTraits(traits.get());
</del><ins>+ FontDatabase() = default;
</ins><span class="cx">
</span><del>- auto symbolicTraitsNumber = static_cast<CFNumberRef>(CFDictionaryGetValue(traits.get(), kCTFontSymbolicTrait));
- if (symbolicTraitsNumber) {
- int32_t symbolicTraits;
- auto success = CFNumberGetValue(symbolicTraitsNumber, kCFNumberSInt32Type, &symbolicTraits);
- ASSERT_UNUSED(success, success);
- slant = symbolicTraits & kCTFontTraitItalic ? italicThreshold() : FontSelectionValue();
- }
</del><ins>+ HashMap<String, InstalledFontFamily> m_familyNameToFontDescriptors;
+ HashMap<String, InstalledFont> m_postScriptNameToFontDescriptors;
+};
+
+FontSelectionCapabilities capabilitiesForFontDescriptor(CTFontDescriptorRef fontDescriptor)
+{
+ if (!fontDescriptor)
+ return { };
+
+ auto traits = adoptCF(static_cast<CFDictionaryRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontTraitsAttribute)));
+ FontSelectionValue width;
+ FontSelectionValue slant;
+ FontSelectionValue weight;
+ if (traits) {
+ width = stretchFromCoreTextTraits(traits.get());
+
+ auto symbolicTraitsNumber = static_cast<CFNumberRef>(CFDictionaryGetValue(traits.get(), kCTFontSymbolicTrait));
+ if (symbolicTraitsNumber) {
+ int32_t symbolicTraits;
+ auto success = CFNumberGetValue(symbolicTraitsNumber, kCFNumberSInt32Type, &symbolicTraits);
+ ASSERT_UNUSED(success, success);
+ slant = symbolicTraits & kCTFontTraitItalic ? italicValue() : normalItalicValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- auto weightNumber = adoptCF(static_cast<CFNumberRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontCSSWeightAttribute)));
</del><ins>+#if SHOULD_USE_CORE_TEXT_FONT_LOOKUP
+ auto weightNumber = static_cast<CFNumberRef>(CFDictionaryGetValue(traits.get(), kCTFontWeightTrait));
</ins><span class="cx"> if (weightNumber) {
</span><del>- float cssWeight;
- auto success = CFNumberGetValue(weightNumber.get(), kCFNumberFloatType, &cssWeight);
</del><ins>+ CGFloat ctWeight;
+ auto success = CFNumberGetValue(weightNumber, kCFNumberCGFloatType, &ctWeight);
</ins><span class="cx"> ASSERT_UNUSED(success, success);
</span><del>- weight = FontSelectionValue(cssWeight);
</del><ins>+ weight = fontWeightFromCoreText(ctWeight);
</ins><span class="cx"> }
</span><ins>+#endif
+ }
</ins><span class="cx">
</span><del>- // FIXME: Educate this function about font variations.
-
- return { { weight, weight }, { width, width }, { slant, slant } };
</del><ins>+#if !SHOULD_USE_CORE_TEXT_FONT_LOOKUP
+ auto weightNumber = adoptCF(static_cast<CFNumberRef>(CTFontDescriptorCopyAttribute(fontDescriptor, kCTFontCSSWeightAttribute)));
+ if (weightNumber) {
+ float cssWeight;
+ auto success = CFNumberGetValue(weightNumber.get(), kCFNumberFloatType, &cssWeight);
+ ASSERT_UNUSED(success, success);
+ weight = FontSelectionValue(cssWeight);
</ins><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>-private:
- friend class NeverDestroyed<FontDatabase>;
</del><ins>+ // FIXME: Educate this function about font variations.
</ins><span class="cx">
</span><del>- FontDatabase() = default;
</del><ins>+ return { { weight, weight }, { width, width }, { slant, slant } };
+}
</ins><span class="cx">
</span><del>- HashMap<String, InstalledFontFamily> m_familyNameToFontDescriptors;
- HashMap<String, InstalledFont> m_postScriptNameToFontDescriptors;
-};
-
</del><ins>+#if !SHOULD_USE_CORE_TEXT_FONT_LOOKUP
</ins><span class="cx"> static const FontDatabase::InstalledFont* findClosestFont(const FontDatabase::InstalledFontFamily& familyFonts, FontSelectionRequest fontSelectionRequest)
</span><span class="cx"> {
</span><span class="cx"> Vector<FontSelectionCapabilities> capabilities;
</span><span class="lines">@@ -951,57 +875,22 @@
</span><span class="cx"> FontSelectionAlgorithm fontSelectionAlgorithm(fontSelectionRequest, capabilities, familyFonts.capabilities);
</span><span class="cx"> return &familyFonts.installedFonts[fontSelectionAlgorithm.indexOfBestCapabilities()];
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><del>-static FontSelectionRequest calculateFontSelectionRequest(CTFontSymbolicTraits requestedTraits, FontWeight weight, FontSelectionValue stretch)
</del><ins>+Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomicString& familyName)
</ins><span class="cx"> {
</span><del>- FontSelectionRequest result;
- switch (weight) {
- case FontWeight100:
- result.weight = FontSelectionValue(100);
- break;
- case FontWeight200:
- result.weight = FontSelectionValue(200);
- break;
- case FontWeight300:
- result.weight = FontSelectionValue(300);
- break;
- case FontWeight400:
- result.weight = FontSelectionValue(400);
- break;
- case FontWeight500:
- result.weight = FontSelectionValue(500);
- break;
- case FontWeight600:
- result.weight = FontSelectionValue(600);
- break;
- case FontWeight700:
- result.weight = FontSelectionValue(700);
- break;
- case FontWeight800:
- result.weight = FontSelectionValue(800);
- break;
- case FontWeight900:
- result.weight = FontSelectionValue(900);
- break;
- default:
- ASSERT_NOT_REACHED();
- result.weight = FontSelectionValue(400);
- break;
- }
</del><ins>+ const auto& fonts = FontDatabase::singleton().collectionForFamily(familyName.string());
+ if (fonts.isEmpty())
+ return { };
</ins><span class="cx">
</span><del>- result.width = stretch;
-
- if (requestedTraits & kCTFontTraitItalic)
- result.slope = italicThreshold();
- else
- result.slope = FontSelectionValue();
-
</del><ins>+ Vector<FontSelectionCapabilities> result;
+ result.reserveInitialCapacity(fonts.size());
+ for (const auto& font : fonts.installedFonts)
+ result.uncheckedAppend(font.capabilities);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // !SHOULD_USE_CORE_TEXT_FONT_LOOKUP
-
-static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, CTFontSymbolicTraits requestedTraits, FontWeight weight, FontSelectionValue stretch, float size)
</del><ins>+static RetainPtr<CTFontRef> platformFontLookupWithFamily(const AtomicString& family, FontSelectionRequest request, float size)
</ins><span class="cx"> {
</span><span class="cx"> const auto& whitelist = fontWhitelist();
</span><span class="cx"> if (!isSystemFont(family) && whitelist.size() && !whitelist.contains(family))
</span><span class="lines">@@ -1008,8 +897,8 @@
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> #if SHOULD_USE_CORE_TEXT_FONT_LOOKUP
</span><del>- UNUSED_PARAM(stretch);
- return adoptCF(CTFontCreateForCSS(family.string().createCFString().get(), toCoreTextFontWeight(weight), requestedTraits, size));
</del><ins>+ CTFontSymbolicTraits traits = (isFontWeightBold(request.weight) ? kCTFontTraitBold : 0) | (isItalic(request.slope) ? kCTFontTraitItalic : 0);
+ return adoptCF(CTFontCreateForCSS(family.string().createCFString().get(), static_cast<float>(request.weight), traits, size));
</ins><span class="cx"> #else
</span><span class="cx"> const auto& familyFonts = FontDatabase::singleton().collectionForFamily(family.string());
</span><span class="cx"> if (familyFonts.isEmpty()) {
</span><span class="lines">@@ -1023,8 +912,8 @@
</span><span class="cx"> const auto& postScriptFont = FontDatabase::singleton().fontForPostScriptName(family);
</span><span class="cx"> if (!postScriptFont.fontDescriptor)
</span><span class="cx"> return nullptr;
</span><del>- if (((requestedTraits & kCTFontTraitItalic) && postScriptFont.capabilities.slope.maximum < italicThreshold())
- || (weight >= FontWeight600 && postScriptFont.capabilities.weight.maximum < boldThreshold())) {
</del><ins>+ if ((isItalic(request.slope) && !isItalic(postScriptFont.capabilities.slope.maximum))
+ || (isFontWeightBold(request.weight) && !isFontWeightBold(postScriptFont.capabilities.weight.maximum))) {
</ins><span class="cx"> auto postScriptFamilyName = adoptCF(static_cast<CFStringRef>(CTFontDescriptorCopyAttribute(postScriptFont.fontDescriptor.get(), kCTFontFamilyNameAttribute)));
</span><span class="cx"> if (!postScriptFamilyName)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1031,7 +920,7 @@
</span><span class="cx"> const auto& familyFonts = FontDatabase::singleton().collectionForFamily(String(postScriptFamilyName.get()));
</span><span class="cx"> if (familyFonts.isEmpty())
</span><span class="cx"> return nullptr;
</span><del>- if (const auto* installedFont = findClosestFont(familyFonts, calculateFontSelectionRequest(requestedTraits, weight, stretch))) {
</del><ins>+ if (const auto* installedFont = findClosestFont(familyFonts, request)) {
</ins><span class="cx"> if (!installedFont->fontDescriptor)
</span><span class="cx"> return nullptr;
</span><span class="cx"> return adoptCF(CTFontCreateWithFontDescriptor(installedFont->fontDescriptor.get(), size, nullptr));
</span><span class="lines">@@ -1041,7 +930,7 @@
</span><span class="cx"> return adoptCF(CTFontCreateWithFontDescriptor(postScriptFont.fontDescriptor.get(), size, nullptr));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (const auto* installedFont = findClosestFont(familyFonts, calculateFontSelectionRequest(requestedTraits, weight, stretch)))
</del><ins>+ if (const auto* installedFont = findClosestFont(familyFonts, request))
</ins><span class="cx"> return adoptCF(CTFontCreateWithFontDescriptor(installedFont->fontDescriptor.get(), size, nullptr));
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -1057,21 +946,19 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !SHOULD_USE_CORE_TEXT_FONT_LOOKUP
</del><span class="cx"> FontDatabase::singleton().clear();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> FontCache::singleton().invalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, CTFontSymbolicTraits desiredTraits, FontWeight weight, FontSelectionValue stretch, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
</del><ins>+static RetainPtr<CTFontRef> fontWithFamily(const AtomicString& family, FontSelectionRequest request, const FontFeatureSettings& featureSettings, const FontVariantSettings& variantSettings, const FontVariationSettings& variationSettings, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings, const TextRenderingMode& textRenderingMode, float size)
</ins><span class="cx"> {
</span><span class="cx"> if (family.isEmpty())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- auto foundFont = platformFontWithFamilySpecialCase(family, weight, desiredTraits, size);
</del><ins>+ auto foundFont = platformFontWithFamilySpecialCase(family, request, size);
</ins><span class="cx"> if (!foundFont)
</span><del>- foundFont = platformFontLookupWithFamily(family, desiredTraits, weight, stretch, size);
</del><ins>+ foundFont = platformFontLookupWithFamily(family, request, size);
</ins><span class="cx"> return preparePlatformFont(foundFont.get(), textRenderingMode, fontFaceFeatures, fontFaceVariantSettings, featureSettings, variantSettings, variationSettings);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1109,10 +996,9 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription, const AtomicString& family, const FontFeatureSettings* fontFaceFeatures, const FontVariantSettings* fontFaceVariantSettings)
</span><span class="cx"> {
</span><del>- CTFontSymbolicTraits traits = computeTraits(fontDescription);
</del><span class="cx"> float size = fontDescription.computedPixelSize();
</span><span class="cx">
</span><del>- auto font = fontWithFamily(family, traits, fontDescription.weight(), fontDescription.stretch(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</del><ins>+ auto font = fontWithFamily(family, fontDescription.fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> if (!font) {
</span><span class="lines">@@ -1123,7 +1009,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.stretch(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</del><ins>+ font = fontWithFamily(family, fontDescription.fontSelectionRequest(), fontDescription.featureSettings(), fontDescription.variantSettings(), fontDescription.variationSettings(), fontFaceFeatures, fontFaceVariantSettings, fontDescription.textRenderingMode(), size);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -1161,7 +1047,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontWeight fontWeight, const AtomicString& locale, const UChar* characters, unsigned length)
</del><ins>+static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontSelectionValue fontWeight, const AtomicString& locale, const UChar* characters, unsigned length)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(length > 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontCacheFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontCacheFreeType.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-auto FontCache::getTraitsAndStretchInFamily(const AtomicString& familyName) -> Vector<TraitsAndStretch>
</del><ins>+Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomicString& familyName)
</ins><span class="cx"> {
</span><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="lines">@@ -163,31 +163,25 @@
</span><span class="cx"> return "";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static int fontWeightToFontconfigWeight(FontWeight weight)
</del><ins>+static int fontWeightToFontconfigWeight(FontSelectionValue weight)
</ins><span class="cx"> {
</span><del>- switch (weight) {
- case FontWeight100:
</del><ins>+ if (weight < FontSelectionValue(150))
</ins><span class="cx"> return FC_WEIGHT_THIN;
</span><del>- case FontWeight200:
</del><ins>+ if (weight < FontSelectionValue(250))
</ins><span class="cx"> return FC_WEIGHT_ULTRALIGHT;
</span><del>- case FontWeight300:
</del><ins>+ if (weight < FontSelectionValue(350))
</ins><span class="cx"> return FC_WEIGHT_LIGHT;
</span><del>- case FontWeight400:
</del><ins>+ if (weight < FontSelectionValue(450))
</ins><span class="cx"> return FC_WEIGHT_REGULAR;
</span><del>- case FontWeight500:
</del><ins>+ if (weight < FontSelectionValue(550))
</ins><span class="cx"> return FC_WEIGHT_MEDIUM;
</span><del>- case FontWeight600:
</del><ins>+ if (weight < FontSelectionValue(650))
</ins><span class="cx"> return FC_WEIGHT_SEMIBOLD;
</span><del>- case FontWeight700:
</del><ins>+ if (weight < FontSelectionValue(750))
</ins><span class="cx"> return FC_WEIGHT_BOLD;
</span><del>- case FontWeight800:
</del><ins>+ if (weight < FontSelectionValue(850))
</ins><span class="cx"> return FC_WEIGHT_EXTRABOLD;
</span><del>- case FontWeight900:
- return FC_WEIGHT_ULTRABLACK;
- default:
- ASSERT_NOT_REACHED();
- return FC_WEIGHT_REGULAR;
- }
</del><ins>+ return FC_WEIGHT_ULTRABLACK;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // This is based on Chromium BSD code from Skia (src/ports/SkFontMgr_fontconfig.cpp). It is a
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsfreetypeFontPlatformDataFreeTypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/freetype/FontPlatformDataFreeType.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> m_fixedWidth = true;
</span><span class="cx">
</span><span class="cx"> bool descriptionAllowsSyntheticBold = fontDescription.fontSynthesis() & FontSynthesisWeight;
</span><del>- if (descriptionAllowsSyntheticBold && fontDescription.weight() >= FontWeightBold) {
</del><ins>+ if (descriptionAllowsSyntheticBold && isFontWeightBold(fontDescription.weight())) {
</ins><span class="cx"> // The FC_EMBOLDEN property instructs us to fake the boldness of the font.
</span><span class="cx"> FcBool fontConfigEmbolden = FcFalse;
</span><span class="cx"> if (FcPatternGetBool(pattern, FC_EMBOLDEN, 0, &fontConfigEmbolden) == FcResultMatch)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsiosFontCacheIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -79,26 +79,15 @@
</span><span class="cx"> return *fontForFamily(fontDescription, AtomicString(".PhoneFallback", AtomicString::ConstructFromLiteral));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-float FontCache::weightOfCTFont(CTFontRef font)
</del><ins>+static RetainPtr<CTFontDescriptorRef> baseSystemFontDescriptor(FontSelectionValue weight, bool bold, float size)
</ins><span class="cx"> {
</span><del>- RetainPtr<CFDictionaryRef> traits = adoptCF(CTFontCopyTraits(font));
-
- CFNumberRef resultRef = (CFNumberRef)CFDictionaryGetValue(traits.get(), kCTFontWeightTrait);
- float result = 0;
- CFNumberGetValue(resultRef, kCFNumberFloatType, &result);
-
- return result;
-}
-
-static RetainPtr<CTFontDescriptorRef> baseSystemFontDescriptor(FontWeight weight, bool bold, float size)
-{
</del><span class="cx"> CTFontUIFontType fontType = kCTFontUIFontSystem;
</span><del>- if (weight > FontWeight300) {
</del><ins>+ if (weight >= FontSelectionValue(350)) {
</ins><span class="cx"> if (bold)
</span><span class="cx"> fontType = kCTFontUIFontEmphasizedSystem;
</span><del>- } else if (weight > FontWeight200)
</del><ins>+ } else if (weight >= FontSelectionValue(250))
</ins><span class="cx"> fontType = static_cast<CTFontUIFontType>(kCTFontUIFontSystemLight);
</span><del>- else if (weight > FontWeight100)
</del><ins>+ else if (weight >= FontSelectionValue(150))
</ins><span class="cx"> fontType = static_cast<CTFontUIFontType>(kCTFontUIFontSystemThin);
</span><span class="cx"> else
</span><span class="cx"> fontType = static_cast<CTFontUIFontType>(kCTFontUIFontSystemUltraLight);
</span><span class="lines">@@ -106,23 +95,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</span><del>-static RetainPtr<NSDictionary> systemFontModificationAttributes(FontWeight weight, bool italic)
</del><ins>+static RetainPtr<NSDictionary> systemFontModificationAttributes(FontSelectionValue weight, bool italic)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<NSMutableDictionary> traitsDictionary = adoptNS([[NSMutableDictionary alloc] init]);
</span><span class="cx">
</span><del>- ASSERT(weight >= FontWeight100 && weight <= FontWeight900);
- float ctWeights[] = {
- static_cast<float>(kCTFontWeightUltraLight),
- static_cast<float>(kCTFontWeightThin),
- static_cast<float>(kCTFontWeightLight),
- static_cast<float>(kCTFontWeightRegular),
- static_cast<float>(kCTFontWeightMedium),
- static_cast<float>(kCTFontWeightSemibold),
- static_cast<float>(kCTFontWeightBold),
- static_cast<float>(kCTFontWeightHeavy),
- static_cast<float>(kCTFontWeightBlack)
- };
- [traitsDictionary setObject:[NSNumber numberWithFloat:ctWeights[weight]] forKey:static_cast<NSString *>(kCTFontWeightTrait)];
</del><ins>+ float ctWeight = kCTFontWeightRegular;
+ if (weight < FontSelectionValue(150))
+ ctWeight = kCTFontWeightUltraLight;
+ else if (weight < FontSelectionValue(250))
+ ctWeight = kCTFontWeightThin;
+ else if (weight < FontSelectionValue(350))
+ ctWeight = kCTFontWeightLight;
+ else if (weight < FontSelectionValue(450))
+ ctWeight = kCTFontWeightRegular;
+ else if (weight < FontSelectionValue(550))
+ ctWeight = kCTFontWeightMedium;
+ else if (weight < FontSelectionValue(650))
+ ctWeight = kCTFontWeightSemibold;
+ else if (weight < FontSelectionValue(750))
+ ctWeight = kCTFontWeightBold;
+ else if (weight < FontSelectionValue(850))
+ ctWeight = kCTFontWeightHeavy;
+ else
+ ctWeight = kCTFontWeightBlack;
+ [traitsDictionary setObject:[NSNumber numberWithFloat:ctWeight] forKey:static_cast<NSString *>(kCTFontWeightTrait)];
</ins><span class="cx">
</span><span class="cx"> [traitsDictionary setObject:@YES forKey:static_cast<NSString *>(kCTFontUIFontDesignTrait)];
</span><span class="cx">
</span><span class="lines">@@ -133,7 +129,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontWeight weight, bool bold, bool italic, float size)
</del><ins>+static RetainPtr<CTFontDescriptorRef> systemFontDescriptor(FontSelectionValue weight, bool bold, bool italic, float size)
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = baseSystemFontDescriptor(weight, bold, size);
</span><span class="cx"> #if __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000
</span><span class="lines">@@ -146,10 +142,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, CTFontSymbolicTraits traits, float size)
</del><ins>+RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest request, float size)
</ins><span class="cx"> {
</span><span class="cx"> if (family.startsWith("UICTFontTextStyle")) {
</span><del>- traits &= (kCTFontBoldTrait | kCTFontItalicTrait);
</del><ins>+ CTFontSymbolicTraits traits = (isFontWeightBold(request.weight) ? kCTFontTraitBold : 0) | (isItalic(request.slope) ? kCTFontTraitItalic : 0);
</ins><span class="cx"> RetainPtr<CFStringRef> familyNameStr = family.string().createCFString();
</span><span class="cx"> RetainPtr<CTFontDescriptorRef> fontDescriptor = adoptCF(CTFontDescriptorCreateWithTextStyle(familyNameStr.get(), RenderThemeIOS::contentSizeCategory(), nullptr));
</span><span class="cx"> if (traits)
</span><span class="lines">@@ -159,7 +155,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font") || equalLettersIgnoringASCIICase(family, "system-ui")) {
</span><del>- return adoptCF(CTFontCreateWithFontDescriptor(systemFontDescriptor(weight, traits & kCTFontTraitBold, traits & kCTFontTraitItalic, size).get(), size, nullptr));
</del><ins>+ return adoptCF(CTFontCreateWithFontDescriptor(systemFontDescriptor(request.weight, isFontWeightBold(request.weight), isItalic(request.slope), size).get(), size, nullptr));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (equalLettersIgnoringASCIICase(family, "-apple-system-monospaced-numbers")) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCacheMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -52,28 +52,35 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><del>-static CGFloat toNSFontWeight(FontWeight fontWeight)
</del><ins>+static CGFloat toNSFontWeight(FontSelectionValue fontWeight)
</ins><span class="cx"> {
</span><del>- static const CGFloat nsFontWeights[] = {
- NSFontWeightUltraLight,
- NSFontWeightThin,
- NSFontWeightLight,
- NSFontWeightRegular,
- NSFontWeightMedium,
- NSFontWeightSemibold,
- NSFontWeightBold,
- NSFontWeightHeavy,
- NSFontWeightBlack
- };
- ASSERT(fontWeight >= 0 && fontWeight <= 8);
- return nsFontWeights[fontWeight];
</del><ins>+ if (fontWeight < FontSelectionValue(150))
+ return NSFontWeightUltraLight;
+ if (fontWeight < FontSelectionValue(250))
+ return NSFontWeightThin;
+ if (fontWeight < FontSelectionValue(350))
+ return NSFontWeightLight;
+ if (fontWeight < FontSelectionValue(450))
+ return NSFontWeightRegular;
+ if (fontWeight < FontSelectionValue(550))
+ return NSFontWeightMedium;
+ if (fontWeight < FontSelectionValue(650))
+ return NSFontWeightSemibold;
+ if (fontWeight < FontSelectionValue(750))
+ return NSFontWeightBold;
+ if (fontWeight < FontSelectionValue(850))
+ return NSFontWeightHeavy;
+ return NSFontWeightBlack;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, CTFontSymbolicTraits desiredTraits, float size)
</del><ins>+RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontSelectionRequest request, float size)
</ins><span class="cx"> {
</span><span class="cx"> if (equalLettersIgnoringASCIICase(family, "-webkit-system-font") || equalLettersIgnoringASCIICase(family, "-apple-system") || equalLettersIgnoringASCIICase(family, "-apple-system-font") || equalLettersIgnoringASCIICase(family, "system-ui")) {
</span><del>- RetainPtr<CTFontRef> result = toCTFont([NSFont systemFontOfSize:size weight:toNSFontWeight(weight)]);
- if (desiredTraits & kCTFontItalicTrait) {
</del><ins>+ RetainPtr<CTFontRef> result = toCTFont([NSFont systemFontOfSize:size weight:toNSFontWeight(request.weight)]);
+ if (isItalic(request.slope)) {
+ CTFontSymbolicTraits desiredTraits = kCTFontItalicTrait;
+ if (isFontWeightBold(request.weight))
+ desiredTraits |= kCTFontBoldTrait;
</ins><span class="cx"> if (auto italicizedFont = adoptCF(CTFontCreateCopyWithSymbolicTraits(result.get(), size, nullptr, desiredTraits, desiredTraits)))
</span><span class="cx"> result = italicizedFont;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicswinFontCacheWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/graphics/win/FontCacheWin.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -398,20 +398,25 @@
</span><span class="cx"> return *simpleFont;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static LONG toGDIFontWeight(FontWeight fontWeight)
</del><ins>+static LONG toGDIFontWeight(FontSelectionValue fontWeight)
</ins><span class="cx"> {
</span><del>- static LONG gdiFontWeights[] = {
- FW_THIN, // FontWeight100
- FW_EXTRALIGHT, // FontWeight200
- FW_LIGHT, // FontWeight300
- FW_NORMAL, // FontWeight400
- FW_MEDIUM, // FontWeight500
- FW_SEMIBOLD, // FontWeight600
- FW_BOLD, // FontWeight700
- FW_EXTRABOLD, // FontWeight800
- FW_HEAVY // FontWeight900
- };
- return gdiFontWeights[fontWeight];
</del><ins>+ if (fontWeight < FontSelectionValue(150))
+ return FW_THIN;
+ if (fontWeight < FontSelectionValue(250))
+ return FW_EXTRALIGHT;
+ if (fontWeight < FontSelectionValue(350))
+ return FW_LIGHT;
+ if (fontWeight < FontSelectionValue(450))
+ return FW_NORMAL;
+ if (fontWeight < FontSelectionValue(550))
+ return FW_MEDIUM;
+ if (fontWeight < FontSelectionValue(650))
+ return FW_SEMIBOLD;
+ if (fontWeight < FontSelectionValue(750))
+ return FW_BOLD;
+ if (fontWeight < FontSelectionValue(850))
+ return FW_EXTRABOLD;
+ return FW_HEAVY;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isGDIFontWeightBold(LONG gdiFontWeight)
</span><span class="lines">@@ -536,7 +541,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const AtomicString& m_familyName;
</span><del>- HashSet<unsigned> m_traitsMasks;
</del><ins>+ Vector<FontSelectionCapabilities> m_capabilities;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static int CALLBACK traitsInFamilyEnumProc(CONST LOGFONT* logFont, CONST TEXTMETRIC* metrics, DWORD fontType, LPARAM lParam)
</span><span class="lines">@@ -543,23 +548,50 @@
</span><span class="cx"> {
</span><span class="cx"> TraitsInFamilyProcData* procData = reinterpret_cast<TraitsInFamilyProcData*>(lParam);
</span><span class="cx">
</span><del>- unsigned traitsMask = 0;
- traitsMask |= logFont->lfItalic ? FontStyleItalicMask : FontStyleNormalMask;
- LONG weight = adjustedGDIFontWeight(logFont->lfWeight, procData->m_familyName);
- traitsMask |= weight == FW_THIN ? FontWeight100Mask :
- weight == FW_EXTRALIGHT ? FontWeight200Mask :
- weight == FW_LIGHT ? FontWeight300Mask :
- weight == FW_NORMAL ? FontWeight400Mask :
- weight == FW_MEDIUM ? FontWeight500Mask :
- weight == FW_SEMIBOLD ? FontWeight600Mask :
- weight == FW_BOLD ? FontWeight700Mask :
- weight == FW_EXTRABOLD ? FontWeight800Mask :
- FontWeight900Mask;
- procData->m_traitsMasks.add(traitsMask);
</del><ins>+ FontSelectionValue italic = logFont->lfItalic ? italicThreshold() : FontSelectionValue();
+
+ FontSelectionValue weight;
+ switch (adjustedGDIFontWeight(logFont->lfWeight, procData->m_familyName)) {
+ case FW_THIN:
+ weight = FontSelectionValue(100);
+ break;
+ case FW_EXTRALIGHT:
+ weight = FontSelectionValue(200);
+ break;
+ case FW_LIGHT:
+ weight = FontSelectionValue(300);
+ break;
+ case FW_NORMAL:
+ weight = FontSelectionValue(400);
+ break;
+ case FW_MEDIUM:
+ weight = FontSelectionValue(500);
+ break;
+ case FW_SEMIBOLD:
+ weight = FontSelectionValue(600);
+ break;
+ case FW_BOLD:
+ weight = FontSelectionValue(700);
+ break;
+ case FW_EXTRABOLD:
+ weight = FontSelectionValue(800);
+ break;
+ default:
+ weight = FontSelectionValue(900);
+ break;
+ }
+
+ FontSelectionValue stretch = normalStretchValue();
+
+ FontSelectionCapabilities result;
+ result.weight = FontSelectionRange(weight, weight);
+ result.width = FontSelectionRange(stretch, stretch);
+ result.slope = FontSelectionRange(italic, italic);
+ procData->m_capabilities.append(WTFMove(result));
</ins><span class="cx"> return 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-auto FontCache::getTraitsAndStretchInFamily(const AtomicString& familyName) -> Vector<TraitsAndStretch>
</del><ins>+Vector<FontSelectionCapabilities> FontCache::getFontSelectionCapabilitiesInFamily(const AtomicString& familyName)
</ins><span class="cx"> {
</span><span class="cx"> HWndDC hdc(0);
</span><span class="cx">
</span><span class="lines">@@ -572,10 +604,10 @@
</span><span class="cx">
</span><span class="cx"> TraitsInFamilyProcData procData(familyName);
</span><span class="cx"> EnumFontFamiliesEx(hdc, &logFont, traitsInFamilyEnumProc, reinterpret_cast<LPARAM>(&procData), 0);
</span><del>- Vector<TraitsAndStretch> result;
- result.reserveInitialCapacity(procData.m_traitsMasks.size());
- for (unsigned mask : procData.m_traitsMasks)
- result.uncheckedAppend({ static_cast<FontTraitsMask>(mask), FontSelectionRange(FontSelectionValue(), FontSelectionValue()) });
</del><ins>+ Vector<FontSelectionCapabilities> result;
+ result.reserveInitialCapacity(procData.m_capabilities.size());
+ for (auto capabilities : procData.m_capabilities)
+ result.uncheckedAppend(capabilities);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> fontDescription.setOneFamily("Courier");
</span><span class="cx"> fontDescription.setSpecifiedSize(m_baseFontSize);
</span><span class="cx"> fontDescription.setComputedSize(m_baseFontSize);
</span><del>- fontDescription.setWeight(FontWeight500);
</del><ins>+ fontDescription.setWeight(FontSelectionValue(500));
</ins><span class="cx">
</span><span class="cx"> m_timeFont = FontCascade(fontDescription, 0, 0);
</span><span class="cx"> m_timeFont.update(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextFlagsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextFlags.h (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextFlags.h 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/text/TextFlags.h 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -340,62 +340,11 @@
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(!(LastFontWidthVariant >> FontWidthVariantWidth), FontWidthVariantWidth_is_correct);
</span><span class="cx">
</span><del>-enum FontWeight {
- FontWeight100,
- FontWeight200,
- FontWeight300,
- FontWeight400,
- FontWeight500,
- FontWeight600,
- FontWeight700,
- FontWeight800,
- FontWeight900,
- FontWeightNormal = FontWeight400,
- FontWeightBold = FontWeight700
-};
-
-enum FontItalic {
- FontItalicOff = 0,
- FontItalicOn = 1
-};
-
</del><span class="cx"> enum FontSmallCaps {
</span><span class="cx"> FontSmallCapsOff = 0,
</span><span class="cx"> FontSmallCapsOn = 1
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum {
- FontStyleNormalBit = 0,
- FontStyleItalicBit,
- FontWeight100Bit,
- FontWeight200Bit,
- FontWeight300Bit,
- FontWeight400Bit,
- FontWeight500Bit,
- FontWeight600Bit,
- FontWeight700Bit,
- FontWeight800Bit,
- FontWeight900Bit,
- FontTraitsMaskWidth
-};
-
-enum FontTraitsMask {
- FontStyleNormalMask = 1 << FontStyleNormalBit,
- FontStyleItalicMask = 1 << FontStyleItalicBit,
- FontStyleMask = FontStyleNormalMask | FontStyleItalicMask,
-
- FontWeight100Mask = 1 << FontWeight100Bit,
- FontWeight200Mask = 1 << FontWeight200Bit,
- FontWeight300Mask = 1 << FontWeight300Bit,
- FontWeight400Mask = 1 << FontWeight400Bit,
- FontWeight500Mask = 1 << FontWeight500Bit,
- FontWeight600Mask = 1 << FontWeight600Bit,
- FontWeight700Mask = 1 << FontWeight700Bit,
- FontWeight800Mask = 1 << FontWeight800Bit,
- FontWeight900Mask = 1 << FontWeight900Bit,
- FontWeightMask = FontWeight100Mask | FontWeight200Mask | FontWeight300Mask | FontWeight400Mask | FontWeight500Mask | FontWeight600Mask | FontWeight700Mask | FontWeight800Mask | FontWeight900Mask
-};
-
</del><span class="cx"> enum class Kerning {
</span><span class="cx"> Auto,
</span><span class="cx"> Normal,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformwinDragImageWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/win/DragImageWin.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/win/DragImageWin.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/platform/win/DragImageWin.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize, &metrics, 0);
</span><span class="cx">
</span><span class="cx"> FontCascadeDescription description;
</span><del>- description.setWeight(bold ? FontWeightBold : FontWeightNormal);
</del><ins>+ description.setWeight(bold ? boldWeightValue() : normalWeightValue());
</ins><span class="cx"> description.setOneFamily(metrics.lfSmCaptionFont.lfFaceName);
</span><span class="cx"> description.setSpecifiedSize((float)size);
</span><span class="cx"> description.setComputedSize((float)size);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderEmbeddedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx">
</span><span class="cx"> FontCascadeDescription fontDescription;
</span><span class="cx"> RenderTheme::defaultTheme()->systemFont(CSSValueWebkitSmallControl, fontDescription);
</span><del>- fontDescription.setWeight(FontWeightBold);
</del><ins>+ fontDescription.setWeight(boldWeightValue());
</ins><span class="cx"> fontDescription.setRenderingMode(settings().fontRenderingMode());
</span><span class="cx"> fontDescription.setComputedSize(12);
</span><span class="cx"> font = FontCascade(fontDescription, 0, 0);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeGtk.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/rendering/RenderThemeGtk.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -110,8 +110,8 @@
</span><span class="cx">
</span><span class="cx"> fontDescription.setSpecifiedSize(size);
</span><span class="cx"> fontDescription.setIsAbsoluteSize(true);
</span><del>- fontDescription.setWeight(FontWeightNormal);
- fontDescription.setItalic(FontItalicOff);
</del><ins>+ fontDescription.setWeight(normalWeightValue());
+ fontDescription.setItalic(FontSelectionValue());
</ins><span class="cx"> pango_font_description_free(pangoDescription);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeIOS.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/rendering/RenderThemeIOS.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1273,12 +1273,12 @@
</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(), fontDescription.variationSettings());
</del><span class="cx"> fontDescription.setIsAbsoluteSize(true);
</span><span class="cx"> fontDescription.setOneFamily(textStyle);
</span><span class="cx"> fontDescription.setSpecifiedSize(CTFontGetSize(font.get()));
</span><del>- fontDescription.setWeight(fontWeightFromCoreText(FontCache::weightOfCTFont(font.get())));
- fontDescription.setItalic(FontItalicOff);
</del><ins>+ auto capabilities = capabilitiesForFontDescriptor(adoptCF(CTFontCopyFontDescriptor(font.get())).get());
+ fontDescription.setWeight(capabilities.weight.minimum);
+ fontDescription.setItalic(normalItalicValue());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> return platformInactiveSelectionBackgroundColor();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static FontWeight toFontWeight(NSInteger appKitFontWeight)
</del><ins>+static FontSelectionValue toFontWeight(NSInteger appKitFontWeight)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(appKitFontWeight > 0 && appKitFontWeight < 15);
</span><span class="cx"> if (appKitFontWeight > 14)
</span><span class="lines">@@ -365,21 +365,21 @@
</span><span class="cx"> else if (appKitFontWeight < 1)
</span><span class="cx"> appKitFontWeight = 1;
</span><span class="cx">
</span><del>- static const FontWeight fontWeights[] = {
- FontWeight100,
- FontWeight100,
- FontWeight200,
- FontWeight300,
- FontWeight400,
- FontWeight500,
- FontWeight600,
- FontWeight600,
- FontWeight700,
- FontWeight800,
- FontWeight800,
- FontWeight900,
- FontWeight900,
- FontWeight900
</del><ins>+ static const FontSelectionValue fontWeights[] = {
+ FontSelectionValue(100),
+ FontSelectionValue(100),
+ FontSelectionValue(200),
+ FontSelectionValue(300),
+ FontSelectionValue(400),
+ FontSelectionValue(500),
+ FontSelectionValue(600),
+ FontSelectionValue(600),
+ FontSelectionValue(700),
+ FontSelectionValue(800),
+ FontSelectionValue(800),
+ FontSelectionValue(900),
+ FontSelectionValue(900),
+ FontSelectionValue(900)
</ins><span class="cx"> };
</span><span class="cx"> return fontWeights[appKitFontWeight - 1];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeWin.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebCore/rendering/RenderThemeWin.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> fontDescription.setIsAbsoluteSize(true);
</span><span class="cx"> fontDescription.setOneFamily(String(logFont.lfFaceName));
</span><span class="cx"> fontDescription.setSpecifiedSize(fontSize);
</span><del>- fontDescription.setWeight(logFont.lfWeight >= 700 ? FontWeightBold : FontWeightNormal); // FIXME: Use real weight.
</del><ins>+ fontDescription.setWeight(logFont.lfWeight >= 700 ? boldWeightValue() : normalWeightValue()); // FIXME: Use real weight.
</ins><span class="cx"> fontDescription.setIsItalic(logFont.lfItalic);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/mac/ChangeLog 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Expand font-weight and font-stretch to take any number
+ https://bugs.webkit.org/show_bug.cgi?id=168889
+
+ Reviewed by Simon Fraser.
+
+ Migrate off old enum types.
+
+ * WebCoreSupport/PopupMenuMac.mm:
+ (PopupMenuMac::populate):
+ * WebView/WebHTMLView.mm:
+ (fontNameForDescription):
+ * WebView/WebView.mm:
+ (-[WebView updateTextTouchBar]):
+
</ins><span class="cx"> 2017-03-03 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Add WebGPU compile flag and experimental feature flag
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportPopupMenuMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/mac/WebCoreSupport/PopupMenuMac.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> RetainPtr<CTFontRef> font = style.font().primaryFont().getCTFont();
</span><span class="cx"> if (!font) {
</span><span class="cx"> CGFloat size = style.font().primaryFont().platformData().size();
</span><del>- font = adoptCF(CTFontCreateUIFontForLanguage(style.font().weight() < FontWeightBold ? kCTFontUIFontSystem : kCTFontUIFontEmphasizedSystem, size, nullptr));
</del><ins>+ font = adoptCF(CTFontCreateUIFontForLanguage(isFontWeightBold(style.font().weight()) ? kCTFontUIFontEmphasizedSystem : kCTFontUIFontSystem, size, nullptr));
</ins><span class="cx"> }
</span><span class="cx"> [attributes setObject:toNSFont(font.get()) forKey:NSFontAttributeName];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -5629,7 +5629,7 @@
</span><span class="cx"> // Find the font the same way the rendering code would later if it encountered this CSS.
</span><span class="cx"> FontDescription fontDescription;
</span><span class="cx"> fontDescription.setIsItalic(italic);
</span><del>- fontDescription.setWeight(bold ? FontWeight900 : FontWeight500);
</del><ins>+ fontDescription.setWeight(bold ? FontSelectionValue(900) : FontSelectionValue(500));
</ins><span class="cx"> RefPtr<Font> font = FontCache::singleton().fontForFamily(fontDescription, familyName);
</span><span class="cx"> return adoptCF(CTFontCopyPostScriptName(font->getCTFont()));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -9618,8 +9618,8 @@
</span><span class="cx"> if (!selection.isNone()) {
</span><span class="cx"> Node* nodeToRemove;
</span><span class="cx"> if (auto* style = Editor::styleForSelectionStart(coreFrame, nodeToRemove)) {
</span><del>- [_private->_textTouchBarItemController setTextIsBold:(style->fontCascade().weight() >= FontWeightBold)];
- [_private->_textTouchBarItemController setTextIsItalic:(style->fontCascade().italic() == FontItalicOn)];
</del><ins>+ [_private->_textTouchBarItemController setTextIsBold:isFontWeightBold(style->fontCascade().weight())];
+ [_private->_textTouchBarItemController setTextIsItalic:isItalic(style->fontCascade().italic())];
</ins><span class="cx">
</span><span class="cx"> RefPtr<EditingStyle> typingStyle = coreFrame->selection().typingStyle();
</span><span class="cx"> if (typingStyle && typingStyle->style()) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/win/ChangeLog 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Expand font-weight and font-stretch to take any number
+ https://bugs.webkit.org/show_bug.cgi?id=168889
+
+ Reviewed by Simon Fraser.
+
+ Migrate off old enum types.
+
+ * WebKitGraphics.cpp:
+ (makeFont):
+
</ins><span class="cx"> 2017-03-02 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Rename htmlediting.h/cpp to Editing.h/cpp
</span></span></pre></div>
<a id="trunkSourceWebKitwinDOMCoreClassescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1294,7 +1294,7 @@
</span><span class="cx"> webFontDescription->family = familyCharactersBuffer;
</span><span class="cx"> webFontDescription->familyLength = family.length();
</span><span class="cx"> webFontDescription->size = fontDescription.computedSize();
</span><del>- webFontDescription->bold = fontDescription.weight() >= WebCore::FontWeight600;
</del><ins>+ webFontDescription->bold = isFontWeightBold(fontDescription.weight());
</ins><span class="cx"> webFontDescription->italic = fontDescription.italic();
</span><span class="cx">
</span><span class="cx"> return S_OK;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebKitGraphicscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitGraphics.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit/win/WebKitGraphics.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> f.setSpecifiedSize(description.size);
</span><span class="cx"> f.setComputedSize(description.size);
</span><span class="cx"> f.setIsItalic(description.italic);
</span><del>- f.setWeight(description.bold ? FontWeightBold : FontWeightNormal);
</del><ins>+ f.setWeight(description.bold ? boldWeightValue() : normalWeightValue());
</ins><span class="cx"> f.setIsAbsoluteSize(true);
</span><span class="cx">
</span><span class="cx"> FontSmoothingType smoothingType;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit2/ChangeLog 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Expand font-weight and font-stretch to take any number
+ https://bugs.webkit.org/show_bug.cgi?id=168889
+
+ Reviewed by Simon Fraser.
+
+ Migrate off old enum types.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::editorState):
+
</ins><span class="cx"> 2017-03-06 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Report domains crashing under memory pressure via enhanced privacy logging.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -831,9 +831,9 @@
</span><span class="cx"> if (!selection.isNone()) {
</span><span class="cx"> Node* nodeToRemove;
</span><span class="cx"> if (auto* style = Editor::styleForSelectionStart(&frame, nodeToRemove)) {
</span><del>- if (style->fontCascade().weight() >= FontWeightBold)
</del><ins>+ if (isFontWeightBold(style->fontCascade().weight()))
</ins><span class="cx"> postLayoutData.typingAttributes |= AttributeBold;
</span><del>- if (style->fontCascade().italic() == FontItalicOn)
</del><ins>+ if (isItalic(style->fontCascade().italic()))
</ins><span class="cx"> postLayoutData.typingAttributes |= AttributeItalics;
</span><span class="cx">
</span><span class="cx"> RefPtr<EditingStyle> typingStyle = frame.selection().typingStyle();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Tools/ChangeLog 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-03-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Expand font-weight and font-stretch to take any number
+ https://bugs.webkit.org/show_bug.cgi?id=168889
+
+ Reviewed by Simon Fraser.
+
+ Migrate off old enum types.
+
+ * TestWebKitAPI/Tests/WebCore/FontCache.cpp:
+ (TestWebKitAPI::createPlatformFont):
+ (TestWebKitAPI::compareFonts):
+ (TestWebKitAPI::TEST_F):
+
</ins><span class="cx"> 2017-03-06 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> [GTK][JSCOnly] Enable WebAssembly on Linux environment
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebCoreFontCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp (213463 => 213464)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp 2017-03-06 21:14:31 UTC (rev 213463)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/FontCache.cpp 2017-03-06 21:40:31 UTC (rev 213464)
</span><span class="lines">@@ -49,13 +49,13 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static std::unique_ptr<FontPlatformData> createPlatformFont(const char* familyName, FontWeight weight, FontItalic italic, float stretch, float size)
</del><ins>+static std::unique_ptr<FontPlatformData> createPlatformFont(const char* familyName, float weight, float italic, float stretch, float size)
</ins><span class="cx"> {
</span><span class="cx"> AtomicString familyNameString(familyName);
</span><span class="cx"> FontCascadeDescription description;
</span><span class="cx"> description.setOneFamily(familyNameString);
</span><del>- description.setWeight(weight);
- description.setItalic(italic);
</del><ins>+ description.setWeight(FontSelectionValue(weight));
+ description.setItalic(FontSelectionValue(italic));
</ins><span class="cx"> description.setStretch(FontSelectionValue(stretch));
</span><span class="cx"> description.setComputedSize(size);
</span><span class="cx">
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> return fontCache.createFontPlatformDataForTesting(description, familyNameString);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool compareFonts(const char* familyName, FontWeight weight, FontItalic italic, float stretch, CFStringRef expectedPostScriptName)
</del><ins>+static bool compareFonts(const char* familyName, float weight, float italic, float stretch, CFStringRef expectedPostScriptName)
</ins><span class="cx"> {
</span><span class="cx"> float size = 80;
</span><span class="cx"> auto platformFont = createPlatformFont(familyName, weight, italic, stretch, size);
</span><span class="lines">@@ -73,1346 +73,1346 @@
</span><span class="cx">
</span><span class="cx"> TEST_F(FontCacheTest, FontLookupFromFamilyName)
</span><span class="cx"> {
</span><del>- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight100, FontItalicOff, 100, CFSTR("ArialMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight100, FontItalicOn , 100, CFSTR("Arial-ItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight200, FontItalicOff, 100, CFSTR("ArialMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight200, FontItalicOn , 100, CFSTR("Arial-ItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight300, FontItalicOff, 100, CFSTR("ArialMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight300, FontItalicOn , 100, CFSTR("Arial-ItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight400, FontItalicOff, 100, CFSTR("ArialMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight400, FontItalicOn , 100, CFSTR("Arial-ItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight500, FontItalicOff, 100, CFSTR("ArialMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight500, FontItalicOn , 100, CFSTR("Arial-ItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight600, FontItalicOff, 100, CFSTR("Arial-BoldMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight600, FontItalicOn , 100, CFSTR("Arial-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight700, FontItalicOff, 100, CFSTR("Arial-BoldMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight700, FontItalicOn , 100, CFSTR("Arial-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight800, FontItalicOff, 100, CFSTR("Arial-BoldMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight800, FontItalicOn , 100, CFSTR("Arial-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight900, FontItalicOff, 100, CFSTR("Arial-BoldMT")));
- EXPECT_TRUE(compareFonts("Arial", FontWeight900, FontItalicOn , 100, CFSTR("Arial-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-Regular")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-Medium")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir Next", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Book")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Medium")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight100, FontItalicOff, 100, CFSTR("Didot")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight100, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight200, FontItalicOff, 100, CFSTR("Didot")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight200, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight300, FontItalicOff, 100, CFSTR("Didot")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight300, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight400, FontItalicOff, 100, CFSTR("Didot")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight400, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight500, FontItalicOff, 100, CFSTR("Didot")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight500, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight600, FontItalicOff, 100, CFSTR("Didot-Bold")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight600, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight700, FontItalicOff, 100, CFSTR("Didot-Bold")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight700, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight800, FontItalicOff, 100, CFSTR("Didot-Bold")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight800, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight900, FontItalicOff, 100, CFSTR("Didot-Bold")));
- EXPECT_TRUE(compareFonts("Didot", FontWeight900, FontItalicOn , 100, CFSTR("Didot-Italic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight100, FontItalicOff, 100, CFSTR("Futura-Medium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight100, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight200, FontItalicOff, 100, CFSTR("Futura-Medium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight200, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight300, FontItalicOff, 100, CFSTR("Futura-Medium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight300, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight400, FontItalicOff, 100, CFSTR("Futura-Medium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight400, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight500, FontItalicOff, 100, CFSTR("Futura-Medium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight500, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight600, FontItalicOff, 100, CFSTR("Futura-Bold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight600, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight700, FontItalicOff, 100, CFSTR("Futura-Bold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight700, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight800, FontItalicOff, 100, CFSTR("Futura-Bold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight800, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight900, FontItalicOff, 100, CFSTR("Futura-Bold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight900, FontItalicOn , 100, CFSTR("Futura-MediumItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight100, FontItalicOff, 100, CFSTR("HelveticaNeue-UltraLight")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight100, FontItalicOn , 100, CFSTR("HelveticaNeue-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight200, FontItalicOff, 100, CFSTR("HelveticaNeue-Thin")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight200, FontItalicOn , 100, CFSTR("HelveticaNeue-ThinItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight300, FontItalicOff, 100, CFSTR("HelveticaNeue-Light")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight300, FontItalicOn , 100, CFSTR("HelveticaNeue-LightItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight400, FontItalicOff, 100, CFSTR("HelveticaNeue")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight400, FontItalicOn , 100, CFSTR("HelveticaNeue-Italic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight500, FontItalicOff, 100, CFSTR("HelveticaNeue-Medium")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight500, FontItalicOn , 100, CFSTR("HelveticaNeue-MediumItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight600, FontItalicOff, 100, CFSTR("HelveticaNeue-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight600, FontItalicOn , 100, CFSTR("HelveticaNeue-BoldItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight700, FontItalicOff, 100, CFSTR("HelveticaNeue-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight700, FontItalicOn , 100, CFSTR("HelveticaNeue-BoldItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight800, FontItalicOff, 100, CFSTR("HelveticaNeue-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight800, FontItalicOn , 100, CFSTR("HelveticaNeue-BoldItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight900, FontItalicOff, 100, CFSTR("HelveticaNeue-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight900, FontItalicOn , 100, CFSTR("HelveticaNeue-BoldItalic")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight100, FontItalicOff, 100, CFSTR("Helvetica-Light")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight100, FontItalicOn , 100, CFSTR("Helvetica-LightOblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight200, FontItalicOff, 100, CFSTR("Helvetica-Light")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight200, FontItalicOn , 100, CFSTR("Helvetica-LightOblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight300, FontItalicOff, 100, CFSTR("Helvetica-Light")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight300, FontItalicOn , 100, CFSTR("Helvetica-LightOblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight400, FontItalicOff, 100, CFSTR("Helvetica")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight400, FontItalicOn , 100, CFSTR("Helvetica-Oblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight500, FontItalicOff, 100, CFSTR("Helvetica")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight500, FontItalicOn , 100, CFSTR("Helvetica-Oblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight600, FontItalicOff, 100, CFSTR("Helvetica-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight600, FontItalicOn , 100, CFSTR("Helvetica-BoldOblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight700, FontItalicOff, 100, CFSTR("Helvetica-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight700, FontItalicOn , 100, CFSTR("Helvetica-BoldOblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight800, FontItalicOff, 100, CFSTR("Helvetica-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight800, FontItalicOn , 100, CFSTR("Helvetica-BoldOblique")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight900, FontItalicOff, 100, CFSTR("Helvetica-Bold")));
- EXPECT_TRUE(compareFonts("Helvetica", FontWeight900, FontItalicOn , 100, CFSTR("Helvetica-BoldOblique")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight100, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight100, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight200, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight200, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight300, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight300, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight400, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight400, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight500, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight500, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight600, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight600, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight700, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight700, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight800, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight800, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight900, FontItalicOff, 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", FontWeight900, FontItalicOn , 100, CFSTR("HiraKakuStdN-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight100, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight100, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight200, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight200, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight300, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight300, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight400, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight400, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight500, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight500, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight600, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight600, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight700, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight700, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight800, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight800, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight900, FontItalicOff, 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", FontWeight900, FontItalicOn , 100, CFSTR("HiraMaruProN-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight100, FontItalicOff, 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight100, FontItalicOn , 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight200, FontItalicOff, 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight200, FontItalicOn , 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight300, FontItalicOff, 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight300, FontItalicOn , 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight400, FontItalicOff, 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight400, FontItalicOn , 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight500, FontItalicOff, 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight500, FontItalicOn , 100, CFSTR("HiraMinProN-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight600, FontItalicOff, 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight600, FontItalicOn , 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight700, FontItalicOff, 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight700, FontItalicOn , 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight800, FontItalicOff, 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight800, FontItalicOn , 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight900, FontItalicOff, 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", FontWeight900, FontItalicOn , 100, CFSTR("HiraMinProN-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight100, FontItalicOff, 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight100, FontItalicOn , 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight200, FontItalicOff, 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight200, FontItalicOn , 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight300, FontItalicOff, 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight300, FontItalicOn , 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight400, FontItalicOff, 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight400, FontItalicOn , 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight500, FontItalicOff, 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight500, FontItalicOn , 100, CFSTR("HiraginoSansGB-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight600, FontItalicOff, 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight600, FontItalicOn , 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight700, FontItalicOff, 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight700, FontItalicOn , 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight800, FontItalicOff, 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight800, FontItalicOn , 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight900, FontItalicOff, 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans GB", FontWeight900, FontItalicOn , 100, CFSTR("HiraginoSansGB-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight100, FontItalicOff, 100, CFSTR("HiraginoSans-W0")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight100, FontItalicOn , 100, CFSTR("HiraginoSans-W0")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight200, FontItalicOff, 100, CFSTR("HiraginoSans-W1")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight200, FontItalicOn , 100, CFSTR("HiraginoSans-W1")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight300, FontItalicOff, 100, CFSTR("HiraginoSans-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight300, FontItalicOn , 100, CFSTR("HiraginoSans-W3")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight400, FontItalicOff, 100, CFSTR("HiraginoSans-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight400, FontItalicOn , 100, CFSTR("HiraginoSans-W4")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight500, FontItalicOff, 100, CFSTR("HiraginoSans-W5")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight500, FontItalicOn , 100, CFSTR("HiraginoSans-W5")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight600, FontItalicOff, 100, CFSTR("HiraginoSans-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight600, FontItalicOn , 100, CFSTR("HiraginoSans-W6")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight700, FontItalicOff, 100, CFSTR("HiraginoSans-W7")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight700, FontItalicOn , 100, CFSTR("HiraginoSans-W7")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight800, FontItalicOff, 100, CFSTR("HiraginoSans-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight800, FontItalicOn , 100, CFSTR("HiraginoSans-W8")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight900, FontItalicOff, 100, CFSTR("HiraginoSans-W9")));
- EXPECT_TRUE(compareFonts("Hiragino Sans", FontWeight900, FontItalicOn , 100, CFSTR("HiraginoSans-W9")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight100, FontItalicOff, 100, CFSTR("HoeflerText-Regular")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight100, FontItalicOn , 100, CFSTR("HoeflerText-Italic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight200, FontItalicOff, 100, CFSTR("HoeflerText-Regular")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight200, FontItalicOn , 100, CFSTR("HoeflerText-Italic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight300, FontItalicOff, 100, CFSTR("HoeflerText-Regular")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight300, FontItalicOn , 100, CFSTR("HoeflerText-Italic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight400, FontItalicOff, 100, CFSTR("HoeflerText-Regular")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight400, FontItalicOn , 100, CFSTR("HoeflerText-Italic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight500, FontItalicOff, 100, CFSTR("HoeflerText-Regular")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight500, FontItalicOn , 100, CFSTR("HoeflerText-Italic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight600, FontItalicOff, 100, CFSTR("HoeflerText-Black")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight600, FontItalicOn , 100, CFSTR("HoeflerText-BlackItalic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight700, FontItalicOff, 100, CFSTR("HoeflerText-Black")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight700, FontItalicOn , 100, CFSTR("HoeflerText-BlackItalic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight800, FontItalicOff, 100, CFSTR("HoeflerText-Black")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight800, FontItalicOn , 100, CFSTR("HoeflerText-BlackItalic")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight900, FontItalicOff, 100, CFSTR("HoeflerText-Black")));
- EXPECT_TRUE(compareFonts("Hoefler Text", FontWeight900, FontItalicOn , 100, CFSTR("HoeflerText-BlackItalic")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight100, FontItalicOff, 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight100, FontItalicOn , 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight200, FontItalicOff, 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight200, FontItalicOn , 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight300, FontItalicOff, 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight300, FontItalicOn , 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight400, FontItalicOff, 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight400, FontItalicOn , 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight500, FontItalicOff, 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight500, FontItalicOn , 100, CFSTR("LucidaGrande")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight600, FontItalicOff, 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight600, FontItalicOn , 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight700, FontItalicOff, 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight700, FontItalicOn , 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight800, FontItalicOff, 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight800, FontItalicOn , 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight900, FontItalicOff, 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Lucida Grande", FontWeight900, FontItalicOn , 100, CFSTR("LucidaGrande-Bold")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight100, FontItalicOff, 100, CFSTR("Optima-Regular")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight100, FontItalicOn , 100, CFSTR("Optima-Italic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight200, FontItalicOff, 100, CFSTR("Optima-Regular")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight200, FontItalicOn , 100, CFSTR("Optima-Italic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight300, FontItalicOff, 100, CFSTR("Optima-Regular")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight300, FontItalicOn , 100, CFSTR("Optima-Italic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight400, FontItalicOff, 100, CFSTR("Optima-Regular")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight400, FontItalicOn , 100, CFSTR("Optima-Italic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight500, FontItalicOff, 100, CFSTR("Optima-Regular")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight500, FontItalicOn , 100, CFSTR("Optima-Italic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight600, FontItalicOff, 100, CFSTR("Optima-Bold")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight600, FontItalicOn , 100, CFSTR("Optima-BoldItalic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight700, FontItalicOff, 100, CFSTR("Optima-Bold")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight700, FontItalicOn , 100, CFSTR("Optima-BoldItalic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight800, FontItalicOff, 100, CFSTR("Optima-ExtraBlack")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight800, FontItalicOn , 100, CFSTR("Optima-BoldItalic")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight900, FontItalicOff, 100, CFSTR("Optima-ExtraBlack")));
- EXPECT_TRUE(compareFonts("Optima", FontWeight900, FontItalicOn , 100, CFSTR("Optima-BoldItalic")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight100, FontItalicOff, 100, CFSTR("PingFangHK-Ultralight")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight100, FontItalicOn , 100, CFSTR("PingFangHK-Ultralight")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight200, FontItalicOff, 100, CFSTR("PingFangHK-Thin")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight200, FontItalicOn , 100, CFSTR("PingFangHK-Thin")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight300, FontItalicOff, 100, CFSTR("PingFangHK-Light")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight300, FontItalicOn , 100, CFSTR("PingFangHK-Light")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight400, FontItalicOff, 100, CFSTR("PingFangHK-Regular")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight400, FontItalicOn , 100, CFSTR("PingFangHK-Regular")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight500, FontItalicOff, 100, CFSTR("PingFangHK-Medium")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight500, FontItalicOn , 100, CFSTR("PingFangHK-Medium")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight600, FontItalicOff, 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight600, FontItalicOn , 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight700, FontItalicOff, 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight700, FontItalicOn , 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight800, FontItalicOff, 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight800, FontItalicOn , 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight900, FontItalicOff, 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang HK", FontWeight900, FontItalicOn , 100, CFSTR("PingFangHK-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight100, FontItalicOff, 100, CFSTR("PingFangSC-Ultralight")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight100, FontItalicOn , 100, CFSTR("PingFangSC-Ultralight")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight200, FontItalicOff, 100, CFSTR("PingFangSC-Thin")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight200, FontItalicOn , 100, CFSTR("PingFangSC-Thin")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight300, FontItalicOff, 100, CFSTR("PingFangSC-Light")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight300, FontItalicOn , 100, CFSTR("PingFangSC-Light")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight400, FontItalicOff, 100, CFSTR("PingFangSC-Regular")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight400, FontItalicOn , 100, CFSTR("PingFangSC-Regular")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight500, FontItalicOff, 100, CFSTR("PingFangSC-Medium")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight500, FontItalicOn , 100, CFSTR("PingFangSC-Medium")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight600, FontItalicOff, 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight600, FontItalicOn , 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight700, FontItalicOff, 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight700, FontItalicOn , 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight800, FontItalicOff, 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight800, FontItalicOn , 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight900, FontItalicOff, 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang SC", FontWeight900, FontItalicOn , 100, CFSTR("PingFangSC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight100, FontItalicOff, 100, CFSTR("PingFangTC-Ultralight")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight100, FontItalicOn , 100, CFSTR("PingFangTC-Ultralight")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight200, FontItalicOff, 100, CFSTR("PingFangTC-Thin")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight200, FontItalicOn , 100, CFSTR("PingFangTC-Thin")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight300, FontItalicOff, 100, CFSTR("PingFangTC-Light")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight300, FontItalicOn , 100, CFSTR("PingFangTC-Light")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight400, FontItalicOff, 100, CFSTR("PingFangTC-Regular")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight400, FontItalicOn , 100, CFSTR("PingFangTC-Regular")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight500, FontItalicOff, 100, CFSTR("PingFangTC-Medium")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight500, FontItalicOn , 100, CFSTR("PingFangTC-Medium")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight600, FontItalicOff, 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight600, FontItalicOn , 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight700, FontItalicOff, 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight700, FontItalicOn , 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight800, FontItalicOff, 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight800, FontItalicOn , 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight900, FontItalicOff, 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("PingFang TC", FontWeight900, FontItalicOn , 100, CFSTR("PingFangTC-Semibold")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight100, FontItalicOff, 100, CFSTR("TimesNewRomanPSMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight100, FontItalicOn , 100, CFSTR("TimesNewRomanPS-ItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight200, FontItalicOff, 100, CFSTR("TimesNewRomanPSMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight200, FontItalicOn , 100, CFSTR("TimesNewRomanPS-ItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight300, FontItalicOff, 100, CFSTR("TimesNewRomanPSMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight300, FontItalicOn , 100, CFSTR("TimesNewRomanPS-ItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight400, FontItalicOff, 100, CFSTR("TimesNewRomanPSMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight400, FontItalicOn , 100, CFSTR("TimesNewRomanPS-ItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight500, FontItalicOff, 100, CFSTR("TimesNewRomanPSMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight500, FontItalicOn , 100, CFSTR("TimesNewRomanPS-ItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight600, FontItalicOff, 100, CFSTR("TimesNewRomanPS-BoldMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight600, FontItalicOn , 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight700, FontItalicOff, 100, CFSTR("TimesNewRomanPS-BoldMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight700, FontItalicOn , 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight800, FontItalicOff, 100, CFSTR("TimesNewRomanPS-BoldMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight800, FontItalicOn , 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight900, FontItalicOff, 100, CFSTR("TimesNewRomanPS-BoldMT")));
- EXPECT_TRUE(compareFonts("Times New Roman", FontWeight900, FontItalicOn , 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
- EXPECT_TRUE(compareFonts("Times", FontWeight100, FontItalicOff, 100, CFSTR("Times-Roman")));
- EXPECT_TRUE(compareFonts("Times", FontWeight100, FontItalicOn , 100, CFSTR("Times-Italic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight200, FontItalicOff, 100, CFSTR("Times-Roman")));
- EXPECT_TRUE(compareFonts("Times", FontWeight200, FontItalicOn , 100, CFSTR("Times-Italic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight300, FontItalicOff, 100, CFSTR("Times-Roman")));
- EXPECT_TRUE(compareFonts("Times", FontWeight300, FontItalicOn , 100, CFSTR("Times-Italic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight400, FontItalicOff, 100, CFSTR("Times-Roman")));
- EXPECT_TRUE(compareFonts("Times", FontWeight400, FontItalicOn , 100, CFSTR("Times-Italic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight500, FontItalicOff, 100, CFSTR("Times-Roman")));
- EXPECT_TRUE(compareFonts("Times", FontWeight500, FontItalicOn , 100, CFSTR("Times-Italic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight600, FontItalicOff, 100, CFSTR("Times-Bold")));
- EXPECT_TRUE(compareFonts("Times", FontWeight600, FontItalicOn , 100, CFSTR("Times-BoldItalic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight700, FontItalicOff, 100, CFSTR("Times-Bold")));
- EXPECT_TRUE(compareFonts("Times", FontWeight700, FontItalicOn , 100, CFSTR("Times-BoldItalic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight800, FontItalicOff, 100, CFSTR("Times-Bold")));
- EXPECT_TRUE(compareFonts("Times", FontWeight800, FontItalicOn , 100, CFSTR("Times-BoldItalic")));
- EXPECT_TRUE(compareFonts("Times", FontWeight900, FontItalicOff, 100, CFSTR("Times-Bold")));
- EXPECT_TRUE(compareFonts("Times", FontWeight900, FontItalicOn , 100, CFSTR("Times-BoldItalic")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight700, FontItalicOff, 87.5, CFSTR("HelveticaNeue-CondensedBold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight800, FontItalicOff, 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight900, FontItalicOff, 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight700, FontItalicOff, 75, CFSTR("HelveticaNeue-CondensedBold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight800, FontItalicOff, 75, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight900, FontItalicOff, 75, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight700, FontItalicOn , 87.5, CFSTR("HelveticaNeue-CondensedBold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight800, FontItalicOn , 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight900, FontItalicOn , 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight700, FontItalicOn , 75, CFSTR("HelveticaNeue-CondensedBold")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight800, FontItalicOn , 75, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Helvetica Neue", FontWeight900, FontItalicOn , 75, CFSTR("HelveticaNeue-CondensedBlack")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight500, FontItalicOff, 87.5, CFSTR("Futura-CondensedMedium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight500, FontItalicOn , 87.5, CFSTR("Futura-CondensedMedium")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight600, FontItalicOff, 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight600, FontItalicOn , 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight700, FontItalicOff, 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight700, FontItalicOn , 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight800, FontItalicOff, 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight800, FontItalicOn , 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight900, FontItalicOff, 87.5, CFSTR("Futura-CondensedExtraBold")));
- EXPECT_TRUE(compareFonts("Futura", FontWeight900, FontItalicOn , 87.5, CFSTR("Futura-CondensedExtraBold")));
</del><ins>+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 200, 0 , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("Apple SD Gothic Neo", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("Arial", 100, 0 , 100, CFSTR("ArialMT")));
+ EXPECT_TRUE(compareFonts("Arial", 100, 20, 100, CFSTR("Arial-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 200, 0 , 100, CFSTR("ArialMT")));
+ EXPECT_TRUE(compareFonts("Arial", 200, 20, 100, CFSTR("Arial-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 300, 0 , 100, CFSTR("ArialMT")));
+ EXPECT_TRUE(compareFonts("Arial", 300, 20, 100, CFSTR("Arial-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 400, 0 , 100, CFSTR("ArialMT")));
+ EXPECT_TRUE(compareFonts("Arial", 400, 20, 100, CFSTR("Arial-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 500, 0 , 100, CFSTR("ArialMT")));
+ EXPECT_TRUE(compareFonts("Arial", 500, 20, 100, CFSTR("Arial-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 600, 0 , 100, CFSTR("Arial-BoldMT")));
+ EXPECT_TRUE(compareFonts("Arial", 600, 20, 100, CFSTR("Arial-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 700, 0 , 100, CFSTR("Arial-BoldMT")));
+ EXPECT_TRUE(compareFonts("Arial", 700, 20, 100, CFSTR("Arial-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 800, 0 , 100, CFSTR("Arial-BoldMT")));
+ EXPECT_TRUE(compareFonts("Arial", 800, 20, 100, CFSTR("Arial-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Arial", 900, 0 , 100, CFSTR("Arial-BoldMT")));
+ EXPECT_TRUE(compareFonts("Arial", 900, 20, 100, CFSTR("Arial-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 100, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 200, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 300, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 400, 0 , 100, CFSTR("AvenirNext-Regular")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 500, 0 , 100, CFSTR("AvenirNext-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir Next", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("Avenir", 100, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 200, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 300, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 400, 0 , 100, CFSTR("Avenir-Book")));
+ EXPECT_TRUE(compareFonts("Avenir", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 500, 0 , 100, CFSTR("Avenir-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Baskerville", 100, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 100, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 200, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 200, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 300, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 300, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 400, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 400, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 500, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 500, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 600, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 600, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 700, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 700, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 800, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 800, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 900, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 900, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Didot", 100, 0 , 100, CFSTR("Didot")));
+ EXPECT_TRUE(compareFonts("Didot", 100, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 200, 0 , 100, CFSTR("Didot")));
+ EXPECT_TRUE(compareFonts("Didot", 200, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 300, 0 , 100, CFSTR("Didot")));
+ EXPECT_TRUE(compareFonts("Didot", 300, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 400, 0 , 100, CFSTR("Didot")));
+ EXPECT_TRUE(compareFonts("Didot", 400, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 500, 0 , 100, CFSTR("Didot")));
+ EXPECT_TRUE(compareFonts("Didot", 500, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 600, 0 , 100, CFSTR("Didot-Bold")));
+ EXPECT_TRUE(compareFonts("Didot", 600, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 700, 0 , 100, CFSTR("Didot-Bold")));
+ EXPECT_TRUE(compareFonts("Didot", 700, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 800, 0 , 100, CFSTR("Didot-Bold")));
+ EXPECT_TRUE(compareFonts("Didot", 800, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Didot", 900, 0 , 100, CFSTR("Didot-Bold")));
+ EXPECT_TRUE(compareFonts("Didot", 900, 20, 100, CFSTR("Didot-Italic")));
+ EXPECT_TRUE(compareFonts("Futura", 100, 0 , 100, CFSTR("Futura-Medium")));
+ EXPECT_TRUE(compareFonts("Futura", 100, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 200, 0 , 100, CFSTR("Futura-Medium")));
+ EXPECT_TRUE(compareFonts("Futura", 200, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 300, 0 , 100, CFSTR("Futura-Medium")));
+ EXPECT_TRUE(compareFonts("Futura", 300, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 400, 0 , 100, CFSTR("Futura-Medium")));
+ EXPECT_TRUE(compareFonts("Futura", 400, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 500, 0 , 100, CFSTR("Futura-Medium")));
+ EXPECT_TRUE(compareFonts("Futura", 500, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 600, 0 , 100, CFSTR("Futura-Bold")));
+ EXPECT_TRUE(compareFonts("Futura", 600, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 700, 0 , 100, CFSTR("Futura-Bold")));
+ EXPECT_TRUE(compareFonts("Futura", 700, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 800, 0 , 100, CFSTR("Futura-Bold")));
+ EXPECT_TRUE(compareFonts("Futura", 800, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Futura", 900, 0 , 100, CFSTR("Futura-Bold")));
+ EXPECT_TRUE(compareFonts("Futura", 900, 20, 100, CFSTR("Futura-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 100, 0 , 100, CFSTR("HelveticaNeue-UltraLight")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 100, 20, 100, CFSTR("HelveticaNeue-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 200, 0 , 100, CFSTR("HelveticaNeue-Thin")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 200, 20, 100, CFSTR("HelveticaNeue-ThinItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 300, 0 , 100, CFSTR("HelveticaNeue-Light")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 300, 20, 100, CFSTR("HelveticaNeue-LightItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 400, 0 , 100, CFSTR("HelveticaNeue")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 400, 20, 100, CFSTR("HelveticaNeue-Italic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 500, 0 , 100, CFSTR("HelveticaNeue-Medium")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 500, 20, 100, CFSTR("HelveticaNeue-MediumItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 600, 0 , 100, CFSTR("HelveticaNeue-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 600, 20, 100, CFSTR("HelveticaNeue-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 700, 0 , 100, CFSTR("HelveticaNeue-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 700, 20, 100, CFSTR("HelveticaNeue-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 800, 0 , 100, CFSTR("HelveticaNeue-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 800, 20, 100, CFSTR("HelveticaNeue-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 900, 0 , 100, CFSTR("HelveticaNeue-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 900, 20, 100, CFSTR("HelveticaNeue-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica", 100, 0 , 100, CFSTR("Helvetica-Light")));
+ EXPECT_TRUE(compareFonts("Helvetica", 100, 20, 100, CFSTR("Helvetica-LightOblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 200, 0 , 100, CFSTR("Helvetica-Light")));
+ EXPECT_TRUE(compareFonts("Helvetica", 200, 20, 100, CFSTR("Helvetica-LightOblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 300, 0 , 100, CFSTR("Helvetica-Light")));
+ EXPECT_TRUE(compareFonts("Helvetica", 300, 20, 100, CFSTR("Helvetica-LightOblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 400, 0 , 100, CFSTR("Helvetica")));
+ EXPECT_TRUE(compareFonts("Helvetica", 400, 20, 100, CFSTR("Helvetica-Oblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 500, 0 , 100, CFSTR("Helvetica")));
+ EXPECT_TRUE(compareFonts("Helvetica", 500, 20, 100, CFSTR("Helvetica-Oblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 600, 0 , 100, CFSTR("Helvetica-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica", 600, 20, 100, CFSTR("Helvetica-BoldOblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 700, 0 , 100, CFSTR("Helvetica-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica", 700, 20, 100, CFSTR("Helvetica-BoldOblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 800, 0 , 100, CFSTR("Helvetica-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica", 800, 20, 100, CFSTR("Helvetica-BoldOblique")));
+ EXPECT_TRUE(compareFonts("Helvetica", 900, 0 , 100, CFSTR("Helvetica-Bold")));
+ EXPECT_TRUE(compareFonts("Helvetica", 900, 20, 100, CFSTR("Helvetica-BoldOblique")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 100, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 100, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 200, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 200, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 300, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 300, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 400, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 400, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 500, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 500, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 600, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 600, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 700, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 700, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 800, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 800, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 900, 0 , 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Kaku Gothic StdN", 900, 20, 100, CFSTR("HiraKakuStdN-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 100, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 100, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 200, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 200, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 300, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 300, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 400, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 400, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 500, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 500, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 600, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 600, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 700, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 700, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 800, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 800, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 900, 0 , 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Maru Gothic ProN", 900, 20, 100, CFSTR("HiraMaruProN-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 100, 0 , 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 100, 20, 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 200, 0 , 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 200, 20, 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 300, 0 , 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 300, 20, 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 400, 0 , 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 400, 20, 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 500, 0 , 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 500, 20, 100, CFSTR("HiraMinProN-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 600, 0 , 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 600, 20, 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 700, 0 , 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 700, 20, 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 800, 0 , 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 800, 20, 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 900, 0 , 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Mincho ProN", 900, 20, 100, CFSTR("HiraMinProN-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 100, 0 , 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 100, 20, 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 200, 0 , 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 200, 20, 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 300, 0 , 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 300, 20, 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 400, 0 , 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 400, 20, 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 500, 0 , 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 500, 20, 100, CFSTR("HiraginoSansGB-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 600, 0 , 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 600, 20, 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 700, 0 , 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 700, 20, 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 800, 0 , 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 800, 20, 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 900, 0 , 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans GB", 900, 20, 100, CFSTR("HiraginoSansGB-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 100, 0 , 100, CFSTR("HiraginoSans-W0")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 100, 20, 100, CFSTR("HiraginoSans-W0")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 200, 0 , 100, CFSTR("HiraginoSans-W1")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 200, 20, 100, CFSTR("HiraginoSans-W1")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 300, 0 , 100, CFSTR("HiraginoSans-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 300, 20, 100, CFSTR("HiraginoSans-W3")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 400, 0 , 100, CFSTR("HiraginoSans-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 400, 20, 100, CFSTR("HiraginoSans-W4")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 500, 0 , 100, CFSTR("HiraginoSans-W5")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 500, 20, 100, CFSTR("HiraginoSans-W5")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 600, 0 , 100, CFSTR("HiraginoSans-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 600, 20, 100, CFSTR("HiraginoSans-W6")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 700, 0 , 100, CFSTR("HiraginoSans-W7")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 700, 20, 100, CFSTR("HiraginoSans-W7")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 800, 0 , 100, CFSTR("HiraginoSans-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 800, 20, 100, CFSTR("HiraginoSans-W8")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 900, 0 , 100, CFSTR("HiraginoSans-W9")));
+ EXPECT_TRUE(compareFonts("Hiragino Sans", 900, 20, 100, CFSTR("HiraginoSans-W9")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 100, 0 , 100, CFSTR("HoeflerText-Regular")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 100, 20, 100, CFSTR("HoeflerText-Italic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 200, 0 , 100, CFSTR("HoeflerText-Regular")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 200, 20, 100, CFSTR("HoeflerText-Italic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 300, 0 , 100, CFSTR("HoeflerText-Regular")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 300, 20, 100, CFSTR("HoeflerText-Italic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 400, 0 , 100, CFSTR("HoeflerText-Regular")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 400, 20, 100, CFSTR("HoeflerText-Italic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 500, 0 , 100, CFSTR("HoeflerText-Regular")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 500, 20, 100, CFSTR("HoeflerText-Italic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 600, 0 , 100, CFSTR("HoeflerText-Black")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 600, 20, 100, CFSTR("HoeflerText-BlackItalic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 700, 0 , 100, CFSTR("HoeflerText-Black")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 700, 20, 100, CFSTR("HoeflerText-BlackItalic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 800, 0 , 100, CFSTR("HoeflerText-Black")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 800, 20, 100, CFSTR("HoeflerText-BlackItalic")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 900, 0 , 100, CFSTR("HoeflerText-Black")));
+ EXPECT_TRUE(compareFonts("Hoefler Text", 900, 20, 100, CFSTR("HoeflerText-BlackItalic")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 100, 0 , 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 100, 20, 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 200, 0 , 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 200, 20, 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 300, 0 , 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 300, 20, 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 400, 0 , 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 400, 20, 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 500, 0 , 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 500, 20, 100, CFSTR("LucidaGrande")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 600, 0 , 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 600, 20, 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 700, 0 , 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 700, 20, 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 800, 0 , 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 800, 20, 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 900, 0 , 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Lucida Grande", 900, 20, 100, CFSTR("LucidaGrande-Bold")));
+ EXPECT_TRUE(compareFonts("Optima", 100, 0 , 100, CFSTR("Optima-Regular")));
+ EXPECT_TRUE(compareFonts("Optima", 100, 20, 100, CFSTR("Optima-Italic")));
+ EXPECT_TRUE(compareFonts("Optima", 200, 0 , 100, CFSTR("Optima-Regular")));
+ EXPECT_TRUE(compareFonts("Optima", 200, 20, 100, CFSTR("Optima-Italic")));
+ EXPECT_TRUE(compareFonts("Optima", 300, 0 , 100, CFSTR("Optima-Regular")));
+ EXPECT_TRUE(compareFonts("Optima", 300, 20, 100, CFSTR("Optima-Italic")));
+ EXPECT_TRUE(compareFonts("Optima", 400, 0 , 100, CFSTR("Optima-Regular")));
+ EXPECT_TRUE(compareFonts("Optima", 400, 20, 100, CFSTR("Optima-Italic")));
+ EXPECT_TRUE(compareFonts("Optima", 500, 0 , 100, CFSTR("Optima-Regular")));
+ EXPECT_TRUE(compareFonts("Optima", 500, 20, 100, CFSTR("Optima-Italic")));
+ EXPECT_TRUE(compareFonts("Optima", 600, 0 , 100, CFSTR("Optima-Bold")));
+ EXPECT_TRUE(compareFonts("Optima", 600, 20, 100, CFSTR("Optima-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Optima", 700, 0 , 100, CFSTR("Optima-Bold")));
+ EXPECT_TRUE(compareFonts("Optima", 700, 20, 100, CFSTR("Optima-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Optima", 800, 0 , 100, CFSTR("Optima-ExtraBlack")));
+ EXPECT_TRUE(compareFonts("Optima", 800, 20, 100, CFSTR("Optima-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Optima", 900, 0 , 100, CFSTR("Optima-ExtraBlack")));
+ EXPECT_TRUE(compareFonts("Optima", 900, 20, 100, CFSTR("Optima-BoldItalic")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 100, 0 , 100, CFSTR("PingFangHK-Ultralight")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 100, 20, 100, CFSTR("PingFangHK-Ultralight")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 200, 0 , 100, CFSTR("PingFangHK-Thin")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 200, 20, 100, CFSTR("PingFangHK-Thin")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 300, 0 , 100, CFSTR("PingFangHK-Light")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 300, 20, 100, CFSTR("PingFangHK-Light")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 400, 0 , 100, CFSTR("PingFangHK-Regular")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 400, 20, 100, CFSTR("PingFangHK-Regular")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 500, 0 , 100, CFSTR("PingFangHK-Medium")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 500, 20, 100, CFSTR("PingFangHK-Medium")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 600, 0 , 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 600, 20, 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 700, 0 , 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 700, 20, 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 800, 0 , 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 800, 20, 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 900, 0 , 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang HK", 900, 20, 100, CFSTR("PingFangHK-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 100, 0 , 100, CFSTR("PingFangSC-Ultralight")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 100, 20, 100, CFSTR("PingFangSC-Ultralight")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 200, 0 , 100, CFSTR("PingFangSC-Thin")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 200, 20, 100, CFSTR("PingFangSC-Thin")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 300, 0 , 100, CFSTR("PingFangSC-Light")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 300, 20, 100, CFSTR("PingFangSC-Light")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 400, 0 , 100, CFSTR("PingFangSC-Regular")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 400, 20, 100, CFSTR("PingFangSC-Regular")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 500, 0 , 100, CFSTR("PingFangSC-Medium")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 500, 20, 100, CFSTR("PingFangSC-Medium")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 600, 0 , 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 600, 20, 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 700, 0 , 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 700, 20, 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 800, 0 , 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 800, 20, 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 900, 0 , 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang SC", 900, 20, 100, CFSTR("PingFangSC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 100, 0 , 100, CFSTR("PingFangTC-Ultralight")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 100, 20, 100, CFSTR("PingFangTC-Ultralight")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 200, 0 , 100, CFSTR("PingFangTC-Thin")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 200, 20, 100, CFSTR("PingFangTC-Thin")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 300, 0 , 100, CFSTR("PingFangTC-Light")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 300, 20, 100, CFSTR("PingFangTC-Light")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 400, 0 , 100, CFSTR("PingFangTC-Regular")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 400, 20, 100, CFSTR("PingFangTC-Regular")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 500, 0 , 100, CFSTR("PingFangTC-Medium")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 500, 20, 100, CFSTR("PingFangTC-Medium")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 600, 0 , 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 600, 20, 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 700, 0 , 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 700, 20, 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 800, 0 , 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 800, 20, 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 900, 0 , 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("PingFang TC", 900, 20, 100, CFSTR("PingFangTC-Semibold")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 100, 0 , 100, CFSTR("TimesNewRomanPSMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 100, 20, 100, CFSTR("TimesNewRomanPS-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 200, 0 , 100, CFSTR("TimesNewRomanPSMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 200, 20, 100, CFSTR("TimesNewRomanPS-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 300, 0 , 100, CFSTR("TimesNewRomanPSMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 300, 20, 100, CFSTR("TimesNewRomanPS-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 400, 0 , 100, CFSTR("TimesNewRomanPSMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 400, 20, 100, CFSTR("TimesNewRomanPS-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 500, 0 , 100, CFSTR("TimesNewRomanPSMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 500, 20, 100, CFSTR("TimesNewRomanPS-ItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 600, 0 , 100, CFSTR("TimesNewRomanPS-BoldMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 600, 20, 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 700, 0 , 100, CFSTR("TimesNewRomanPS-BoldMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 700, 20, 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 800, 0 , 100, CFSTR("TimesNewRomanPS-BoldMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 800, 20, 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 900, 0 , 100, CFSTR("TimesNewRomanPS-BoldMT")));
+ EXPECT_TRUE(compareFonts("Times New Roman", 900, 20, 100, CFSTR("TimesNewRomanPS-BoldItalicMT")));
+ EXPECT_TRUE(compareFonts("Times", 100, 0 , 100, CFSTR("Times-Roman")));
+ EXPECT_TRUE(compareFonts("Times", 100, 20, 100, CFSTR("Times-Italic")));
+ EXPECT_TRUE(compareFonts("Times", 200, 0 , 100, CFSTR("Times-Roman")));
+ EXPECT_TRUE(compareFonts("Times", 200, 20, 100, CFSTR("Times-Italic")));
+ EXPECT_TRUE(compareFonts("Times", 300, 0 , 100, CFSTR("Times-Roman")));
+ EXPECT_TRUE(compareFonts("Times", 300, 20, 100, CFSTR("Times-Italic")));
+ EXPECT_TRUE(compareFonts("Times", 400, 0 , 100, CFSTR("Times-Roman")));
+ EXPECT_TRUE(compareFonts("Times", 400, 20, 100, CFSTR("Times-Italic")));
+ EXPECT_TRUE(compareFonts("Times", 500, 0 , 100, CFSTR("Times-Roman")));
+ EXPECT_TRUE(compareFonts("Times", 500, 20, 100, CFSTR("Times-Italic")));
+ EXPECT_TRUE(compareFonts("Times", 600, 0 , 100, CFSTR("Times-Bold")));
+ EXPECT_TRUE(compareFonts("Times", 600, 20, 100, CFSTR("Times-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Times", 700, 0 , 100, CFSTR("Times-Bold")));
+ EXPECT_TRUE(compareFonts("Times", 700, 20, 100, CFSTR("Times-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Times", 800, 0 , 100, CFSTR("Times-Bold")));
+ EXPECT_TRUE(compareFonts("Times", 800, 20, 100, CFSTR("Times-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Times", 900, 0 , 100, CFSTR("Times-Bold")));
+ EXPECT_TRUE(compareFonts("Times", 900, 20, 100, CFSTR("Times-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 700, 0 , 87.5, CFSTR("HelveticaNeue-CondensedBold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 800, 0 , 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 900, 0 , 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 700, 0 , 75, CFSTR("HelveticaNeue-CondensedBold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 800, 0 , 75, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 900, 0 , 75, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 700, 20, 87.5, CFSTR("HelveticaNeue-CondensedBold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 800, 20, 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 900, 20, 87.5, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 700, 20, 75, CFSTR("HelveticaNeue-CondensedBold")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 800, 20, 75, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Helvetica Neue", 900, 20, 75, CFSTR("HelveticaNeue-CondensedBlack")));
+ EXPECT_TRUE(compareFonts("Futura", 500, 0 , 87.5, CFSTR("Futura-CondensedMedium")));
+ EXPECT_TRUE(compareFonts("Futura", 500, 20, 87.5, CFSTR("Futura-CondensedMedium")));
+ EXPECT_TRUE(compareFonts("Futura", 600, 0 , 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 600, 20, 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 700, 0 , 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 700, 20, 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 800, 0 , 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 800, 20, 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 900, 0 , 87.5, CFSTR("Futura-CondensedExtraBold")));
+ EXPECT_TRUE(compareFonts("Futura", 900, 20, 87.5, CFSTR("Futura-CondensedExtraBold")));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST_F(FontCacheTest, FontLookupFromPostScriptName)
</span><span class="cx"> {
</span><del>- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight100, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight100, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Thin")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight200, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight200, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight300, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight300, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Light")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight400, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight400, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Regular")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight500, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight500, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Medium")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight600, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight600, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight700, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight700, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Bold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight800, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight800, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight900, FontItalicOff, 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", FontWeight900, FontItalicOn , 100, CFSTR("AppleSDGothicNeo-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Black", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BlackOblique", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Book")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Book")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Book")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Book")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Book")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Book", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-BookOblique", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Heavy", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Light")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Light", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-LightOblique", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Medium")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Medium")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Medium")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Medium")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Medium")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Medium", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-MediumOblique", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-Oblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Oblique", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight100, FontItalicOff, 100, CFSTR("Avenir-Roman")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight100, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight200, FontItalicOff, 100, CFSTR("Avenir-Roman")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight200, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight300, FontItalicOff, 100, CFSTR("Avenir-Roman")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight300, FontItalicOn , 100, CFSTR("Avenir-LightOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight400, FontItalicOff, 100, CFSTR("Avenir-Roman")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight400, FontItalicOn , 100, CFSTR("Avenir-BookOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight500, FontItalicOff, 100, CFSTR("Avenir-Roman")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight500, FontItalicOn , 100, CFSTR("Avenir-MediumOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight600, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight600, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight700, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight700, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight800, FontItalicOff, 100, CFSTR("Avenir-Black")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight800, FontItalicOn , 100, CFSTR("Avenir-BlackOblique")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight900, FontItalicOff, 100, CFSTR("Avenir-Heavy")));
- EXPECT_TRUE(compareFonts("Avenir-Roman", FontWeight900, FontItalicOn , 100, CFSTR("Avenir-HeavyOblique")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Bold", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Heavy", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Italic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Medium", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-Regular", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNext-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNext-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNext-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNext-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNext-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNext-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNext-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Medium")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Regular")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-Italic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLight")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight100, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight100, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight200, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight200, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight300, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight300, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight400, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight400, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight500, FontItalicOff, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight500, FontItalicOn , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight600, FontItalicOff, 100, CFSTR("AvenirNextCondensed-DemiBold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight600, FontItalicOn , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight700, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Bold")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight700, FontItalicOn , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight800, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight800, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight900, FontItalicOff, 100, CFSTR("AvenirNextCondensed-Heavy")));
- EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", FontWeight900, FontItalicOn , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Bold", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-Bold")));
- EXPECT_TRUE(compareFonts("Baskerville-Italic", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-Italic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-SemiBold")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBold", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-BoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight100, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight100, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight200, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight200, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight300, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight300, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight400, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight400, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight500, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight500, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight600, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight600, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight700, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight700, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight800, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight800, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight900, FontItalicOff, 100, CFSTR("Baskerville-SemiBoldItalic")));
- EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", FontWeight900, FontItalicOn , 100, CFSTR("Baskerville-SemiBoldItalic")));
</del><ins>+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 200, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 600, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 800, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Bold", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 100, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 200, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 300, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 400, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 500, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 600, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 700, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 900, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-ExtraBold", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 200, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 600, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 800, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Heavy", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 200, 0 , 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Light", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 200, 0 , 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Medium", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 200, 0 , 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Regular", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 100, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 200, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 300, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 400, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 500, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 700, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 800, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 900, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-SemiBold", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 100, 0 , 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 200, 0 , 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 300, 0 , 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 400, 0 , 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 500, 0 , 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-Thin", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 100, 0 , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 100, 20, 100, CFSTR("AppleSDGothicNeo-Thin")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 200, 0 , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 200, 20, 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 300, 0 , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 300, 20, 100, CFSTR("AppleSDGothicNeo-Light")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 400, 0 , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 400, 20, 100, CFSTR("AppleSDGothicNeo-Regular")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 500, 0 , 100, CFSTR("AppleSDGothicNeo-UltraLight")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 500, 20, 100, CFSTR("AppleSDGothicNeo-Medium")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 600, 0 , 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 600, 20, 100, CFSTR("AppleSDGothicNeo-SemiBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 700, 0 , 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 700, 20, 100, CFSTR("AppleSDGothicNeo-Bold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 800, 0 , 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 800, 20, 100, CFSTR("AppleSDGothicNeo-ExtraBold")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 900, 0 , 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("AppleSDGothicNeo-UltraLight", 900, 20, 100, CFSTR("AppleSDGothicNeo-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 100, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 200, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 300, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 400, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 500, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 900, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Black", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 100, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 100, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 200, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 200, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 300, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 300, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 400, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 400, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 500, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 500, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 600, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 700, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 800, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 900, 0 , 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BlackOblique", 900, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 100, 0 , 100, CFSTR("Avenir-Book")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 200, 0 , 100, CFSTR("Avenir-Book")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 300, 0 , 100, CFSTR("Avenir-Book")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 400, 0 , 100, CFSTR("Avenir-Book")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 500, 0 , 100, CFSTR("Avenir-Book")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Book", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 100, 0 , 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 100, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 200, 0 , 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 200, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 300, 0 , 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 300, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 400, 0 , 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 500, 0 , 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 500, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-BookOblique", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 100, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 200, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 300, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 400, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 500, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 600, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 700, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 800, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Heavy", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 100, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 100, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 200, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 200, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 300, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 300, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 400, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 400, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 500, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 500, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 600, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 600, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 700, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 700, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 800, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 800, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 900, 0 , 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-HeavyOblique", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 100, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 200, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 300, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 400, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 500, 0 , 100, CFSTR("Avenir-Light")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Light", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 100, 0 , 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 200, 0 , 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 300, 0 , 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 400, 0 , 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 400, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 500, 0 , 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 500, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-LightOblique", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 100, 0 , 100, CFSTR("Avenir-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 200, 0 , 100, CFSTR("Avenir-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 300, 0 , 100, CFSTR("Avenir-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 400, 0 , 100, CFSTR("Avenir-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 500, 0 , 100, CFSTR("Avenir-Medium")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Medium", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 100, 0 , 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 100, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 200, 0 , 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 200, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 300, 0 , 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 300, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 400, 0 , 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 400, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 500, 0 , 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-MediumOblique", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 100, 0 , 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 100, 20, 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 200, 0 , 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 200, 20, 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 300, 0 , 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 300, 20, 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 400, 0 , 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 400, 20, 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 500, 0 , 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 500, 20, 100, CFSTR("Avenir-Oblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Oblique", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 100, 0 , 100, CFSTR("Avenir-Roman")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 100, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 200, 0 , 100, CFSTR("Avenir-Roman")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 200, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 300, 0 , 100, CFSTR("Avenir-Roman")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 300, 20, 100, CFSTR("Avenir-LightOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 400, 0 , 100, CFSTR("Avenir-Roman")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 400, 20, 100, CFSTR("Avenir-BookOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 500, 0 , 100, CFSTR("Avenir-Roman")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 500, 20, 100, CFSTR("Avenir-MediumOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 600, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 600, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 700, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 700, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 800, 0 , 100, CFSTR("Avenir-Black")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 800, 20, 100, CFSTR("Avenir-BlackOblique")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 900, 0 , 100, CFSTR("Avenir-Heavy")));
+ EXPECT_TRUE(compareFonts("Avenir-Roman", 900, 20, 100, CFSTR("Avenir-HeavyOblique")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 100, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 200, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 300, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 400, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 500, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 600, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 800, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 900, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Bold", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 100, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 100, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 200, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 200, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 300, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 300, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 400, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 400, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 500, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 500, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 600, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 600, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 700, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 800, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 800, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 900, 0 , 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-BoldItalic", 900, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 100, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 200, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 300, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 400, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 500, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 700, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 800, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 900, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBold", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 100, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 100, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 200, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 200, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 300, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 300, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 400, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 400, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 500, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 500, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 600, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 700, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 700, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 800, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 800, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 900, 0 , 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-DemiBoldItalic", 900, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 100, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 200, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 300, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 400, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 500, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 600, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 700, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Heavy", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 100, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 100, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 200, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 200, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 300, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 300, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 400, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 400, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 500, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 500, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 600, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 600, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 700, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 700, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 800, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 900, 0 , 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-HeavyItalic", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 100, 0 , 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 100, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 200, 0 , 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 200, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 300, 0 , 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 300, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 400, 0 , 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 500, 0 , 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 500, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Italic", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 100, 0 , 100, CFSTR("AvenirNext-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 200, 0 , 100, CFSTR("AvenirNext-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 300, 0 , 100, CFSTR("AvenirNext-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 400, 0 , 100, CFSTR("AvenirNext-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 500, 0 , 100, CFSTR("AvenirNext-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Medium", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 100, 0 , 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 100, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 200, 0 , 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 200, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 300, 0 , 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 300, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 400, 0 , 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 400, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 500, 0 , 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-MediumItalic", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 100, 0 , 100, CFSTR("AvenirNext-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 200, 0 , 100, CFSTR("AvenirNext-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 300, 0 , 100, CFSTR("AvenirNext-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 400, 0 , 100, CFSTR("AvenirNext-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 500, 0 , 100, CFSTR("AvenirNext-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-Regular", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 100, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 200, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 300, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 400, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 400, 20, 100, CFSTR("AvenirNext-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 500, 0 , 100, CFSTR("AvenirNext-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 500, 20, 100, CFSTR("AvenirNext-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLight", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 100, 0 , 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 100, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 200, 0 , 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 200, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 300, 0 , 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 300, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 400, 0 , 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 400, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 500, 0 , 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 500, 20, 100, CFSTR("AvenirNext-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 600, 0 , 100, CFSTR("AvenirNext-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 600, 20, 100, CFSTR("AvenirNext-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 700, 0 , 100, CFSTR("AvenirNext-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 700, 20, 100, CFSTR("AvenirNext-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 800, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 800, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 900, 0 , 100, CFSTR("AvenirNext-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNext-UltraLightItalic", 900, 20, 100, CFSTR("AvenirNext-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 100, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 200, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 300, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 400, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 500, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 600, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 800, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 900, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Bold", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 100, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 100, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 200, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 200, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 300, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 300, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 400, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 400, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 500, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 500, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 600, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 600, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 700, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 800, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 800, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 900, 0 , 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-BoldItalic", 900, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 100, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 200, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 300, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 400, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 500, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 700, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 800, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 900, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBold", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 100, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 100, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 200, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 200, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 300, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 300, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 400, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 400, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 500, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 500, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 700, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 700, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 800, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 800, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 900, 0 , 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-DemiBoldItalic", 900, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 100, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 200, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 300, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 400, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 500, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 600, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 700, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Heavy", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 100, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 100, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 200, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 200, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 300, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 300, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 400, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 400, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 500, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 500, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 600, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 600, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 700, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 700, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 800, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 900, 0 , 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-HeavyItalic", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 100, 0 , 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 100, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 200, 0 , 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 200, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 300, 0 , 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 300, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 400, 0 , 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 500, 0 , 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 500, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Italic", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 100, 0 , 100, CFSTR("AvenirNextCondensed-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 200, 0 , 100, CFSTR("AvenirNextCondensed-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 300, 0 , 100, CFSTR("AvenirNextCondensed-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 400, 0 , 100, CFSTR("AvenirNextCondensed-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 500, 0 , 100, CFSTR("AvenirNextCondensed-Medium")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Medium", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 100, 0 , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 100, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 200, 0 , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 200, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 300, 0 , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 300, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 400, 0 , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 400, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 500, 0 , 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-MediumItalic", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 100, 0 , 100, CFSTR("AvenirNextCondensed-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 200, 0 , 100, CFSTR("AvenirNextCondensed-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 300, 0 , 100, CFSTR("AvenirNextCondensed-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 400, 0 , 100, CFSTR("AvenirNextCondensed-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 500, 0 , 100, CFSTR("AvenirNextCondensed-Regular")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-Regular", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 100, 0 , 100, CFSTR("AvenirNextCondensed-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 200, 0 , 100, CFSTR("AvenirNextCondensed-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 300, 0 , 100, CFSTR("AvenirNextCondensed-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 400, 0 , 100, CFSTR("AvenirNextCondensed-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 400, 20, 100, CFSTR("AvenirNextCondensed-Italic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 500, 0 , 100, CFSTR("AvenirNextCondensed-UltraLight")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 500, 20, 100, CFSTR("AvenirNextCondensed-MediumItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLight", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 100, 0 , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 100, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 200, 0 , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 200, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 300, 0 , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 300, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 400, 0 , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 400, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 500, 0 , 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 500, 20, 100, CFSTR("AvenirNextCondensed-UltraLightItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 600, 0 , 100, CFSTR("AvenirNextCondensed-DemiBold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 600, 20, 100, CFSTR("AvenirNextCondensed-DemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 700, 0 , 100, CFSTR("AvenirNextCondensed-Bold")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 700, 20, 100, CFSTR("AvenirNextCondensed-BoldItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 800, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 800, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 900, 0 , 100, CFSTR("AvenirNextCondensed-Heavy")));
+ EXPECT_TRUE(compareFonts("AvenirNextCondensed-UltraLightItalic", 900, 20, 100, CFSTR("AvenirNextCondensed-HeavyItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 100, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 100, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 200, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 200, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 300, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 300, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 400, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 400, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 500, 0 , 100, CFSTR("Baskerville")));
+ EXPECT_TRUE(compareFonts("Baskerville", 500, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 600, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 600, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 700, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 700, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 800, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 800, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville", 900, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville", 900, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 100, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 100, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 200, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 200, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 300, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 300, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 400, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 400, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 500, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 500, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 600, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 600, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 700, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 700, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 800, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 800, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 900, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Bold", 900, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 100, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 100, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 200, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 200, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 300, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 300, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 400, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 400, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 500, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 500, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 600, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 600, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 700, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 700, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 800, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 800, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 900, 0 , 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-BoldItalic", 900, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 100, 0 , 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 100, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 200, 0 , 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 200, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 300, 0 , 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 300, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 400, 0 , 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 400, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 500, 0 , 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 500, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 600, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 600, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 700, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 700, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 800, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 800, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 900, 0 , 100, CFSTR("Baskerville-Bold")));
+ EXPECT_TRUE(compareFonts("Baskerville-Italic", 900, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 100, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 100, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 200, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 200, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 300, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 300, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 400, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 400, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 500, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 500, 20, 100, CFSTR("Baskerville-Italic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 600, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 600, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 700, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 700, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 800, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 800, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 900, 0 , 100, CFSTR("Baskerville-SemiBold")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBold", 900, 20, 100, CFSTR("Baskerville-BoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 100, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 100, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 200, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 200, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 300, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 300, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 400, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 400, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 500, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 500, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 600, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 600, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 700, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 700, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 800, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 800, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 900, 0 , 100, CFSTR("Baskerville-SemiBoldItalic")));
+ EXPECT_TRUE(compareFonts("Baskerville-SemiBoldItalic", 900, 20, 100, CFSTR("Baskerville-SemiBoldItalic")));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>