<!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>[188056] 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/188056">188056</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2015-08-06 13:45:50 -0700 (Thu, 06 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Font feature settings comparisons are order-dependent and case-dependent
https://bugs.webkit.org/show_bug.cgi?id=147719
Reviewed by Benjamin Poulain.
Source/WebCore:
We should make our settings vector order-independent and case-independent.
Test: css3/font-feature-settings-parsing.html
* css/CSSParser.cpp:
(WebCore::CSSParser::parseFontFeatureTag):
* css/StyleBuilderConverter.h:
(WebCore::StyleBuilderConverter::convertFontFeatureSettings):
* platform/graphics/FontFeatureSettings.cpp:
(WebCore::FontFeature::FontFeature):
(WebCore::FontFeature::operator==):
(WebCore::FontFeatureSettings::FontFeatureSettings):
* platform/graphics/FontFeatureSettings.h:
(WebCore::FontFeature::FontFeature):
(WebCore::FontFeature::operator==):
(WebCore::FontFeature::operator<):
(WebCore::FontFeatureSettings::insert):
(WebCore::FontFeatureSettings::FontFeatureSettings):
(WebCore::FontFeatureSettings::append): Deleted.
LayoutTests:
Make the test insensitive to order and case.
* css3/font-feature-settings-parsing-expected.txt:
* css3/font-feature-settings-parsing.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscss3fontfeaturesettingsparsingexpectedtxt">trunk/LayoutTests/css3/font-feature-settings-parsing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscss3fontfeaturesettingsparsinghtml">trunk/LayoutTests/css3/font-feature-settings-parsing.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSParsercpp">trunk/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssStyleBuilderConverterh">trunk/Source/WebCore/css/StyleBuilderConverter.h</a></li>
<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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/LayoutTests/ChangeLog 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Font feature settings comparisons are order-dependent and case-dependent
+ https://bugs.webkit.org/show_bug.cgi?id=147719
+
+ Reviewed by Benjamin Poulain.
+
+ Make the test insensitive to order and case.
+
+ * css3/font-feature-settings-parsing-expected.txt:
+ * css3/font-feature-settings-parsing.html:
+
</ins><span class="cx"> 2015-08-06 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: AXLoadComplete that comes before AX API access won't fire
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontfeaturesettingsparsingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-feature-settings-parsing-expected.txt (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-feature-settings-parsing-expected.txt 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/LayoutTests/css3/font-feature-settings-parsing-expected.txt 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -4,17 +4,17 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> - Tests valid inputs.
</span><del>-PASS parseResultOf("valid_normal") is "normal"
-PASS parseResultOf("valid_value_1") is "'dlig' 1"
-PASS parseResultOf("valid_value_2") is "'swsh' 2"
-PASS parseResultOf("valid_value_on") is "'smcp' 1"
-PASS parseResultOf("valid_value_off") is "'liga' 0"
-PASS parseResultOf("valid_value_omit") is "'c2sc' 1"
-PASS parseResultOf("valid_valuelist") is "'tnum' 1, 'hist' 1"
-PASS parseResultOf("valid_singlequote") is "'PKRN' 1"
-PASS parseResultOf("valid_unusual_tag") is "'!@#$' 1"
-PASS parseResultOf("valid_tag_space") is "'a bc' 1"
-PASS parseResultOf("valid_composite") is "'dlig' 1, 'smcp' 1, 'lig ' 0"
</del><ins>+PASS canonicalize(parseResultOf("valid_normal")) is "normal"
+PASS canonicalize(parseResultOf("valid_value_1")) is "'dlig' 1"
+PASS canonicalize(parseResultOf("valid_value_2")) is "'swsh' 2"
+PASS canonicalize(parseResultOf("valid_value_on")) is "'smcp' 1"
+PASS canonicalize(parseResultOf("valid_value_off")) is "'liga' 0"
+PASS canonicalize(parseResultOf("valid_value_omit")) is "'c2sc' 1"
+PASS canonicalize(parseResultOf("valid_valuelist")) is "'hist' 1, 'tnum' 1"
+PASS canonicalize(parseResultOf("valid_singlequote")) is "'pkrn' 1"
+PASS canonicalize(parseResultOf("valid_unusual_tag")) is "'!@#$' 1"
+PASS canonicalize(parseResultOf("valid_tag_space")) is "'a bc' 1"
+PASS canonicalize(parseResultOf("valid_composite")) is "'dlig' 1, 'lig ' 0, 'smcp' 1"
</ins><span class="cx"> - Tests invalid inputs. Results should be "normal".
</span><span class="cx"> PASS parseResultOf("invalid_ident") is "normal"
</span><span class="cx"> PASS parseResultOf("invalid_cases") is "normal"
</span><span class="lines">@@ -34,10 +34,10 @@
</span><span class="cx"> PASS parseResultOf("invalid_on") is "normal"
</span><span class="cx"> PASS parseResultOf("invalid_0") is "normal"
</span><span class="cx"> - Tests inherit.
</span><del>-PASS parseResultOf("outer") is "'dlig' 1"
-PASS parseResultOf("inner") is "'dlig' 1"
</del><ins>+PASS canonicalize(parseResultOf("outer")) is "'dlig' 1"
+PASS canonicalize(parseResultOf("inner")) is "'dlig' 1"
</ins><span class="cx"> - Tests @font-face.
</span><del>-PASS fontFaceRuleValid is "'liga' 1"
</del><ins>+PASS canonicalize(fontFaceRuleValid) is "'liga' 1"
</ins><span class="cx"> PASS fontFaceRuleInvalid is ""
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscss3fontfeaturesettingsparsinghtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css3/font-feature-settings-parsing.html (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/font-feature-settings-parsing.html 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/LayoutTests/css3/font-feature-settings-parsing.html 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -168,23 +168,32 @@
</span><span class="cx"> <script>
</span><span class="cx"> description('Test parsing of the CSS3 font-feature-settings property.');
</span><span class="cx">
</span><ins>+function canonicalize(fontFeatureSettingsString) {
+ var pieces = fontFeatureSettingsString.split(", ");
+ var lowered = pieces.map(function(piece) {
+ return piece.toLowerCase();
+ });
+ var sorted = lowered.sort();
+ return sorted.join(", ");
+}
+
</ins><span class="cx"> function parseResultOf(id) {
</span><span class="cx"> var element = document.getElementById(id);
</span><span class="cx"> return window.getComputedStyle(element)['-webkit-font-feature-settings'];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> debug('- Tests valid inputs.');
</span><del>-shouldBeEqualToString('parseResultOf("valid_normal")', "normal");
-shouldBeEqualToString('parseResultOf("valid_value_1")', "'dlig' 1");
-shouldBeEqualToString('parseResultOf("valid_value_2")', "'swsh' 2");
-shouldBeEqualToString('parseResultOf("valid_value_on")', "'smcp' 1");
-shouldBeEqualToString('parseResultOf("valid_value_off")', "'liga' 0");
-shouldBeEqualToString('parseResultOf("valid_value_omit")', "'c2sc' 1");
-shouldBeEqualToString('parseResultOf("valid_valuelist")', "'tnum' 1, 'hist' 1");
-shouldBeEqualToString('parseResultOf("valid_singlequote")', "'PKRN' 1");
-shouldBeEqualToString('parseResultOf("valid_unusual_tag")', "'!@#$' 1");
-shouldBeEqualToString('parseResultOf("valid_tag_space")', "'a bc' 1");
-shouldBeEqualToString('parseResultOf("valid_composite")', "'dlig' 1, 'smcp' 1, 'lig ' 0");
</del><ins>+shouldBeEqualToString('canonicalize(parseResultOf("valid_normal"))', canonicalize("normal"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_value_1"))', canonicalize("'dlig' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_value_2"))', canonicalize("'swsh' 2"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_value_on"))', canonicalize("'smcp' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_value_off"))', canonicalize("'liga' 0"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_value_omit"))', canonicalize("'c2sc' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_valuelist"))', canonicalize("'tnum' 1, 'hist' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_singlequote"))', canonicalize("'PKRN' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_unusual_tag"))', canonicalize("'!@#$' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_tag_space"))', canonicalize("'a bc' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("valid_composite"))', canonicalize("'dlig' 1, 'smcp' 1, 'lig ' 0"));
</ins><span class="cx">
</span><span class="cx"> debug('- Tests invalid inputs. Results should be "normal".');
</span><span class="cx"> shouldBe('parseResultOf("invalid_ident")', '"normal"');
</span><span class="lines">@@ -206,13 +215,13 @@
</span><span class="cx"> shouldBe('parseResultOf("invalid_0")', '"normal"');
</span><span class="cx">
</span><span class="cx"> debug('- Tests inherit.');
</span><del>-shouldBeEqualToString('parseResultOf("outer")', "'dlig' 1");
-shouldBeEqualToString('parseResultOf("inner")', "'dlig' 1");
</del><ins>+shouldBeEqualToString('canonicalize(parseResultOf("outer"))', canonicalize("'dlig' 1"));
+shouldBeEqualToString('canonicalize(parseResultOf("inner"))', canonicalize("'dlig' 1"));
</ins><span class="cx">
</span><span class="cx"> debug('- Tests @font-face.');
</span><span class="cx"> var fontFaceRuleValid = document.styleSheets[1].cssRules[0].style['-webkit-font-feature-settings'];
</span><span class="cx"> var fontFaceRuleInvalid = document.styleSheets[1].cssRules[1].style['-webkit-font-feature-settings'];
</span><del>-shouldBeEqualToString('fontFaceRuleValid', "'liga' 1");
</del><ins>+shouldBeEqualToString('canonicalize(fontFaceRuleValid)', canonicalize("'liga' 1"));
</ins><span class="cx"> shouldBeEqualToString('fontFaceRuleInvalid', "");
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/Source/WebCore/ChangeLog 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2015-08-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Font feature settings comparisons are order-dependent and case-dependent
+ https://bugs.webkit.org/show_bug.cgi?id=147719
+
+ Reviewed by Benjamin Poulain.
+
+ We should make our settings vector order-independent and case-independent.
+
+ Test: css3/font-feature-settings-parsing.html
+
+ * css/CSSParser.cpp:
+ (WebCore::CSSParser::parseFontFeatureTag):
+ * css/StyleBuilderConverter.h:
+ (WebCore::StyleBuilderConverter::convertFontFeatureSettings):
+ * platform/graphics/FontFeatureSettings.cpp:
+ (WebCore::FontFeature::FontFeature):
+ (WebCore::FontFeature::operator==):
+ (WebCore::FontFeatureSettings::FontFeatureSettings):
+ * platform/graphics/FontFeatureSettings.h:
+ (WebCore::FontFeature::FontFeature):
+ (WebCore::FontFeature::operator==):
+ (WebCore::FontFeature::operator<):
+ (WebCore::FontFeatureSettings::insert):
+ (WebCore::FontFeatureSettings::FontFeatureSettings):
+ (WebCore::FontFeatureSettings::append): Deleted.
+
</ins><span class="cx"> 2015-08-06 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: AXLoadComplete that comes before AX API access won't fire
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSParser.cpp (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSParser.cpp 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/Source/WebCore/css/CSSParser.cpp 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -10378,7 +10378,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- String tag = value->string;
</del><ins>+ String tag = String(value->string).convertToASCIILowercase();
</ins><span class="cx"> int tagValue = 1;
</span><span class="cx"> // Feature tag values could follow: <integer> | on | off
</span><span class="cx"> value = m_valueList->next();
</span></span></pre></div>
<a id="trunkSourceWebCorecssStyleBuilderConverterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleBuilderConverter.h (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/Source/WebCore/css/StyleBuilderConverter.h 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -1014,7 +1014,7 @@
</span><span class="cx"> RefPtr<FontFeatureSettings> settings = FontFeatureSettings::create();
</span><span class="cx"> for (auto& item : downcast<CSSValueList>(value)) {
</span><span class="cx"> auto& feature = downcast<CSSFontFeatureValue>(item.get());
</span><del>- settings->append(FontFeature(feature.tag(), feature.value()));
</del><ins>+ settings->insert(FontFeature(feature.tag(), feature.value()));
</ins><span class="cx"> }
</span><span class="cx"> return WTF::move(settings);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontFeatureSettingscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/Source/WebCore/platform/graphics/FontFeatureSettings.cpp 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -34,13 +34,30 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool FontFeature::operator==(const FontFeature& other)
</del><ins>+bool FontFeature::operator==(const FontFeature& other) const
</ins><span class="cx"> {
</span><span class="cx"> return m_tag == other.m_tag && m_value == other.m_value;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FontFeatureSettings::FontFeatureSettings()
</del><ins>+bool FontFeature::operator<(const FontFeature& other) const
</ins><span class="cx"> {
</span><ins>+ return (m_tag.impl() < other.m_tag.impl()) || (m_tag.impl() == other.m_tag.impl() && m_value < other.m_value);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<FontFeatureSettings> FontFeatureSettings::create()
+{
+ return adoptRef(*new FontFeatureSettings);
</ins><span class="cx"> }
</span><ins>+
+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, WTF::move(feature));
+}
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsFontFeatureSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h (188055 => 188056)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h 2015-08-06 20:40:35 UTC (rev 188055)
+++ trunk/Source/WebCore/platform/graphics/FontFeatureSettings.h 2015-08-06 20:45:50 UTC (rev 188056)
</span><span class="lines">@@ -37,29 +37,30 @@
</span><span class="cx"> class FontFeature {
</span><span class="cx"> public:
</span><span class="cx"> FontFeature(const AtomicString& tag, int value);
</span><del>- bool operator==(const FontFeature&);
</del><span class="cx">
</span><ins>+ bool operator==(const FontFeature& other) const;
+ bool operator<(const FontFeature& other) const;
+
</ins><span class="cx"> const AtomicString& tag() const { return m_tag; }
</span><span class="cx"> int value() const { return m_value; }
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> AtomicString m_tag;
</span><del>- const int m_value;
</del><ins>+ const int m_value { 0 };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class FontFeatureSettings : public RefCounted<FontFeatureSettings> {
</span><span class="cx"> public:
</span><del>- static Ref<FontFeatureSettings> create()
- {
- return adoptRef(*new FontFeatureSettings);
- }
- void append(const FontFeature& feature) { m_list.append(feature); }
</del><ins>+ static Ref<FontFeatureSettings> create();
+
+ void insert(FontFeature&&);
+
</ins><span class="cx"> size_t size() const { return m_list.size(); }
</span><span class="cx"> const FontFeature& operator[](int index) const { return m_list[index]; }
</span><span class="cx"> const FontFeature& at(size_t index) const { return m_list.at(index); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- FontFeatureSettings();
</del><ins>+ FontFeatureSettings() { }
</ins><span class="cx"> Vector<FontFeature> m_list;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>