<!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>[195819] trunk/Source/WebInspectorUI</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/195819">195819</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-29 10:00:06 -0800 (Fri, 29 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Add font-variant-* to the visual styles sidebar
https://bugs.webkit.org/show_bug.cgi?id=148720
<rdar://problem/22569974>
Patch by Devin Rousso <dcrousso+webkit@gmail.com> on 2016-01-29
Reviewed by Timothy Hatcher.
Added another subsection to the "Text" section for font-variant-*
properties.
* Localizations/en.lproj/localizedStrings.js:
* UserInterface/Images/FontVariantSmallCaps.svg: Removed.
* UserInterface/Views/VisualStyleDetailsPanel.js:
(WebInspector.VisualStyleDetailsPanel):
Added another keyword grouping with the "normal" value since it is used
frequently in multiple subsections.
(WebInspector.VisualStyleDetailsPanel.prototype._populateFontSection):
(WebInspector.VisualStyleDetailsPanel.prototype._populateFontVariantsSection):
Added the five new font-variant-* properties specified in
<https://webkit.org/blog/5735/css-font-features/>.
(WebInspector.VisualStyleDetailsPanel.prototype._populateTextSpacingSection):
(WebInspector.VisualStyleDetailsPanel.prototype._populateAnimationSection):
Replaced the hardcoded "normal" keyword with the new grouping.
* UserInterface/Views/VisualStyleKeywordCheckbox.css:
(.visual-style-property-container.keyword-checkbox.font-variant > .visual-style-property-value-container > input::after): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIChangeLog">trunk/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js</a></li>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleKeywordCheckboxcss">trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordCheckbox.css</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebInspectorUIUserInterfaceImagesFontVariantSmallCapssvg">trunk/Source/WebInspectorUI/UserInterface/Images/FontVariantSmallCaps.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/ChangeLog (195818 => 195819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/ChangeLog 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-01-29 18:00:06 UTC (rev 195819)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-01-29 Devin Rousso <dcrousso+webkit@gmail.com>
+
+ Web Inspector: Add font-variant-* to the visual styles sidebar
+ https://bugs.webkit.org/show_bug.cgi?id=148720
+ <rdar://problem/22569974>
+
+ Reviewed by Timothy Hatcher.
+
+ Added another subsection to the "Text" section for font-variant-*
+ properties.
+
+ * Localizations/en.lproj/localizedStrings.js:
+ * UserInterface/Images/FontVariantSmallCaps.svg: Removed.
+
+ * UserInterface/Views/VisualStyleDetailsPanel.js:
+ (WebInspector.VisualStyleDetailsPanel):
+ Added another keyword grouping with the "normal" value since it is used
+ frequently in multiple subsections.
+
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateFontSection):
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateFontVariantsSection):
+ Added the five new font-variant-* properties specified in
+ <https://webkit.org/blog/5735/css-font-features/>.
+
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateTextSpacingSection):
+ (WebInspector.VisualStyleDetailsPanel.prototype._populateAnimationSection):
+ Replaced the hardcoded "normal" keyword with the new grouping.
+
+ * UserInterface/Views/VisualStyleKeywordCheckbox.css:
+ (.visual-style-property-container.keyword-checkbox.font-variant > .visual-style-property-value-container > input::after): Deleted.
+
</ins><span class="cx"> 2016-01-28 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Avoid recreating Timeline's DataGridNode data multiple times
</span></span></pre></div>
<a id="trunkSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (195818 => 195819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js 2016-01-29 18:00:06 UTC (rev 195819)
</span><span class="lines">@@ -1,6 +1,5 @@
</span><span class="cx"> \xFE\xFFvar localizedStrings = new Object;
</span><span class="cx">
</span><del>-localizedStrings["%d More\u2026"] = "%d More\u2026";
</del><span class="cx"> localizedStrings[" (Prototype)"] = " (Prototype)";
</span><span class="cx"> localizedStrings[" (line %s)"] = " (line %s)";
</span><span class="cx"> localizedStrings["%.0f B"] = "%.0f B";
</span><span class="lines">@@ -19,6 +18,7 @@
</span><span class="cx"> localizedStrings["%.3fms"] = "%.3fms";
</span><span class="cx"> localizedStrings["%d Errors"] = "%d Errors";
</span><span class="cx"> localizedStrings["%d Errors, %d Warnings"] = "%d Errors, %d Warnings";
</span><ins>+localizedStrings["%d More\u2026"] = "%d More\u2026";
</ins><span class="cx"> localizedStrings["%d Warnings"] = "%d Warnings";
</span><span class="cx"> localizedStrings["%d \u2A09 %d"] = "%d \u2A09 %d";
</span><span class="cx"> localizedStrings["%d \xd7 %d pixels"] = "%d \xd7 %d pixels";
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> localizedStrings["All Resources"] = "All Resources";
</span><span class="cx"> localizedStrings["All Storage"] = "All Storage";
</span><span class="cx"> localizedStrings["All Uncaught Exceptions"] = "All Uncaught Exceptions";
</span><ins>+localizedStrings["Alternates"] = "Alternates";
</ins><span class="cx"> localizedStrings["An error occurred trying to load the resource."] = "An error occurred trying to load the resource.";
</span><span class="cx"> localizedStrings["An error occurred trying to read the %s table."] = "An error occurred trying to read the %s table.";
</span><span class="cx"> localizedStrings["An unexpected error %s occurred."] = "An unexpected error %s occurred.";
</span><span class="lines">@@ -112,6 +113,7 @@
</span><span class="cx"> localizedStrings["Call Stack"] = "Call Stack";
</span><span class="cx"> localizedStrings["Calls"] = "Calls";
</span><span class="cx"> localizedStrings["Cancel Automatic Continue"] = "Cancel Automatic Continue";
</span><ins>+localizedStrings["Caps"] = "Caps";
</ins><span class="cx"> localizedStrings["Capturing"] = "Capturing";
</span><span class="cx"> localizedStrings["Catch Variables"] = "Catch Variables";
</span><span class="cx"> localizedStrings["Character Data"] = "Character Data";
</span><span class="lines">@@ -270,6 +272,8 @@
</span><span class="cx"> localizedStrings["Encoding"] = "Encoding";
</span><span class="cx"> localizedStrings["End Capturing"] = "End Capturing";
</span><span class="cx"> localizedStrings["Enter Class Name"] = "Enter Class Name";
</span><ins>+localizedStrings["Enter Tag"] = "Enter Tag";
+localizedStrings["Enter Value"] = "Enter Value";
</ins><span class="cx"> localizedStrings["Enter a Gradient"] = "Enter a Gradient";
</span><span class="cx"> localizedStrings["Enter a URL"] = "Enter a URL";
</span><span class="cx"> localizedStrings["Enter a name."] = "Enter a name.";
</span><span class="lines">@@ -289,6 +293,7 @@
</span><span class="cx"> localizedStrings["Extension Scripts"] = "Extension Scripts";
</span><span class="cx"> localizedStrings["Extra Scripts"] = "Extra Scripts";
</span><span class="cx"> localizedStrings["Family"] = "Family";
</span><ins>+localizedStrings["Features"] = "Features";
</ins><span class="cx"> localizedStrings["Filename"] = "Filename";
</span><span class="cx"> localizedStrings["Fill"] = "Fill";
</span><span class="cx"> localizedStrings["Fill Mode"] = "Fill Mode";
</span><span class="lines">@@ -389,6 +394,7 @@
</span><span class="cx"> localizedStrings["Layout Invalidated"] = "Layout Invalidated";
</span><span class="cx"> localizedStrings["Left"] = "Left";
</span><span class="cx"> localizedStrings["Letter"] = "Letter";
</span><ins>+localizedStrings["Ligatures"] = "Ligatures";
</ins><span class="cx"> localizedStrings["Line %d"] = "Line %d";
</span><span class="cx"> localizedStrings["Line %d:%d"] = "Line %d:%d";
</span><span class="cx"> localizedStrings["Line Number"] = "Line Number";
</span><span class="lines">@@ -456,6 +462,7 @@
</span><span class="cx"> localizedStrings["Node"] = "Node";
</span><span class="cx"> localizedStrings["Not found"] = "Not found";
</span><span class="cx"> localizedStrings["Number"] = "Number";
</span><ins>+localizedStrings["Numeric"] = "Numeric";
</ins><span class="cx"> localizedStrings["Offset"] = "Offset";
</span><span class="cx"> localizedStrings["Online"] = "Online";
</span><span class="cx"> localizedStrings["Opacity"] = "Opacity";
</span><span class="lines">@@ -676,7 +683,7 @@
</span><span class="cx"> localizedStrings["Using Keyword Value"] = "Using Keyword Value";
</span><span class="cx"> localizedStrings["Using the previous selector '%s'."] = "Using the previous selector '%s'.";
</span><span class="cx"> localizedStrings["Value"] = "Value";
</span><del>-localizedStrings["Variant"] = "Variant";
</del><ins>+localizedStrings["Variants"] = "Variants";
</ins><span class="cx"> localizedStrings["Vertical"] = "Vertical";
</span><span class="cx"> localizedStrings["Visibility"] = "Visibility";
</span><span class="cx"> localizedStrings["Warning: "] = "Warning: ";
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceImagesFontVariantSmallCapssvg"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebInspectorUI/UserInterface/Images/FontVariantSmallCaps.svg (195818 => 195819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Images/FontVariantSmallCaps.svg 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/UserInterface/Images/FontVariantSmallCaps.svg 2016-01-29 18:00:06 UTC (rev 195819)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright © 2015 Apple Inc. All rights reserved. -->
-<svg xmlns="http://www.w3.org/2000/svg" id="root" version="1.1" viewBox="0 0 16 16">
- <path fill="currentColor" d="M 4.44335938 8.06054688 L 3.35449219 4.89160156 L 2.19726562 8.06054688 L 4.44335938 8.06054688 Z M 2.84667969 3.82714844 L 3.9453125 3.82714844 L 6.54785156 11 L 5.48339844 11 L 4.75585938 8.8515625 L 1.91894531 8.8515625 L 1.14257812 11 L 0.146484375 11 L 2.84667969 3.82714844 Z M 7.01611328 5.97900391 L 9.17285156 5.97900391 C 9.76074513 5.97900391 10.1788725 6.15445788 10.4272461 6.50537109 C 10.5730802 6.7127289 10.6459961 6.95198432 10.6459961 7.22314453 C 10.6459961 7.53987789 10.5559905 7.79964091 10.3759766 8.00244141 C 10.2825516 8.1095383 10.1481129 8.20751909 9.97265625 8.29638672 C 10.2301445 8.39436898 10.4226882 8.5048822 10.550293 8.62792969 C 10.77588 8.84668078 10.8886719 9.14859833 10.8886719 9.53369141 C 10.8886719 9.85726073 10.7872731 10.1500638 10.5844727 10.4121094 C 10.2814112 10.8040384 9.79948247 11 9.13867188 11 L 7.01611328 11 L 7.01611328 5.97900391 Z M 8.91992188 8.1015625 C 9.20703269 8.101562
5 9.43033774 8.0616866 9.58984375 7.98193359 C 9.84049604 7.85660745 9.96582031 7.63102376 9.96582031 7.30517578 C 9.96582031 6.97704914 9.83252086 6.75602271 9.56591797 6.64208984 C 9.41552659 6.57828744 9.19222153 6.54638672 8.89599609 6.54638672 L 7.68261719 6.54638672 L 7.68261719 8.1015625 L 8.91992188 8.1015625 Z M 9.14892578 10.4189453 C 9.56592005 10.4189453 9.86328036 10.2981783 10.0410156 10.0566406 C 10.1526698 9.90397059 10.2084961 9.71940212 10.2084961 9.50292969 C 10.2084961 9.13834453 10.0455745 8.88997462 9.71972656 8.7578125 C 9.54654861 8.68717413 9.317547 8.65185547 9.03271484 8.65185547 L 7.68261719 8.65185547 L 7.68261719 10.4189453 L 9.14892578 10.4189453 Z M 15.1289062 6.34472656 C 15.4798195 6.67968917 15.6746417 7.06021922 15.7133789 7.48632812 L 15.050293 7.48632812 C 14.9750973 7.1627588 14.8252778 6.90641371 14.6008301 6.71728516 C 14.3763823 6.52815661 14.0613627 6.43359375 13.6557617 6.43359375 C 13.1612931 6.43359375 12.7619644 6.60733876 12.45
77637 6.95483398 C 12.1535629 7.30232921 12.0014648 7.83495735 12.0014648 8.55273438 C 12.0014648 9.14062794 12.1387519 9.61742981 12.4133301 9.9831543 C 12.6879083 10.3488788 13.0974908 10.5317383 13.6420898 10.5317383 C 14.1433944 10.5317383 14.5250638 10.3391946 14.7871094 9.95410156 C 14.9261075 9.75130107 15.0297848 9.48470217 15.0981445 9.15429688 L 15.7612305 9.15429688 C 15.7019854 9.68294535 15.5060238 10.1261375 15.1733398 10.4838867 C 14.7745748 10.9145529 14.2368198 11.1298828 13.5600586 11.1298828 C 12.9767223 11.1298828 12.4868184 10.9532895 12.090332 10.6000977 C 11.5685195 10.1329729 11.3076172 9.41178873 11.3076172 8.43652344 C 11.3076172 7.69595984 11.5035788 7.0887068 11.8955078 6.61474609 C 12.3193381 6.09976956 12.9038049 5.84228516 13.6489258 5.84228516 C 14.2846711 5.84228516 14.777993 6.00976395 15.1289062 6.34472656 Z"/>
-</svg>
</del></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleDetailsPaneljs"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js (195818 => 195819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleDetailsPanel.js 2016-01-29 18:00:06 UTC (rev 195819)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> // These keywords, as well as the values below, are not localized as they must match the CSS spec.
</span><span class="cx"> this._keywords.defaults = ["Inherit", "Initial", "Unset", "Revert"];
</span><ins>+ this._keywords.normal = this._keywords.defaults.concat(["Normal"]);
</ins><span class="cx"> this._keywords.boxModel = this._keywords.defaults.concat(["Auto"]);
</span><span class="cx"> this._keywords.borderStyle = {
</span><span class="cx"> basic: this._keywords.defaults.concat(["None", "Hidden", "Solid"]),
</span><span class="lines">@@ -76,10 +77,11 @@
</span><span class="cx"> this._generateSection("content", WebInspector.UIString("Content"));
</span><span class="cx"> this._generateSection("text-style", WebInspector.UIString("Style"));
</span><span class="cx"> this._generateSection("font", WebInspector.UIString("Font"));
</span><ins>+ this._generateSection("font-variants", WebInspector.UIString("Variants"));
</ins><span class="cx"> this._generateSection("text-spacing", WebInspector.UIString("Spacing"));
</span><span class="cx"> this._generateSection("text-shadow", WebInspector.UIString("Shadow"));
</span><span class="cx">
</span><del>- this._sections.text = new WebInspector.DetailsSection("text", WebInspector.UIString("Text"), [this._groups.content.section, this._groups.textStyle.section, this._groups.font.section, this._groups.textSpacing.section, this._groups.textShadow.section]);
</del><ins>+ this._sections.text = new WebInspector.DetailsSection("text", WebInspector.UIString("Text"), [this._groups.content.section, this._groups.textStyle.section, this._groups.font.section, this._groups.fontVariants.section, this._groups.textSpacing.section, this._groups.textShadow.section]);
</ins><span class="cx"> this.element.appendChild(this._sections.text.element);
</span><span class="cx">
</span><span class="cx"> // Background Section
</span><span class="lines">@@ -705,10 +707,10 @@
</span><span class="cx"> let fontStyleRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><span class="cx"> properties.fontStyle = new WebInspector.VisualStyleKeywordIconList("font-style", WebInspector.UIString("Style"), ["Italic", "Normal"]);
</span><del>- properties.fontVariant = new WebInspector.VisualStyleKeywordCheckbox("font-variant", WebInspector.UIString("Variant"), "Small Caps")
</del><ins>+ properties.fontFeatureSettings = new WebInspector.VisualStyleBasicInput("font-feature-settings", WebInspector.UIString("Features"), WebInspector.UIString("Enter Tag"));
</ins><span class="cx">
</span><span class="cx"> fontStyleRow.element.appendChild(properties.fontStyle.element);
</span><del>- fontStyleRow.element.appendChild(properties.fontVariant.element);
</del><ins>+ fontStyleRow.element.appendChild(properties.fontFeatureSettings.element);
</ins><span class="cx">
</span><span class="cx"> group.autocompleteCompatibleProperties = [properties.fontFamily];
</span><span class="cx">
</span><span class="lines">@@ -716,16 +718,50 @@
</span><span class="cx"> this._populateSection(group, [fontGroup]);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ _populateFontVariantsSection()
+ {
+ let group = this._groups.fontVariants;
+ let properties = group.properties;
+
+ let alternatesRow = new WebInspector.DetailsSectionRow;
+
+ properties.fontVariantAlternates = new WebInspector.VisualStyleBasicInput("font-variant-alternates", WebInspector.UIString("Alternates"), WebInspector.UIString("Enter Value"));
+
+ alternatesRow.element.appendChild(properties.fontVariantAlternates.element);
+
+ let positionRow = new WebInspector.DetailsSectionRow;
+
+ properties.fontVariantPosition = new WebInspector.VisualStyleKeywordPicker("font-variant-position", WebInspector.UIString("Position"), this._keywords.normal.concat(["Sub", "Super"]));
+
+ positionRow.element.appendChild(properties.fontVariantPosition.element);
+
+ properties.fontVariantCaps = new WebInspector.VisualStyleKeywordPicker("font-variant-caps", WebInspector.UIString("Caps"), this._keywords.normal.concat(["None", "Small Caps", "All Small Caps", "Petite Caps", "All Petite Caps", "Unicase", "Titling Caps"]));
+
+ positionRow.element.appendChild(properties.fontVariantCaps.element);
+
+ let ligaturesRow = new WebInspector.DetailsSectionRow;
+
+ // FIXME <http://webkit.org/b/153645> Add token based editor for Visual Sidebar
+ properties.fontVariantLigatures = new WebInspector.VisualStyleKeywordPicker("font-variant-ligatures", WebInspector.UIString("Ligatures"), this._keywords.normal.concat(["None", "Common Ligatures", "No Common Ligatures", "Discretionary Ligatures", "No Discretionary Ligatures", "Historical Ligatures", "No Historical Ligatures", "Contextual", "No Contextual"]));
+
+ ligaturesRow.element.appendChild(properties.fontVariantLigatures.element);
+
+ properties.fontVariantNumeric = new WebInspector.VisualStyleKeywordPicker("font-variant-numeric", WebInspector.UIString("Numeric"), this._keywords.normal.concat(["None", "Ordinal", "Slashed Zero", "Lining Nums", "Oldstyle Nums", "Proportional Nums", "Tabular Nums", "Diagonal Fractions", "Stacked Fractions"]));
+
+ ligaturesRow.element.appendChild(properties.fontVariantNumeric.element);
+
+ let variantsGroup = new WebInspector.DetailsSectionGroup([alternatesRow, positionRow, ligaturesRow]);
+ this._populateSection(group, [variantsGroup]);
+ }
+
</ins><span class="cx"> _populateTextSpacingSection()
</span><span class="cx"> {
</span><span class="cx"> let group = this._groups.textSpacing;
</span><span class="cx"> let properties = group.properties;
</span><span class="cx">
</span><del>- let defaultTextKeywords = this._keywords.defaults.concat(["Normal"]);
-
</del><span class="cx"> let textLayoutRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.lineHeight = new WebInspector.VisualStyleNumberInputBox("line-height", WebInspector.UIString("Height"), defaultTextKeywords, this._units.defaults);
</del><ins>+ properties.lineHeight = new WebInspector.VisualStyleNumberInputBox("line-height", WebInspector.UIString("Height"), this._keywords.normal, this._units.defaults);
</ins><span class="cx"> properties.verticalAlign = new WebInspector.VisualStyleNumberInputBox("vertical-align", WebInspector.UIString("Align"), ["Baseline", "Bottom"].concat(this._keywords.defaults, ["Middle", "Sub", "Super", "Text Bottom", "Text Top", "Top"]), this._units.defaults);
</span><span class="cx">
</span><span class="cx"> textLayoutRow.element.appendChild(properties.lineHeight.element);
</span><span class="lines">@@ -733,8 +769,8 @@
</span><span class="cx">
</span><span class="cx"> let textSpacingRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><del>- properties.letterSpacing = new WebInspector.VisualStyleNumberInputBox("letter-spacing", WebInspector.UIString("Letter"), defaultTextKeywords, this._units.defaults);
- properties.wordSpacing = new WebInspector.VisualStyleNumberInputBox("word-spacing", WebInspector.UIString("Word"), defaultTextKeywords, this._units.defaults);
</del><ins>+ properties.letterSpacing = new WebInspector.VisualStyleNumberInputBox("letter-spacing", WebInspector.UIString("Letter"), this._keywords.normal, this._units.defaults);
+ properties.wordSpacing = new WebInspector.VisualStyleNumberInputBox("word-spacing", WebInspector.UIString("Word"), this._keywords.normal, this._units.defaults);
</ins><span class="cx">
</span><span class="cx"> textSpacingRow.element.appendChild(properties.letterSpacing.element);
</span><span class="cx"> textSpacingRow.element.appendChild(properties.wordSpacing.element);
</span><span class="lines">@@ -1273,7 +1309,7 @@
</span><span class="cx"> let animationDirectionRow = new WebInspector.DetailsSectionRow;
</span><span class="cx">
</span><span class="cx"> properties.animationDirection = new WebInspector.VisualStyleKeywordPicker("animation-direction", WebInspector.UIString("Direction"), {
</span><del>- basic: this._keywords.defaults.concat(["Normal", "Reverse"]),
</del><ins>+ basic: this._keywords.normal.concat(["Reverse"]),
</ins><span class="cx"> advanced: ["Alternate", "Alternate Reverse"]
</span><span class="cx"> });
</span><span class="cx"> properties.animationFillMode = new WebInspector.VisualStyleKeywordPicker("animation-fill-mode", WebInspector.UIString("Fill Mode"), this._keywords.defaults.concat(["None", "Forwards", "Backwards", "Both"]));
</span></span></pre></div>
<a id="trunkSourceWebInspectorUIUserInterfaceViewsVisualStyleKeywordCheckboxcss"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordCheckbox.css (195818 => 195819)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordCheckbox.css 2016-01-29 17:50:48 UTC (rev 195818)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/VisualStyleKeywordCheckbox.css 2016-01-29 18:00:06 UTC (rev 195819)
</span><span class="lines">@@ -31,14 +31,3 @@
</span><span class="cx"> .visual-style-property-container.keyword-checkbox > .visual-style-property-value-container > input {
</span><span class="cx"> width: auto;
</span><span class="cx"> }
</span><del>-
-/* Font Variant */
-.visual-style-property-container.keyword-checkbox.font-variant > .visual-style-property-value-container > input::after {
- position: absolute;
- top: 5px;
- left: 15px;
- font-size: 9px;
- font-variant: small-caps;
- word-spacing: -2px;
- content: "Small Caps";
-}
</del></span></pre>
</div>
</div>
</body>
</html>