<!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>[206664] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/206664">206664</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-09-30 14:11:21 -0700 (Fri, 30 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Templatize internal FontFeatureSettings class for variation font support
https://bugs.webkit.org/show_bug.cgi?id=162774
Reviewed by Alex Christensen.
Font features and font variations are similar in that they are identified
by four-character tags and an associated value. However, the value is an
int for font features and is a float for font variations. In order to
simplify code, we can use the same class for both, and use a template
argument to distinguish between the two. Then, typedefs can be used to
name them.
No new tests because there is no behavior change.
* WebCore.xcodeproj/project.pbxproj: Rename FontFeatureSettings.{cpp,h}
to FontTaggedSettings.{cpp,h}
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::ComputedStyleExtractor::propertyValue):
* css/CSSFontFace.h:
* css/CSSFontFaceSource.h:
* css/CSSFontFeatureValue.cpp:
(WebCore::CSSFontFeatureValue::CSSFontFeatureValue):
* css/CSSFontFeatureValue.h:
* css/FontFace.cpp:
(WebCore::FontFace::featureSettings):
* css/parser/CSSParser.cpp:
(WebCore::CSSParser::parseFontFeatureTag):
* loader/cache/CachedFont.h:
* platform/graphics/FontDescription.h:
* platform/graphics/FontFeatureSettings.cpp:
(WebCore::FontFeature::FontFeature): Deleted.
(WebCore::FontFeature::operator==): Deleted.
(WebCore::FontFeature::operator<): Deleted.
(WebCore::FontFeatureSettings::insert): Deleted.
(WebCore::FontFeatureSettings::hash): Deleted.
* platform/graphics/FontFeatureSettings.h: Removed.
(WebCore::fontFeatureTag): Deleted.
(WebCore::FontFeatureTagHash::hash): Deleted.
(WebCore::FontFeatureTagHash::equal): Deleted.
(WebCore::FontFeatureTagHashTraits::constructDeletedValue): Deleted.
(WebCore::FontFeatureTagHashTraits::isDeletedValue): Deleted.
(WebCore::FontFeature::operator!=): Deleted.
(WebCore::FontFeature::tag): Deleted.
(WebCore::FontFeature::value): Deleted.
(WebCore::FontFeature::enabled): Deleted.
(WebCore::FontFeatureSettings::operator==): Deleted.
(WebCore::FontFeatureSettings::operator!=): Deleted.
(WebCore::FontFeatureSettings::size): Deleted.
(WebCore::FontFeatureSettings::operator[]): Deleted.
(WebCore::FontFeatureSettings::at): Deleted.
(WebCore::FontFeatureSettings::begin): Deleted.
(WebCore::FontFeatureSettings::end): Deleted.
* platform/graphics/FontTaggedSettings.cpp: Renamed from Source/WebCore/platform/graphics/FontFeatureSettings.cpp.
(WebCore::FontFeatureSettings::hash):
* platform/graphics/FontTaggedSettings.h: Added.
(WebCore::fontFeatureTag):
(WebCore::FourCharacterTagHash::hash):
(WebCore::FourCharacterTagHash::equal):
(WebCore::FourCharacterTagHashTraits::constructDeletedValue):
(WebCore::FourCharacterTagHashTraits::isDeletedValue):
(WebCore::FontTaggedSetting::operator!=):
(WebCore::FontTaggedSetting::tag):
(WebCore::FontTaggedSetting::value):
(WebCore::FontTaggedSetting::enabled):
(WebCore::FontTaggedSetting<T>::FontTaggedSetting):
(WebCore::=):
(WebCore::FontTaggedSetting<T>::operator<):
(WebCore::FontTaggedSettings::operator==):
(WebCore::FontTaggedSettings::operator!=):
(WebCore::FontTaggedSettings::isEmpty):
(WebCore::FontTaggedSettings::size):
(WebCore::FontTaggedSettings::operator[]):
(WebCore::FontTaggedSettings::at):
(WebCore::FontTaggedSettings::begin):
(WebCore::FontTaggedSettings::end):
(WebCore::FontTaggedSettings<T>::insert):
* platform/graphics/cocoa/FontCacheCoreText.cpp:
(WebCore::tagEquals):
(WebCore::appendOpenTypeFeature):
* platform/graphics/mac/FontCustomPlatformData.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</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="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceh">trunk/Source/WebCore/css/CSSFontFace.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSourceh">trunk/Source/WebCore/css/CSSFontFaceSource.h</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFeatureValuecpp">trunk/Source/WebCore/css/CSSFontFeatureValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFeatureValueh">trunk/Source/WebCore/css/CSSFontFeatureValue.h</a></li>
<li><a href="#trunkSourceWebCorecssFontFacecpp">trunk/Source/WebCore/css/FontFace.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParsercpp">trunk/Source/WebCore/css/parser/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedFonth">trunk/Source/WebCore/loader/cache/CachedFont.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontDescriptionh">trunk/Source/WebCore/platform/graphics/FontDescription.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah">trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontTaggedSettingscpp">trunk/Source/WebCore/platform/graphics/FontTaggedSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontTaggedSettingsh">trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontFeatureSettingscpp">trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsFontFeatureSettingsh">trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -2204,7 +2204,7 @@
</span><span class="cx"> platform/graphics/FontCascade.cpp
</span><span class="cx"> platform/graphics/FontCascadeFonts.cpp
</span><span class="cx"> platform/graphics/FontDescription.cpp
</span><del>- platform/graphics/FontFeatureSettings.cpp
</del><ins>+ platform/graphics/FontTaggedSettings.cpp
</ins><span class="cx"> platform/graphics/FontGenericFamilies.cpp
</span><span class="cx"> platform/graphics/FontPlatformData.cpp
</span><span class="cx"> platform/graphics/FontRanges.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/ChangeLog 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -1,3 +1,86 @@
</span><ins>+2016-09-30 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Templatize internal FontFeatureSettings class for variation font support
+ https://bugs.webkit.org/show_bug.cgi?id=162774
+
+ Reviewed by Alex Christensen.
+
+ Font features and font variations are similar in that they are identified
+ by four-character tags and an associated value. However, the value is an
+ int for font features and is a float for font variations. In order to
+ simplify code, we can use the same class for both, and use a template
+ argument to distinguish between the two. Then, typedefs can be used to
+ name them.
+
+ No new tests because there is no behavior change.
+
+ * WebCore.xcodeproj/project.pbxproj: Rename FontFeatureSettings.{cpp,h}
+ to FontTaggedSettings.{cpp,h}
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * css/CSSFontFace.h:
+ * css/CSSFontFaceSource.h:
+ * css/CSSFontFeatureValue.cpp:
+ (WebCore::CSSFontFeatureValue::CSSFontFeatureValue):
+ * css/CSSFontFeatureValue.h:
+ * css/FontFace.cpp:
+ (WebCore::FontFace::featureSettings):
+ * css/parser/CSSParser.cpp:
+ (WebCore::CSSParser::parseFontFeatureTag):
+ * loader/cache/CachedFont.h:
+ * platform/graphics/FontDescription.h:
+ * platform/graphics/FontFeatureSettings.cpp:
+ (WebCore::FontFeature::FontFeature): Deleted.
+ (WebCore::FontFeature::operator==): Deleted.
+ (WebCore::FontFeature::operator<): Deleted.
+ (WebCore::FontFeatureSettings::insert): Deleted.
+ (WebCore::FontFeatureSettings::hash): Deleted.
+ * platform/graphics/FontFeatureSettings.h: Removed.
+ (WebCore::fontFeatureTag): Deleted.
+ (WebCore::FontFeatureTagHash::hash): Deleted.
+ (WebCore::FontFeatureTagHash::equal): Deleted.
+ (WebCore::FontFeatureTagHashTraits::constructDeletedValue): Deleted.
+ (WebCore::FontFeatureTagHashTraits::isDeletedValue): Deleted.
+ (WebCore::FontFeature::operator!=): Deleted.
+ (WebCore::FontFeature::tag): Deleted.
+ (WebCore::FontFeature::value): Deleted.
+ (WebCore::FontFeature::enabled): Deleted.
+ (WebCore::FontFeatureSettings::operator==): Deleted.
+ (WebCore::FontFeatureSettings::operator!=): Deleted.
+ (WebCore::FontFeatureSettings::size): Deleted.
+ (WebCore::FontFeatureSettings::operator[]): Deleted.
+ (WebCore::FontFeatureSettings::at): Deleted.
+ (WebCore::FontFeatureSettings::begin): Deleted.
+ (WebCore::FontFeatureSettings::end): Deleted.
+ * platform/graphics/FontTaggedSettings.cpp: Renamed from Source/WebCore/platform/graphics/FontFeatureSettings.cpp.
+ (WebCore::FontFeatureSettings::hash):
+ * platform/graphics/FontTaggedSettings.h: Added.
+ (WebCore::fontFeatureTag):
+ (WebCore::FourCharacterTagHash::hash):
+ (WebCore::FourCharacterTagHash::equal):
+ (WebCore::FourCharacterTagHashTraits::constructDeletedValue):
+ (WebCore::FourCharacterTagHashTraits::isDeletedValue):
+ (WebCore::FontTaggedSetting::operator!=):
+ (WebCore::FontTaggedSetting::tag):
+ (WebCore::FontTaggedSetting::value):
+ (WebCore::FontTaggedSetting::enabled):
+ (WebCore::FontTaggedSetting<T>::FontTaggedSetting):
+ (WebCore::=):
+ (WebCore::FontTaggedSetting<T>::operator<):
+ (WebCore::FontTaggedSettings::operator==):
+ (WebCore::FontTaggedSettings::operator!=):
+ (WebCore::FontTaggedSettings::isEmpty):
+ (WebCore::FontTaggedSettings::size):
+ (WebCore::FontTaggedSettings::operator[]):
+ (WebCore::FontTaggedSettings::at):
+ (WebCore::FontTaggedSettings::begin):
+ (WebCore::FontTaggedSettings::end):
+ (WebCore::FontTaggedSettings<T>::insert):
+ * platform/graphics/cocoa/FontCacheCoreText.cpp:
+ (WebCore::tagEquals):
+ (WebCore::appendOpenTypeFeature):
+ * platform/graphics/mac/FontCustomPlatformData.h:
+
</ins><span class="cx"> 2016-09-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Fragment serialization should always use 'xml:' prefix for attributes in XML namespace
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -1874,8 +1874,8 @@
</span><span class="cx"> 4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */; };
</span><span class="cx"> 4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */; };
</span><span class="cx"> 4A6E9FC413C17D1D0046A7F8 /* CSSFontFeatureValue.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC213C17D1D0046A7F8 /* CSSFontFeatureValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */; };
- 4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><ins>+ 4A6E9FC713C17D570046A7F8 /* FontTaggedSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC513C17D570046A7F8 /* FontTaggedSettings.cpp */; };
+ 4A6E9FC813C17D570046A7F8 /* FontTaggedSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A6E9FC613C17D570046A7F8 /* FontTaggedSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 4A8C96EB0BE69032004EEFF0 /* FrameSelectionMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */; };
</span><span class="cx"> 4A9CC81716BB9AC600EC645A /* CSSDefaultStyleSheets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A9CC81516BB9AC600EC645A /* CSSDefaultStyleSheets.cpp */; };
</span><span class="cx"> 4A9CC81816BB9AC600EC645A /* CSSDefaultStyleSheets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */; };
</span><span class="lines">@@ -8872,8 +8872,8 @@
</span><span class="cx"> 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSocketExtensionParser.h; sourceTree = "<group>"; };
</span><span class="cx"> 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSFontFeatureValue.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A6E9FC213C17D1D0046A7F8 /* CSSFontFeatureValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSFontFeatureValue.h; sourceTree = "<group>"; };
</span><del>- 4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontFeatureSettings.cpp; sourceTree = "<group>"; };
- 4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = FontFeatureSettings.h; sourceTree = "<group>"; };
</del><ins>+ 4A6E9FC513C17D570046A7F8 /* FontTaggedSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FontTaggedSettings.cpp; sourceTree = "<group>"; };
+ 4A6E9FC613C17D570046A7F8 /* FontTaggedSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = FontTaggedSettings.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = FrameSelectionMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> 4A9CC81516BB9AC600EC645A /* CSSDefaultStyleSheets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSDefaultStyleSheets.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSDefaultStyleSheets.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -20676,8 +20676,8 @@
</span><span class="cx"> B2C3DA570D006CD600EF6F26 /* FontCascadeFonts.h */,
</span><span class="cx"> 37ACCE620DA2AA960089E602 /* FontDescription.cpp */,
</span><span class="cx"> B2C3DA550D006CD600EF6F26 /* FontDescription.h */,
</span><del>- 4A6E9FC513C17D570046A7F8 /* FontFeatureSettings.cpp */,
- 4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */,
</del><ins>+ 4A6E9FC513C17D570046A7F8 /* FontTaggedSettings.cpp */,
+ 4A6E9FC613C17D570046A7F8 /* FontTaggedSettings.h */,
</ins><span class="cx"> E44EE3A617576E5500EEE8CF /* FontGenericFamilies.cpp */,
</span><span class="cx"> E44EE3A717576E5500EEE8CF /* FontGenericFamilies.h */,
</span><span class="cx"> 0845680712B90DA600960A9F /* FontMetrics.h */,
</span><span class="lines">@@ -24518,7 +24518,7 @@
</span><span class="cx"> B2C3DA660D006CD600EF6F26 /* FontDescription.h in Headers */,
</span><span class="cx"> 1C6626111C6E7CA600AB527C /* FontFace.h in Headers */,
</span><span class="cx"> 1C24EEA51C729CE40080F8FC /* FontFaceSet.h in Headers */,
</span><del>- 4A6E9FC813C17D570046A7F8 /* FontFeatureSettings.h in Headers */,
</del><ins>+ 4A6E9FC813C17D570046A7F8 /* FontTaggedSettings.h in Headers */,
</ins><span class="cx"> 0845680812B90DA600960A9F /* FontMetrics.h in Headers */,
</span><span class="cx"> B5320D6B122A24E9002D1440 /* FontPlatformData.h in Headers */,
</span><span class="cx"> 371F4FFC0D25E7F300ECE0D5 /* FontRanges.h in Headers */,
</span><span class="lines">@@ -28193,7 +28193,7 @@
</span><span class="cx"> 37ACCF690DA414E70089E602 /* FontDescription.cpp in Sources */,
</span><span class="cx"> 1C6626101C6E7CA600AB527C /* FontFace.cpp in Sources */,
</span><span class="cx"> 1C24EEA41C729CE40080F8FC /* FontFaceSet.cpp in Sources */,
</span><del>- 4A6E9FC713C17D570046A7F8 /* FontFeatureSettings.cpp in Sources */,
</del><ins>+ 4A6E9FC713C17D570046A7F8 /* FontTaggedSettings.cpp in Sources */,
</ins><span class="cx"> E44EE3A817577EBD00EEE8CF /* FontGenericFamilies.cpp in Sources */,
</span><span class="cx"> 84B62685133138F90095A489 /* FontPlatformData.cpp in Sources */,
</span><span class="cx"> B5320D6C122A24E9002D1440 /* FontPlatformDataCocoa.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #include "CursorList.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><del>-#include "FontFeatureSettings.h"
</del><ins>+#include "FontTaggedSettings.h"
</ins><span class="cx"> #include "HTMLFrameOwnerElement.h"
</span><span class="cx"> #include "Pair.h"
</span><span class="cx"> #include "PseudoElement.h"
</span><span class="lines">@@ -2876,7 +2876,7 @@
</span><span class="cx"> return cssValuePool.createIdentifierValue(CSSValueNormal);
</span><span class="cx"> RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
</span><span class="cx"> for (auto& feature : featureSettings)
</span><del>- list->append(CSSFontFeatureValue::create(FontFeatureTag(feature.tag()), feature.value()));
</del><ins>+ list->append(CSSFontFeatureValue::create(FontTag(feature.tag()), feature.value()));
</ins><span class="cx"> return list;
</span><span class="cx"> }
</span><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFace.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFace.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/CSSFontFace.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><span class="cx"> #include "CSSFontFaceRule.h"
</span><del>-#include "FontFeatureSettings.h"
</del><ins>+#include "FontTaggedSettings.h"
</ins><span class="cx"> #include "TextFlags.h"
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include <memory>
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSource.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/CSSFontFaceSource.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -38,11 +38,13 @@
</span><span class="cx"> class Font;
</span><span class="cx"> struct FontCustomPlatformData;
</span><span class="cx"> class FontDescription;
</span><del>-class FontFeatureSettings;
</del><span class="cx"> struct FontVariantSettings;
</span><span class="cx"> class SVGFontFaceElement;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><ins>+template <typename T> class FontTaggedSettings;
+typedef FontTaggedSettings<int> FontFeatureSettings;
+
</ins><span class="cx"> class CSSFontFaceSource final : public CachedFontClient {
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFeatureValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFeatureValue.cpp (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFeatureValue.cpp 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/CSSFontFeatureValue.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-CSSFontFeatureValue::CSSFontFeatureValue(FontFeatureTag&& tag, int value)
</del><ins>+CSSFontFeatureValue::CSSFontFeatureValue(FontTag&& tag, int value)
</ins><span class="cx"> : CSSValue(FontFeatureClass)
</span><span class="cx"> , m_tag(WTFMove(tag))
</span><span class="cx"> , m_value(value)
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFeatureValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFeatureValue.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFeatureValue.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/CSSFontFeatureValue.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -27,18 +27,18 @@
</span><span class="cx"> #define CSSFontFeatureValue_h
</span><span class="cx">
</span><span class="cx"> #include "CSSValue.h"
</span><del>-#include "FontFeatureSettings.h"
</del><ins>+#include "FontTaggedSettings.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSFontFeatureValue final : public CSSValue {
</span><span class="cx"> public:
</span><del>- static Ref<CSSFontFeatureValue> create(FontFeatureTag&& tag, int value)
</del><ins>+ static Ref<CSSFontFeatureValue> create(FontTag&& tag, int value)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new CSSFontFeatureValue(WTFMove(tag), value));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- const FontFeatureTag& tag() const { return m_tag; }
</del><ins>+ const FontTag& tag() const { return m_tag; }
</ins><span class="cx"> int value() const { return m_value; }
</span><span class="cx"> String customCSSText() const;
</span><span class="cx">
</span><span class="lines">@@ -45,9 +45,9 @@
</span><span class="cx"> bool equals(const CSSFontFeatureValue&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- CSSFontFeatureValue(FontFeatureTag&&, int);
</del><ins>+ CSSFontFeatureValue(FontTag&&, int);
</ins><span class="cx">
</span><del>- FontFeatureTag m_tag;
</del><ins>+ FontTag m_tag;
</ins><span class="cx"> const int m_value;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssFontFacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/FontFace.cpp (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/FontFace.cpp 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/FontFace.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -343,7 +343,7 @@
</span><span class="cx"> return ASCIILiteral("normal");
</span><span class="cx"> RefPtr<CSSValueList> list = CSSValueList::createCommaSeparated();
</span><span class="cx"> for (auto& feature : m_backing->featureSettings())
</span><del>- list->append(CSSFontFeatureValue::create(FontFeatureTag(feature.tag()), feature.value()));
</del><ins>+ list->append(CSSFontFeatureValue::create(FontTag(feature.tag()), feature.value()));
</ins><span class="cx"> return list->cssText();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -10570,7 +10570,7 @@
</span><span class="cx"> // Feature tag name comes first
</span><span class="cx"> if (value->unit != CSSPrimitiveValue::CSS_STRING)
</span><span class="cx"> return false;
</span><del>- FontFeatureTag tag;
</del><ins>+ FontTag tag;
</ins><span class="cx"> if (value->string.length() != tag.size())
</span><span class="cx"> return false;
</span><span class="cx"> for (unsigned i = 0; i < tag.size(); ++i) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedFonth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedFont.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedFont.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/loader/cache/CachedFont.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -35,12 +35,14 @@
</span><span class="cx">
</span><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class FontDescription;
</span><del>-class FontFeatureSettings;
</del><span class="cx"> class FontPlatformData;
</span><span class="cx"> class SVGDocument;
</span><span class="cx"> class SVGFontElement;
</span><span class="cx"> struct FontCustomPlatformData;
</span><span class="cx">
</span><ins>+template <typename T> class FontTaggedSettings;
+typedef FontTaggedSettings<int> FontFeatureSettings;
+
</ins><span class="cx"> class CachedFont : public CachedResource {
</span><span class="cx"> public:
</span><span class="cx"> CachedFont(CachedResourceRequest&&, SessionID, Type = FontResource);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontDescriptionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontDescription.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontDescription.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/platform/graphics/FontDescription.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #define FontDescription_h
</span><span class="cx">
</span><span class="cx"> #include "CSSValueKeywords.h"
</span><del>-#include "FontFeatureSettings.h"
</del><ins>+#include "FontTaggedSettings.h"
</ins><span class="cx"> #include "TextFlags.h"
</span><span class="cx"> #include "WebKitFontFamilyNames.h"
</span><span class="cx"> #include <unicode/uscript.h>
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontFeatureSettingscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -1,76 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google 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. ``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
- * 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.
- */
-
-#include "config.h"
-#include "FontFeatureSettings.h"
-
-#include <wtf/text/AtomicStringHash.h>
-
-namespace WebCore {
-
-FontFeature::FontFeature(const FontFeatureTag& tag, int value)
- : m_tag(tag)
- , m_value(value)
-{
-}
-
-FontFeature::FontFeature(FontFeatureTag&& tag, int value)
- : m_tag(WTFMove(tag))
- , m_value(value)
-{
-}
-
-bool FontFeature::operator==(const FontFeature& other) const
-{
- return m_tag == other.m_tag && m_value == other.m_value;
-}
-
-bool FontFeature::operator<(const FontFeature& other) const
-{
- return (m_tag < other.m_tag) || (m_tag == other.m_tag && m_value < other.m_value);
-}
-
-void FontFeatureSettings::insert(FontFeature&& feature)
-{
- // This vector will almost always have 0 or 1 items in it. Don't bother with the overhead of a binary search or a hash set.
- size_t i;
- for (i = 0; i < m_list.size(); ++i) {
- if (feature < m_list[i])
- break;
- }
- m_list.insert(i, WTFMove(feature));
-}
-
-unsigned FontFeatureSettings::hash() const
-{
- IntegerHasher hasher;
- for (auto& feature : m_list) {
- hasher.add(FontFeatureTagHash::hash(feature.tag()));
- hasher.add(feature.value());
- }
- return hasher.hash();
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontFeatureSettingsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -1,93 +0,0 @@
</span><del>-/*
- * Copyright (C) 2011 Google 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. ``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
- * 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.
- */
-
-#ifndef FontFeatureSettings_h
-#define FontFeatureSettings_h
-
-#include <array>
-#include <wtf/Vector.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-typedef std::array<char, 4> FontFeatureTag;
-
-inline FontFeatureTag fontFeatureTag(const char arr[4]) { return {{ arr[0], arr[1], arr[2], arr[3] }}; }
-
-struct FontFeatureTagHash {
- static unsigned hash(const FontFeatureTag& characters) { return (characters[0] << 24) | (characters[1] << 16) | (characters[2] << 8) | characters[3]; }
- static bool equal(const FontFeatureTag& a, const FontFeatureTag& b) { return a == b; }
- static const bool safeToCompareToEmptyOrDeleted = true;
-};
-
-#define _0xFF static_cast<char>(0xFF)
-struct FontFeatureTagHashTraits : WTF::GenericHashTraits<FontFeatureTag> {
- static const bool emptyValueIsZero = true;
- static void constructDeletedValue(FontFeatureTag& slot) { new (NotNull, std::addressof(slot)) FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
- static bool isDeletedValue(const FontFeatureTag& value) { return value == FontFeatureTag({{ _0xFF, _0xFF, _0xFF, _0xFF }}); }
-};
-#undef _0xFF
-
-class FontFeature {
-public:
- FontFeature() = delete;
- FontFeature(const FontFeatureTag&, int value);
- FontFeature(FontFeatureTag&&, int value);
-
- bool operator==(const FontFeature& other) const;
- bool operator!=(const FontFeature& other) const { return !(*this == other); }
- bool operator<(const FontFeature& other) const;
-
- const FontFeatureTag& tag() const { return m_tag; }
- int value() const { return m_value; }
- bool enabled() const { return value(); }
-
-private:
- FontFeatureTag m_tag;
- int m_value;
-};
-
-class FontFeatureSettings {
-public:
- void insert(FontFeature&&);
- bool operator==(const FontFeatureSettings& other) const { return m_list == other.m_list; }
- bool operator!=(const FontFeatureSettings& other) const { return !(*this == other); }
-
- size_t size() const { return m_list.size(); }
- const FontFeature& operator[](int index) const { return m_list[index]; }
- const FontFeature& at(size_t index) const { return m_list.at(index); }
-
- Vector<FontFeature>::const_iterator begin() const { return m_list.begin(); }
- Vector<FontFeature>::const_iterator end() const { return m_list.end(); }
-
- unsigned hash() const;
-
-private:
- Vector<FontFeature> m_list;
-};
-
-}
-
-#endif // FontFeatureSettings_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontTaggedSettingscppfromrev206663trunkSourceWebCoreplatformgraphicsFontFeatureSettingscpp"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebCore/platform/graphics/FontTaggedSettings.cpp (from rev 206663, trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp) (0 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontTaggedSettings.cpp (rev 0)
+++ trunk/Source/WebCore/platform/graphics/FontTaggedSettings.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2016 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. ``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
+ * 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.
+ */
+
+#include "config.h"
+#include "FontTaggedSettings.h"
+
+#include "TextStream.h"
+
+#include <wtf/text/AtomicStringHash.h>
+
+namespace WebCore {
+
+template <>
+unsigned FontFeatureSettings::hash() const
+{
+ IntegerHasher hasher;
+ for (auto& feature : m_list) {
+ hasher.add(FourCharacterTagHash::hash(feature.tag()));
+ hasher.add(feature.value());
+ }
+ return hasher.hash();
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontTaggedSettingsh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h (0 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h (rev 0)
+++ trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -0,0 +1,138 @@
</span><ins>+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ * Copyright (C) 2016 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. ``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
+ * 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 <array>
+#include <wtf/Vector.h>
+#include <wtf/text/AtomicString.h>
+
+namespace WebCore {
+
+class TextStream;
+
+typedef std::array<char, 4> FontTag;
+
+inline FontTag fontFeatureTag(const char arr[4]) { return {{ arr[0], arr[1], arr[2], arr[3] }}; }
+
+struct FourCharacterTagHash {
+ static unsigned hash(const FontTag& characters) { return (characters[0] << 24) | (characters[1] << 16) | (characters[2] << 8) | characters[3]; }
+ static bool equal(const FontTag& a, const FontTag& b) { return a == b; }
+ static const bool safeToCompareToEmptyOrDeleted = true;
+};
+
+const char ff = static_cast<char>(0xFF);
+struct FourCharacterTagHashTraits : WTF::GenericHashTraits<FontTag> {
+ static const bool emptyValueIsZero = true;
+ static void constructDeletedValue(FontTag& slot) { new (NotNull, std::addressof(slot)) FontTag({{ ff, ff, ff, ff }}); }
+ static bool isDeletedValue(const FontTag& value) { return value == FontTag({{ ff, ff, ff, ff }}); }
+};
+
+template <typename T>
+class FontTaggedSetting {
+public:
+ FontTaggedSetting() = delete;
+ FontTaggedSetting(const FontTag&, T value);
+ FontTaggedSetting(FontTag&&, T value);
+
+ bool operator==(const FontTaggedSetting<T>& other) const;
+ bool operator!=(const FontTaggedSetting<T>& other) const { return !(*this == other); }
+ bool operator<(const FontTaggedSetting<T>& other) const;
+
+ const FontTag& tag() const { return m_tag; }
+ T value() const { return m_value; }
+ bool enabled() const { return value(); }
+
+private:
+ FontTag m_tag;
+ T m_value;
+};
+
+template <typename T>
+FontTaggedSetting<T>::FontTaggedSetting(const FontTag& tag, T value)
+ : m_tag(tag)
+ , m_value(value)
+{
+}
+
+template <typename T>
+FontTaggedSetting<T>::FontTaggedSetting(FontTag&& tag, T value)
+ : m_tag(WTFMove(tag))
+ , m_value(value)
+{
+}
+
+template <typename T>
+bool FontTaggedSetting<T>::operator==(const FontTaggedSetting<T>& other) const
+{
+ return m_tag == other.m_tag && m_value == other.m_value;
+}
+
+template <typename T>
+bool FontTaggedSetting<T>::operator<(const FontTaggedSetting<T>& other) const
+{
+ return (m_tag < other.m_tag) || (m_tag == other.m_tag && m_value < other.m_value);
+}
+
+template <typename T>
+class FontTaggedSettings {
+public:
+ void insert(FontTaggedSetting<T>&&);
+ bool operator==(const FontTaggedSettings<T>& other) const { return m_list == other.m_list; }
+ bool operator!=(const FontTaggedSettings<T>& other) const { return !(*this == other); }
+
+ bool isEmpty() const { return !size(); }
+ size_t size() const { return m_list.size(); }
+ const FontTaggedSetting<T>& operator[](int index) const { return m_list[index]; }
+ const FontTaggedSetting<T>& at(size_t index) const { return m_list.at(index); }
+
+ typename Vector<FontTaggedSetting<T>>::const_iterator begin() const { return m_list.begin(); }
+ typename Vector<FontTaggedSetting<T>>::const_iterator end() const { return m_list.end(); }
+
+ unsigned hash() const;
+
+private:
+ Vector<FontTaggedSetting<T>> m_list;
+};
+
+template <typename T>
+void FontTaggedSettings<T>::insert(FontTaggedSetting<T>&& feature)
+{
+ // This vector will almost always have 0 or 1 items in it. Don't bother with the overhead of a binary search or a hash set.
+ size_t i;
+ for (i = 0; i < m_list.size(); ++i) {
+ if (!(feature < m_list[i]))
+ break;
+ }
+ if (i < m_list.size() && feature.tag() == m_list[i].tag())
+ m_list.remove(i);
+ m_list.insert(i, WTFMove(feature));
+}
+
+typedef FontTaggedSetting<int> FontFeature;
+typedef FontTaggedSettings<int> FontFeatureSettings;
+
+}
</ins><span class="cx">Property changes on: trunk/Source/WebCore/platform/graphics/FontTaggedSettings.h
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<ins>+native
</ins><span class="cx">\ No newline at end of property
</span><a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<ins>+Author Date Id Rev URL
</ins><span class="cx">\ No newline at end of property
</span><a id="trunkSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> CFArrayAppendValue(features, feature.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline bool tagEquals(FontFeatureTag tag, const char comparison[4])
</del><ins>+static inline bool tagEquals(FontTag tag, const char comparison[4])
</ins><span class="cx"> {
</span><span class="cx"> return equalIgnoringASCIICase(tag.data(), comparison, 4);
</span><span class="cx"> }
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx">
</span><span class="cx"> static inline void appendOpenTypeFeature(CFMutableArrayRef features, const FontFeature& feature)
</span><span class="cx"> {
</span><del>- RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontFeatureTag::value_type), kCFStringEncodingASCII, false));
</del><ins>+ RetainPtr<CFStringRef> featureKey = adoptCF(CFStringCreateWithBytes(kCFAllocatorDefault, reinterpret_cast<const UInt8*>(feature.tag().data()), feature.tag().size() * sizeof(FontTag::value_type), kCFStringEncodingASCII, false));
</ins><span class="cx"> int rawFeatureValue = feature.value();
</span><span class="cx"> RetainPtr<CFNumberRef> featureValue = adoptCF(CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &rawFeatureValue));
</span><span class="cx"> CFTypeRef featureDictionaryKeys[] = { kCTFontOpenTypeFeatureTag, kCTFontOpenTypeFeatureValue };
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> CFArrayAppendValue(features, featureDictionary.get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-typedef HashMap<FontFeatureTag, int, FontFeatureTagHash, FontFeatureTagHashTraits> FeaturesMap;
</del><ins>+typedef HashMap<FontTag, int, FourCharacterTagHash, FourCharacterTagHashTraits> FeaturesMap;
</ins><span class="cx">
</span><span class="cx"> static FeaturesMap computeFeatureSettingsFromVariants(const FontVariantSettings& variantSettings)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsmacFontCustomPlatformDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h (206663 => 206664)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2016-09-30 21:03:27 UTC (rev 206663)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCustomPlatformData.h 2016-09-30 21:11:21 UTC (rev 206664)
</span><span class="lines">@@ -33,10 +33,12 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FontDescription;
</span><del>-class FontFeatureSettings;
</del><span class="cx"> class FontPlatformData;
</span><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><ins>+template <typename T> class FontTaggedSettings;
+typedef FontTaggedSettings<int> FontFeatureSettings;
+
</ins><span class="cx"> struct FontCustomPlatformData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(FontCustomPlatformData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span></span></pre>
</div>
</div>
</body>
</html>