<!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>[193681] branches/safari-601-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193681">193681</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 18:38:37 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192992">r192992</a>. rdar://problem/23769780</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssfontpropertypriorityexpectedtxt">branches/safari-601-branch/LayoutTests/fast/css/font-property-priority-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssfontshorthandexpectedtxt">branches/safari-601-branch/LayoutTests/fast/css/font-shorthand-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssparsingfontvariantligaturesexpectedtxt">branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcssparsingfontvariantligatureshtml">branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures.html</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastinspectorsupportstyleexpectedtxt">branches/safari-601-branch/LayoutTests/fast/inspector-support/style-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacTestExpectations">branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari601branchLayoutTestsplatformmacfastwritingmodebrokenideographsmallcapsexpectedtxt">branches/safari-601-branch/LayoutTests/platform/mac/fast/writing-mode/broken-ideograph-small-caps-expected.txt</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp">branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSFontSelectorcpp">branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSParsercpp">branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSParserh">branches/safari-601-branch/Source/WebCore/css/CSSParser.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssCSSPropertyNamesin">branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssStylePropertiescpp">branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssStyleResolvercpp">branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreeditingEditingStylecpp">branches/safari-601-branch/Source/WebCore/editing/EditingStyle.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreeditingcocoaHTMLConvertermm">branches/safari-601-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoreeditingiosEditorIOSmm">branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp">branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCacheh">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCascadecpp">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontCascadeh">branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicsFontDescriptionh">branches/safari-601-branch/Source/WebCore/platform/graphics/FontDescription.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp">branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreplatformtextTextFlagsh">branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderTextcpp">branches/safari-601-branch/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsfasttextfontvariantshorthandexpectedtxt">branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsfasttextfontvariantshorthandhtml">branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand.html</a></li>
<li><a href="#branchessafari601branchSourceWebCorecssFontVariantBuilderh">branches/safari-601-branch/Source/WebCore/css/FontVariantBuilder.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-12-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unify font-variant-* with font-variant shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=149773
+
+ Reviewed by Darin Adler.
+
+ Update tests. Also temporarily skip existing font-features tests until
+ https://bugs.webkit.org/show_bug.cgi?id=149774 is fixed.
+
+ * css3/font-variant-parsing-expected.txt:
+ * css3/font-variant-parsing.html:
+ * fast/css/font-property-priority-expected.txt:
+ * fast/css/font-shorthand-expected.txt:
+ * fast/css/parsing-font-variant-ligatures-expected.txt:
+ * fast/css/parsing-font-variant-ligatures.html:
+ * fast/inspector-support/style-expected.txt:
+ * fast/text/font-variant-shorthand-expected.txt: Added.
+ * fast/text/font-variant-shorthand.html: Added.
+ * platform/mac/TestExpectations:
+ * platform/mac/fast/writing-mode/broken-ideograph-small-caps-expected.txt:
+
</ins><span class="cx"> 2015-11-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Font selection should not consult font-variant property
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssfontpropertypriorityexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/font-property-priority-expected.txt (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/font-property-priority-expected.txt 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/fast/css/font-property-priority-expected.txt 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> Test for rdar://problem/6065547 REGRESSION (r34879): "Subject" in unread emails in Yahoo mail is not shown in bold.
</span><span class="cx">
</span><span class="cx"> Property 'font-weight' has priority 'important'.
</span><del>-Property 'font-variant' has priority 'important'.
</del><ins>+Property 'font-variant-caps' has priority 'important'.
</ins><span class="cx"> Property 'font-style' has priority 'important'.
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssfontshorthandexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/font-shorthand-expected.txt (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/font-shorthand-expected.txt 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/fast/css/font-shorthand-expected.txt 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> Test
</span><span class="cx"> Font for '12px monospace':
</span><span class="cx"> font-style: normal (original property was font and property was implicitly set.)
</span><del>-font-variant: normal (original property was font and property was implicitly set.)
</del><ins>+font-variant-caps: normal (original property was font and property was implicitly set.)
</ins><span class="cx"> font-weight: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: normal (original property was font and property was implicitly set.)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> Font for '12px/24px serif':
</span><span class="cx"> font-style: normal (original property was font and property was implicitly set.)
</span><del>-font-variant: normal (original property was font and property was implicitly set.)
</del><ins>+font-variant-caps: normal (original property was font and property was implicitly set.)
</ins><span class="cx"> font-weight: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: 24px (original property was font)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> Font for 'normal 12px serif':
</span><span class="cx"> font-style: normal (original property was font)
</span><del>-font-variant: normal (original property was font and property was implicitly set.)
</del><ins>+font-variant-caps: normal (original property was font and property was implicitly set.)
</ins><span class="cx"> font-weight: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: normal (original property was font and property was implicitly set.)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> Font for 'normal normal 12px serif':
</span><span class="cx"> font-style: normal (original property was font)
</span><del>-font-variant: normal (original property was font)
</del><ins>+font-variant-caps: normal (original property was font)
</ins><span class="cx"> font-weight: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: normal (original property was font and property was implicitly set.)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx">
</span><span class="cx"> Font for 'normal normal normal 12px serif':
</span><span class="cx"> font-style: normal (original property was font)
</span><del>-font-variant: normal (original property was font)
</del><ins>+font-variant-caps: normal (original property was font)
</ins><span class="cx"> font-weight: normal (original property was font)
</span><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: normal (original property was font and property was implicitly set.)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> Font for 'italic small-caps 12px/24px serif':
</span><span class="cx"> font-style: italic (original property was font)
</span><del>-font-variant: small-caps (original property was font)
</del><ins>+font-variant-caps: small-caps (original property was font)
</ins><span class="cx"> font-weight: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: 24px (original property was font)
</span><span class="lines">@@ -50,13 +50,13 @@
</span><span class="cx"> Font for 'italic bold 12px/24px serif':
</span><span class="cx"> font-style: italic (original property was font)
</span><span class="cx"> font-weight: bold (original property was font)
</span><del>-font-variant: normal (original property was font and property was implicitly set.)
</del><ins>+font-variant-caps: normal (original property was font and property was implicitly set.)
</ins><span class="cx"> font-size: 12px (original property was font)
</span><span class="cx"> line-height: 24px (original property was font)
</span><span class="cx"> font-family: serif (original property was font)
</span><span class="cx">
</span><span class="cx"> Font for 'small-caps bold 14px/28px Arial, sans-serif':
</span><del>-font-variant: small-caps (original property was font)
</del><ins>+font-variant-caps: small-caps (original property was font)
</ins><span class="cx"> font-weight: bold (original property was font)
</span><span class="cx"> font-style: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 14px (original property was font)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> Font for 'italic small-caps bold 14px/28px Arial, sans-serif':
</span><span class="cx"> font-style: italic (original property was font)
</span><del>-font-variant: small-caps (original property was font)
</del><ins>+font-variant-caps: small-caps (original property was font)
</ins><span class="cx"> font-weight: bold (original property was font)
</span><span class="cx"> font-size: 14px (original property was font)
</span><span class="cx"> line-height: 28px (original property was font)
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssparsingfontvariantligaturesexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures-expected.txt (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures-expected.txt 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures-expected.txt 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> PASS: 'no-historical-ligatures' parsed as 'no-historical-ligatures' and computed to 'no-historical-ligatures'
</span><span class="cx"> PASS: 'historical-ligatures' parsed as 'historical-ligatures' and computed to 'historical-ligatures'
</span><span class="cx">
</span><del>-PASS: 'no-common-ligatures no-common-ligatures' parsed as '' and computed to 'normal'
</del><ins>+PASS: 'no-common-ligatures no-common-ligatures' parsed as 'no-common-ligatures' and computed to 'no-common-ligatures'
</ins><span class="cx"> PASS: 'common-ligatures no-discretionary-ligatures' parsed as 'common-ligatures no-discretionary-ligatures' and computed to 'common-ligatures no-discretionary-ligatures'
</span><span class="cx"> PASS: 'common-ligatures no-discretionary-ligatures historical-ligatures' parsed as 'common-ligatures no-discretionary-ligatures historical-ligatures' and computed to 'common-ligatures no-discretionary-ligatures historical-ligatures'
</span><span class="cx"> PASS: 'common-ligatures no-discretionary-ligatures normal' parsed as '' and computed to 'normal'
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcssparsingfontvariantligatureshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures.html (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures.html 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/fast/css/parsing-font-variant-ligatures.html 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> test('historical-ligatures', 'historical-ligatures', 'historical-ligatures');
</span><span class="cx">
</span><span class="cx"> log("");
</span><del>- test('no-common-ligatures no-common-ligatures', '', 'normal');
</del><ins>+ test('no-common-ligatures no-common-ligatures', 'no-common-ligatures', 'no-common-ligatures');
</ins><span class="cx"> test('common-ligatures no-discretionary-ligatures', 'common-ligatures no-discretionary-ligatures', 'common-ligatures no-discretionary-ligatures');
</span><span class="cx"> test('common-ligatures no-discretionary-ligatures historical-ligatures', 'common-ligatures no-discretionary-ligatures historical-ligatures', 'common-ligatures no-discretionary-ligatures historical-ligatures');
</span><span class="cx"> test('common-ligatures no-discretionary-ligatures normal', '', 'normal');
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastinspectorsupportstyleexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/inspector-support/style-expected.txt (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/inspector-support/style-expected.txt 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/fast/inspector-support/style-expected.txt 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> margin-left: 1em (original property was margin and property was implicitly set.)
</span><span class="cx"> color: white
</span><span class="cx"> font-style: normal (original property was font and property was implicitly set.)
</span><del>-font-variant: normal (original property was font and property was implicitly set.)
</del><ins>+font-variant-caps: normal (original property was font and property was implicitly set.)
</ins><span class="cx"> font-weight: normal (original property was font and property was implicitly set.)
</span><span class="cx"> font-size: 24px (original property was font)
</span><span class="cx"> line-height: normal (original property was font and property was implicitly set.)
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextfontvariantshorthandexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand-expected.txt (0 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand-expected.txt 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+This test makes sure that the two shorthand properties which set font-variant-caps get resolved correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS window.getComputedStyle(document.getElementById('t1')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t2')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t3')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t4')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t5')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t6')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t7')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t8')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t9')).getPropertyValue('font-variant-caps') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t10')).getPropertyValue('font-variant-caps') is "normal"
+PASS window.getComputedStyle(document.getElementById('t11')).getPropertyValue('font-variant-caps') is "normal"
+PASS window.getComputedStyle(document.getElementById('t12')).getPropertyValue('font-variant-caps') is "normal"
+PASS window.getComputedStyle(document.getElementById('t13')).getPropertyValue('font-variant-caps') is "normal"
+PASS window.getComputedStyle(document.getElementById('t14')).getPropertyValue('font-variant-caps') is "normal"
+PASS window.getComputedStyle(document.getElementById('t15')).getPropertyValue('font-variant-caps') is "normal"
+PASS window.getComputedStyle(document.getElementById('t1')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t2')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t3')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t4')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t5')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t6')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t7')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t8')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t9')).getPropertyValue('font-variant') is "small-caps"
+PASS window.getComputedStyle(document.getElementById('t10')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t11')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t12')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t13')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t14')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t15')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t16')).getPropertyValue('font-variant') is "common-ligatures super small-caps lining-nums historical-forms simplified"
+PASS window.getComputedStyle(document.getElementById('t17')).getPropertyValue('font-variant') is "normal"
+PASS window.getComputedStyle(document.getElementById('t17')).getPropertyValue('font-variant-caps') is "normal"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsfasttextfontvariantshorthandhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand.html (0 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/fast/text/font-variant-shorthand.html 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -0,0 +1,136 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<style>
+.test {
+ font: 30px Times;
+ display: none;
+}
+#t1 {
+ font-variant-caps: small-caps;
+}
+#t2 {
+ font-variant: small-caps;
+}
+#t3 {
+ font: small-caps 30px Times;
+}
+#t4 {
+ font-variant: normal;
+ font: small-caps 30px Times;
+}
+#t5 {
+ font-variant-caps: normal;
+ font: small-caps 30px Times;
+}
+#t6 {
+ font: 30px Times;
+ font-variant-caps: small-caps;
+}
+#t7 {
+ font-variant: normal;
+ font-variant-caps: small-caps;
+}
+#t8 {
+ font-variant-caps: normal;
+ font-variant: small-caps;
+}
+#t9 {
+ font: 30px Times;
+ font-variant: small-caps;
+}
+#t10 {
+ font-variant: small-caps;
+ font: 30px Times;
+}
+#t11 {
+ font-variant-caps: small-caps;
+ font: 30px Times;
+}
+#t12 {
+ font: small-caps 30px Times;
+ font-variant-caps: normal;
+}
+#t13 {
+ font-variant: small-caps;
+ font-variant-caps: normal;
+}
+#t14 {
+ font-variant-caps: small-caps;
+ font-variant: normal;
+}
+#t15 {
+ font: small-caps 30px Times;
+ font-variant: normal;
+}
+#t16 {
+ font-variant-ligatures: common-ligatures;
+ font-variant-position: super;
+ font-variant-caps: small-caps;
+ font-variant-numeric: lining-nums;
+ font-variant-alternates: historical-forms;
+ font-variant-east-asian: simplified;
+}
+</style>
+</head>
+<body>
+
+<div class="test" id="t1">Hello</div>
+<div class="test" id="t2">Hello</div>
+<div class="test" id="t3">Hello</div>
+<div class="test" id="t4">Hello</div>
+<div class="test" id="t5">Hello</div>
+<div class="test" id="t6">Hello</div>
+<div class="test" id="t7">Hello</div>
+<div class="test" id="t8">Hello</div>
+<div class="test" id="t9">Hello</div>
+<div class="test" id="t10">Hello</div>
+<div class="test" id="t11">Hello</div>
+<div class="test" id="t12">Hello</div>
+<div class="test" id="t13">Hello</div>
+<div class="test" id="t14">Hello</div>
+<div class="test" id="t15">Hello</div>
+<div class="test" id="t16">Hello</div>
+<div class="test" id="t17">Hello</div>
+<script>
+description("This test makes sure that the two shorthand properties which set font-variant-caps get resolved correctly.");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t1')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t2')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t3')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t4')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t5')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t6')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t7')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t8')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t9')).getPropertyValue('font-variant-caps')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t10')).getPropertyValue('font-variant-caps')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t11')).getPropertyValue('font-variant-caps')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t12')).getPropertyValue('font-variant-caps')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t13')).getPropertyValue('font-variant-caps')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t14')).getPropertyValue('font-variant-caps')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t15')).getPropertyValue('font-variant-caps')", "normal");
+
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t1')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t2')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t3')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t4')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t5')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t6')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t7')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t8')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t9')).getPropertyValue('font-variant')", "small-caps");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t10')).getPropertyValue('font-variant')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t11')).getPropertyValue('font-variant')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t12')).getPropertyValue('font-variant')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t13')).getPropertyValue('font-variant')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t14')).getPropertyValue('font-variant')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t15')).getPropertyValue('font-variant')", "normal");
+
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t16')).getPropertyValue('font-variant')", "common-ligatures super small-caps lining-nums historical-forms simplified");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t17')).getPropertyValue('font-variant')", "normal");
+shouldBeEqualToString("window.getComputedStyle(document.getElementById('t17')).getPropertyValue('font-variant-caps')", "normal");
+</script>
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/platform/mac/TestExpectations 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1365,3 +1365,10 @@
</span><span class="cx">
</span><span class="cx"> # Started to fail after r188390
</span><span class="cx"> webkit.org/b/148042 http/tests/media/video-buffered-range-contains-currentTime.html [ Pass Failure ]
</span><ins>+
+# Temporarily disable font-features tests unil synthesis for font-variant-caps is implemented.
+webkit.org/b/149774 css3/font-feature-settings-font-face-rendering.html [ Pass Failure ImageOnlyFailure ]
+webkit.org/b/149774 css3/font-feature-settings-rendering.html [ Pass Failure ImageOnlyFailure ]
+webkit.org/b/149774 css3/font-variant-all.html [ Pass Failure ImageOnlyFailure ]
+webkit.org/b/149774 css3/font-variant-font-face-all.html [ Pass Failure ImageOnlyFailure ]
+webkit.org/b/149774 css3/font-variant-font-face-override.html [ Pass Failure ImageOnlyFailure ]
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsplatformmacfastwritingmodebrokenideographsmallcapsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/platform/mac/fast/writing-mode/broken-ideograph-small-caps-expected.txt (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/platform/mac/fast/writing-mode/broken-ideograph-small-caps-expected.txt 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/LayoutTests/platform/mac/fast/writing-mode/broken-ideograph-small-caps-expected.txt 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -13,8 +13,8 @@
</span><span class="cx"> text run at (21,1) width 176: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
</span><span class="cx"> RenderBlock {DIV} at (278,1) size 277x275 [bgcolor=#FFFFEE]
</span><span class="cx"> RenderBlock {P} at (14,28) size 63x219 [bgcolor=#FFAAAA] [border: none (20px solid #FF8888) none (20px solid #FF8888)]
</span><del>- RenderText {#text} at (21,1) size 20x195
- text run at (21,1) width 195: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph 1"
</del><ins>+ RenderText {#text} at (21,1) size 20x175
+ text run at (21,1) width 175: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph 1"
</ins><span class="cx"> RenderBlock {P} at (90,28) size 63x219 [bgcolor=#FFAAAA] [border: none (20px solid #FF8888) none (20px solid #FF8888)]
</span><del>- RenderText {#text} at (21,1) size 20x195
- text run at (21,1) width 195: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
</del><ins>+ RenderText {#text} at (21,1) size 20x181
+ text run at (21,1) width 181: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1,3 +1,87 @@
</span><ins>+2015-12-02 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Unify font-variant-* with font-variant shorthand
+ https://bugs.webkit.org/show_bug.cgi?id=149773
+
+ Reviewed by Darin Adler.
+
+ This patch makes font-variant a shorthand for the following properties:
+ font-variant-ligatures
+ font-variant-position
+ font-variant-caps
+ font-variant-numeric
+ font-variant-alternates
+ font-variant-east-asian
+
+ This is consistent with the CSS Fonts Level 3 spec.
+
+ This patch also migrates the "font" longhand to use the font-variant-caps
+ property.
+
+ Test: fast/text/font-variant-shorthand.html
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::fontVariantEastAsianPropertyValue): Rename FontVariantEastAsian values.
+ (WebCore::fontVariantFromStyle): We must consult with the longhand properties to determine
+ font-variant computed style.
+ (WebCore::ComputedStyleExtractor::propertyValue): Don't put any-old font-variant-caps inside
+ the font shorthand.
+ * css/CSSFontSelector.cpp:
+ (WebCore::CSSFontSelector::addFontFaceRule): Guard against incorrect downcasts (due to inherit
+ of the new shorthand property).
+ * css/CSSParser.cpp: Parse font-variant as a shorthand. Also implement its "normal" and "none" values.
+ (WebCore::CSSParser::parseValue):
+ (WebCore::CSSParser::parseFont):
+ (WebCore::CSSParser::parseSystemFont):
+ (WebCore::CSSParser::parseFontVariantLigatures):
+ (WebCore::CSSParser::parseFontVariantNumeric):
+ (WebCore::CSSParser::parseFontVariantEastAsian):
+ (WebCore::CSSParser::parseFontVariant):
+ (WebCore::isValidKeywordPropertyAndValue): Deleted.
+ (WebCore::isKeywordPropertyID): Deleted.
+ * css/CSSParser.h:
+ * css/CSSPropertyNames.in: Turn font-variant into a shorthand property.
+ * css/FontVariantBuilder.h: Guard against incorrect downcasts. Also update for renamed
+ FontVariantEastAsian type.
+ (WebCore::applyValueFontVariantLigatures):
+ (WebCore::applyValueFontVariantNumeric):
+ (WebCore::applyValueFontVariantEastAsian):
+ * css/StyleProperties.cpp: Update to use the more specific property.
+ (WebCore::StyleProperties::appendFontLonghandValueIfExplicit):
+ (WebCore::StyleProperties::fontValue):
+ (WebCore::StyleProperties::asText):
+ * css/StyleResolver.cpp: Ditto.
+ (WebCore::StyleResolver::isValidCueStyleProperty):
+ * editing/EditingStyle.cpp: Ditto.
+ * editing/cocoa/HTMLConverter.mm: Ditto.
+ (HTMLConverterCaches::propertyValueForNode):
+ (HTMLConverter::computedAttributesForElement):
+ * editing/ios/EditorIOS.mm: Ditto.
+ (WebCore::Editor::removeUnchangeableStyles):
+ * html/canvas/CanvasRenderingContext2D.cpp: Ditto.
+ (WebCore::CanvasRenderingContext2D::font):
+ (WebCore::CanvasRenderingContext2D::setFont):
+ * platform/graphics/FontCache.h: Removing duplicate cache key value.
+ (WebCore::FontDescriptionKey::makeFlagsKey):
+ * platform/graphics/FontCascade.cpp: Migrate to the new font-variant-caps from the old member variable.
+ (WebCore::FontCascade::glyphDataForCharacter):
+ * platform/graphics/FontCascade.h: Ditto.
+ (WebCore::FontCascade::isSmallCaps):
+ * platform/graphics/FontDescription.cpp: Ditto.
+ (WebCore::FontDescription::FontDescription):
+ * platform/graphics/FontDescription.h: Ditto.
+ (WebCore::FontCascadeDescription::equalForTextAutoSizing):
+ (WebCore::FontDescription::smallCaps): Deleted.
+ (WebCore::FontDescription::setSmallCaps): Deleted.
+ (WebCore::FontDescription::setIsSmallCaps): Deleted.
+ (WebCore::FontDescription::operator==): Deleted.
+ * platform/graphics/cocoa/FontCacheCoreText.cpp: Rename FontVariantEastAsianWidth.
+ (WebCore::computeFeatureSettingsFromVariants):
+ * platform/text/TextFlags.h: Ditto.
+ (WebCore::FontVariantSettings::operator==):
+ * rendering/RenderText.cpp: Migrage to the new font-variant-caps from the old member variable.
+ (WebCore::RenderText::widthFromCache):
+
</ins><span class="cx"> 2015-11-22 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Font selection should not consult font-variant property
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1360,10 +1360,10 @@
</span><span class="cx"> switch (width) {
</span><span class="cx"> case FontVariantEastAsianWidth::Normal:
</span><span class="cx"> break;
</span><del>- case FontVariantEastAsianWidth::FullWidth:
</del><ins>+ case FontVariantEastAsianWidth::Full:
</ins><span class="cx"> valueList->append(cssValuePool().createIdentifierValue(CSSValueFullWidth));
</span><span class="cx"> break;
</span><del>- case FontVariantEastAsianWidth::ProportionalWidth:
</del><ins>+ case FontVariantEastAsianWidth::Proportional:
</ins><span class="cx"> valueList->append(cssValuePool().createIdentifierValue(CSSValueProportionalWidth));
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1794,11 +1794,191 @@
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNormal);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static Ref<CSSPrimitiveValue> fontVariantFromStyle(RenderStyle* style)
</del><ins>+static Ref<CSSValue> fontVariantFromStyle(RenderStyle* style)
</ins><span class="cx"> {
</span><del>- if (style->fontDescription().smallCaps())
- return cssValuePool().createIdentifierValue(CSSValueSmallCaps);
- return cssValuePool().createIdentifierValue(CSSValueNormal);
</del><ins>+ if (style->fontDescription().variantSettings().isAllNormal())
+ return cssValuePool().createIdentifierValue(CSSValueNormal);
+
+ auto list = CSSValueList::createSpaceSeparated();
+
+ switch (style->fontDescription().variantCommonLigatures()) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueCommonLigatures));
+ break;
+ case FontVariantLigatures::No:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueNoCommonLigatures));
+ break;
+ }
+
+ switch (style->fontDescription().variantDiscretionaryLigatures()) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueDiscretionaryLigatures));
+ break;
+ case FontVariantLigatures::No:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueNoDiscretionaryLigatures));
+ break;
+ }
+
+ switch (style->fontDescription().variantHistoricalLigatures()) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueHistoricalLigatures));
+ break;
+ case FontVariantLigatures::No:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueNoHistoricalLigatures));
+ break;
+ }
+
+ switch (style->fontDescription().variantContextualAlternates()) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueContextual));
+ break;
+ case FontVariantLigatures::No:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueNoContextual));
+ break;
+ }
+
+ switch (style->fontDescription().variantPosition()) {
+ case FontVariantPosition::Normal:
+ break;
+ case FontVariantPosition::Subscript:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueSub));
+ break;
+ case FontVariantPosition::Superscript:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueSuper));
+ break;
+ }
+
+ switch (style->fontDescription().variantCaps()) {
+ case FontVariantCaps::Normal:
+ break;
+ case FontVariantCaps::Small:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueSmallCaps));
+ break;
+ case FontVariantCaps::AllSmall:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueAllSmallCaps));
+ break;
+ case FontVariantCaps::Petite:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValuePetiteCaps));
+ break;
+ case FontVariantCaps::AllPetite:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueAllPetiteCaps));
+ break;
+ case FontVariantCaps::Unicase:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueUnicase));
+ break;
+ case FontVariantCaps::Titling:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueTitlingCaps));
+ break;
+ }
+
+ switch (style->fontDescription().variantNumericFigure()) {
+ case FontVariantNumericFigure::Normal:
+ break;
+ case FontVariantNumericFigure::LiningNumbers:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueLiningNums));
+ break;
+ case FontVariantNumericFigure::OldStyleNumbers:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueOldstyleNums));
+ break;
+ }
+
+ switch (style->fontDescription().variantNumericSpacing()) {
+ case FontVariantNumericSpacing::Normal:
+ break;
+ case FontVariantNumericSpacing::ProportionalNumbers:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueProportionalNums));
+ break;
+ case FontVariantNumericSpacing::TabularNumbers:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueTabularNums));
+ break;
+ }
+
+ switch (style->fontDescription().variantNumericFraction()) {
+ case FontVariantNumericFraction::Normal:
+ break;
+ case FontVariantNumericFraction::DiagonalFractions:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueDiagonalFractions));
+ break;
+ case FontVariantNumericFraction::StackedFractions:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueStackedFractions));
+ break;
+ }
+
+ switch (style->fontDescription().variantNumericOrdinal()) {
+ case FontVariantNumericOrdinal::Normal:
+ break;
+ case FontVariantNumericOrdinal::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueOrdinal));
+ break;
+ }
+
+ switch (style->fontDescription().variantNumericSlashedZero()) {
+ case FontVariantNumericSlashedZero::Normal:
+ break;
+ case FontVariantNumericSlashedZero::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueSlashedZero));
+ break;
+ }
+
+ switch (style->fontDescription().variantAlternates()) {
+ case FontVariantAlternates::Normal:
+ break;
+ case FontVariantAlternates::HistoricalForms:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueHistoricalForms));
+ break;
+ }
+
+ switch (style->fontDescription().variantEastAsianVariant()) {
+ case FontVariantEastAsianVariant::Normal:
+ break;
+ case FontVariantEastAsianVariant::Jis78:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueJis78));
+ break;
+ case FontVariantEastAsianVariant::Jis83:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueJis83));
+ break;
+ case FontVariantEastAsianVariant::Jis90:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueJis90));
+ break;
+ case FontVariantEastAsianVariant::Jis04:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueJis04));
+ break;
+ case FontVariantEastAsianVariant::Simplified:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueSimplified));
+ break;
+ case FontVariantEastAsianVariant::Traditional:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueTraditional));
+ break;
+ }
+
+ switch (style->fontDescription().variantEastAsianWidth()) {
+ case FontVariantEastAsianWidth::Normal:
+ break;
+ case FontVariantEastAsianWidth::Full:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueFullWidth));
+ break;
+ case FontVariantEastAsianWidth::Proportional:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueProportionalWidth));
+ break;
+ }
+
+ switch (style->fontDescription().variantEastAsianRuby()) {
+ case FontVariantEastAsianRuby::Normal:
+ break;
+ case FontVariantEastAsianRuby::Yes:
+ list.get().append(cssValuePool().createIdentifierValue(CSSValueRuby));
+ break;
+ }
+
+ return WTF::move(list);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> fontWeightFromStyle(RenderStyle* style)
</span><span class="lines">@@ -2482,7 +2662,10 @@
</span><span class="cx"> case CSSPropertyFont: {
</span><span class="cx"> RefPtr<CSSFontValue> computedFont = CSSFontValue::create();
</span><span class="cx"> computedFont->style = fontStyleFromStyle(style.get());
</span><del>- computedFont->variant = fontVariantFromStyle(style.get());
</del><ins>+ if (style->fontDescription().variantCaps() == FontVariantCaps::Small)
+ computedFont->variant = cssValuePool().createIdentifierValue(CSSValueSmallCaps);
+ else
+ computedFont->variant = cssValuePool().createIdentifierValue(CSSValueNormal);
</ins><span class="cx"> computedFont->weight = fontWeightFromStyle(style.get());
</span><span class="cx"> computedFont->size = fontSizeFromStyle(*style);
</span><span class="cx"> computedFont->lineHeight = lineHeightFromStyle(*style);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/CSSFontSelector.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -247,16 +247,16 @@
</span><span class="cx"> if (variantLigatures)
</span><span class="cx"> applyValueFontVariantLigatures(*fontFace, *variantLigatures);
</span><span class="cx">
</span><del>- if (variantPosition)
</del><ins>+ if (variantPosition && is<CSSPrimitiveValue>(*variantPosition))
</ins><span class="cx"> fontFace->setVariantPosition(downcast<CSSPrimitiveValue>(*variantPosition));
</span><span class="cx">
</span><del>- if (variantCaps)
</del><ins>+ if (variantCaps && is<CSSPrimitiveValue>(*variantCaps))
</ins><span class="cx"> fontFace->setVariantCaps(downcast<CSSPrimitiveValue>(*variantCaps));
</span><span class="cx">
</span><span class="cx"> if (variantNumeric)
</span><span class="cx"> applyValueFontVariantNumeric(*fontFace, *variantNumeric);
</span><span class="cx">
</span><del>- if (variantAlternates)
</del><ins>+ if (variantAlternates && is<CSSPrimitiveValue>(*variantAlternates))
</ins><span class="cx"> fontFace->setVariantAlternates(downcast<CSSPrimitiveValue>(*variantAlternates));
</span><span class="cx">
</span><span class="cx"> if (variantEastAsian)
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSParsercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1054,10 +1054,6 @@
</span><span class="cx"> if (valueID == CSSValueNormal || valueID == CSSValueHistoricalForms)
</span><span class="cx"> return true;
</span><span class="cx"> break;
</span><del>- case CSSPropertyFontVariant: // normal | small-caps
- if (valueID == CSSValueNormal || valueID == CSSValueSmallCaps)
- return true;
- break;
</del><span class="cx"> default:
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return false;
</span><span class="lines">@@ -1188,7 +1184,6 @@
</span><span class="cx"> case CSSPropertyFontVariantPosition:
</span><span class="cx"> case CSSPropertyFontVariantCaps:
</span><span class="cx"> case CSSPropertyFontVariantAlternates:
</span><del>- case CSSPropertyFontVariant:
</del><span class="cx"> return true;
</span><span class="cx"> default:
</span><span class="cx"> return false;
</span><span class="lines">@@ -3089,20 +3084,37 @@
</span><span class="cx"> if (id == CSSValueNormal || id == CSSValueNone)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><del>- return parseFontVariantLigatures(important);
</del><ins>+ return parseFontVariantLigatures(important, true, false);
</ins><span class="cx"> break;
</span><span class="cx"> case CSSPropertyFontVariantNumeric:
</span><span class="cx"> if (id == CSSValueNormal)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><del>- return parseFontVariantNumeric(important);
</del><ins>+ return parseFontVariantNumeric(important, true, false);
</ins><span class="cx"> break;
</span><span class="cx"> case CSSPropertyFontVariantEastAsian:
</span><span class="cx"> if (id == CSSValueNormal)
</span><span class="cx"> validPrimitive = true;
</span><span class="cx"> else
</span><del>- return parseFontVariantEastAsian(important);
</del><ins>+ return parseFontVariantEastAsian(important, true, false);
</ins><span class="cx"> break;
</span><ins>+ case CSSPropertyFontVariant:
+ if (id == CSSValueNormal) {
+ ShorthandScope scope(this, CSSPropertyFontVariant);
+ addProperty(CSSPropertyFontVariantLigatures, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
+ addProperty(CSSPropertyFontVariantPosition, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
+ addProperty(CSSPropertyFontVariantNumeric, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
+ addProperty(CSSPropertyFontVariantAlternates, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
+ addProperty(CSSPropertyFontVariantEastAsian, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
+ return true;
+ }
+ if (id == CSSValueNone) {
+ ShorthandScope scope(this, CSSPropertyFontVariant);
+ addProperty(CSSPropertyFontVariantLigatures, cssValuePool().createIdentifierValue(CSSValueNone), important, true);
+ return true;
+ }
+ return parseFontVariant(important);
</ins><span class="cx">
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><span class="cx"> parsedValue = parseClipPath();
</span><span class="lines">@@ -6696,7 +6708,7 @@
</span><span class="cx"> fontStyleParsed = true;
</span><span class="cx"> } else if (!fontVariantParsed && (value->id == CSSValueNormal || value->id == CSSValueSmallCaps)) {
</span><span class="cx"> // Font variant in the shorthand is particular, it only accepts normal or small-caps.
</span><del>- addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(value->id), important);
</del><ins>+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(value->id), important);
</ins><span class="cx"> fontVariantParsed = true;
</span><span class="cx"> } else if (!fontWeightParsed && parseFontWeight(important))
</span><span class="cx"> fontWeightParsed = true;
</span><span class="lines">@@ -6711,7 +6723,7 @@
</span><span class="cx"> if (!fontStyleParsed)
</span><span class="cx"> addProperty(CSSPropertyFontStyle, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
</span><span class="cx"> if (!fontVariantParsed)
</span><del>- addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
</del><ins>+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
</ins><span class="cx"> if (!fontWeightParsed)
</span><span class="cx"> addProperty(CSSPropertyFontWeight, cssValuePool().createIdentifierValue(CSSValueNormal), important, true);
</span><span class="cx">
</span><span class="lines">@@ -6770,7 +6782,7 @@
</span><span class="cx"> Ref<CSSValueList> fontFamilyList = CSSValueList::createCommaSeparated();
</span><span class="cx"> fontFamilyList->append(cssValuePool().createFontFamilyValue(fontDescription.familyAt(0), FromSystemFontID::Yes));
</span><span class="cx"> addProperty(CSSPropertyFontFamily, WTF::move(fontFamilyList), important);
</span><del>- addProperty(CSSPropertyFontVariant, cssValuePool().createIdentifierValue(CSSValueNormal), important);
</del><ins>+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueNormal), important);
</ins><span class="cx"> addProperty(CSSPropertyLineHeight, cssValuePool().createIdentifierValue(CSSValueNormal), important);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -10497,13 +10509,13 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseFontVariantLigatures(bool important)
</del><ins>+bool CSSParser::parseFontVariantLigatures(bool important, bool unknownIsFailure, bool implicit)
</ins><span class="cx"> {
</span><span class="cx"> auto values = CSSValueList::createSpaceSeparated();
</span><del>- bool sawCommonValue = false;
- bool sawDiscretionaryValue = false;
- bool sawHistoricalValue = false;
- bool sawContextualValue = false;
</del><ins>+ FontVariantLigatures commonLigatures = FontVariantLigatures::Normal;
+ FontVariantLigatures discretionaryLigatures = FontVariantLigatures::Normal;
+ FontVariantLigatures historicalLigatures = FontVariantLigatures::Normal;
+ FontVariantLigatures contextualAlternates = FontVariantLigatures::Normal;
</ins><span class="cx">
</span><span class="cx"> for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
</span><span class="cx"> if (value->unit != CSSPrimitiveValue::CSS_IDENT)
</span><span class="lines">@@ -10511,53 +10523,95 @@
</span><span class="cx">
</span><span class="cx"> switch (value->id) {
</span><span class="cx"> case CSSValueNoCommonLigatures:
</span><ins>+ commonLigatures = FontVariantLigatures::No;
+ break;
</ins><span class="cx"> case CSSValueCommonLigatures:
</span><del>- if (sawCommonValue)
- return false;
- sawCommonValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ commonLigatures = FontVariantLigatures::Yes;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueNoDiscretionaryLigatures:
</span><ins>+ discretionaryLigatures = FontVariantLigatures::No;
+ break;
</ins><span class="cx"> case CSSValueDiscretionaryLigatures:
</span><del>- if (sawDiscretionaryValue)
- return false;
- sawDiscretionaryValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ discretionaryLigatures = FontVariantLigatures::Yes;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueNoHistoricalLigatures:
</span><ins>+ historicalLigatures = FontVariantLigatures::No;
+ break;
</ins><span class="cx"> case CSSValueHistoricalLigatures:
</span><del>- if (sawHistoricalValue)
- return false;
- sawHistoricalValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ historicalLigatures = FontVariantLigatures::Yes;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueContextual:
</span><ins>+ contextualAlternates = FontVariantLigatures::Yes;
+ break;
</ins><span class="cx"> case CSSValueNoContextual:
</span><del>- if (sawContextualValue)
- return false;
- sawContextualValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ contextualAlternates = FontVariantLigatures::No;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- return false;
</del><ins>+ if (unknownIsFailure)
+ return false;
+ continue;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch (commonLigatures) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ values->append(cssValuePool().createIdentifierValue(CSSValueCommonLigatures));
+ break;
+ case FontVariantLigatures::No:
+ values->append(cssValuePool().createIdentifierValue(CSSValueNoCommonLigatures));
+ break;
+ }
+
+ switch (discretionaryLigatures) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ values->append(cssValuePool().createIdentifierValue(CSSValueDiscretionaryLigatures));
+ break;
+ case FontVariantLigatures::No:
+ values->append(cssValuePool().createIdentifierValue(CSSValueNoDiscretionaryLigatures));
+ break;
+ }
+
+ switch (historicalLigatures) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ values->append(cssValuePool().createIdentifierValue(CSSValueHistoricalLigatures));
+ break;
+ case FontVariantLigatures::No:
+ values->append(cssValuePool().createIdentifierValue(CSSValueNoHistoricalLigatures));
+ break;
+ }
+
+ switch (contextualAlternates) {
+ case FontVariantLigatures::Normal:
+ break;
+ case FontVariantLigatures::Yes:
+ values->append(cssValuePool().createIdentifierValue(CSSValueContextual));
+ break;
+ case FontVariantLigatures::No:
+ values->append(cssValuePool().createIdentifierValue(CSSValueNoContextual));
+ break;
+ }
+
</ins><span class="cx"> if (!values->length())
</span><del>- return false;
</del><ins>+ return !unknownIsFailure;
</ins><span class="cx">
</span><del>- addProperty(CSSPropertyFontVariantLigatures, WTF::move(values), important);
</del><ins>+ addProperty(CSSPropertyFontVariantLigatures, WTF::move(values), important, implicit);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseFontVariantNumeric(bool important)
</del><ins>+bool CSSParser::parseFontVariantNumeric(bool important, bool unknownIsFailure, bool implicit)
</ins><span class="cx"> {
</span><span class="cx"> auto values = CSSValueList::createSpaceSeparated();
</span><del>- bool sawFigureValue = false;
- bool sawSpacingValue = false;
- bool sawFractionValue = false;
- bool sawOrdinal = false;
- bool sawSlashedZero = false;
</del><ins>+ FontVariantNumericFigure figure = FontVariantNumericFigure::Normal;
+ FontVariantNumericSpacing spacing = FontVariantNumericSpacing::Normal;
+ FontVariantNumericFraction fraction = FontVariantNumericFraction::Normal;
+ FontVariantNumericOrdinal ordinal = FontVariantNumericOrdinal::Normal;
+ FontVariantNumericSlashedZero slashedZero = FontVariantNumericSlashedZero::Normal;
</ins><span class="cx">
</span><span class="cx"> for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
</span><span class="cx"> if (value->unit != CSSPrimitiveValue::CSS_IDENT)
</span><span class="lines">@@ -10565,56 +10619,98 @@
</span><span class="cx">
</span><span class="cx"> switch (value->id) {
</span><span class="cx"> case CSSValueLiningNums:
</span><ins>+ figure = FontVariantNumericFigure::LiningNumbers;
+ break;
</ins><span class="cx"> case CSSValueOldstyleNums:
</span><del>- if (sawFigureValue)
- return false;
- sawFigureValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ figure = FontVariantNumericFigure::OldStyleNumbers;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueProportionalNums:
</span><ins>+ spacing = FontVariantNumericSpacing::ProportionalNumbers;
+ break;
</ins><span class="cx"> case CSSValueTabularNums:
</span><del>- if (sawSpacingValue)
- return false;
- sawSpacingValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ spacing = FontVariantNumericSpacing::TabularNumbers;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueDiagonalFractions:
</span><ins>+ fraction = FontVariantNumericFraction::DiagonalFractions;
+ break;
</ins><span class="cx"> case CSSValueStackedFractions:
</span><del>- if (sawFractionValue)
- return false;
- sawFractionValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ fraction = FontVariantNumericFraction::StackedFractions;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueOrdinal:
</span><del>- if (sawOrdinal)
- return false;
- sawOrdinal = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ ordinal = FontVariantNumericOrdinal::Yes;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueSlashedZero:
</span><del>- if (sawSlashedZero)
- return false;
- sawSlashedZero = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ slashedZero = FontVariantNumericSlashedZero::Yes;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- return false;
</del><ins>+ if (unknownIsFailure)
+ return false;
+ continue;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch (figure) {
+ case FontVariantNumericFigure::Normal:
+ break;
+ case FontVariantNumericFigure::LiningNumbers:
+ values->append(cssValuePool().createIdentifierValue(CSSValueLiningNums));
+ break;
+ case FontVariantNumericFigure::OldStyleNumbers:
+ values->append(cssValuePool().createIdentifierValue(CSSValueOldstyleNums));
+ break;
+ }
+
+ switch (spacing) {
+ case FontVariantNumericSpacing::Normal:
+ break;
+ case FontVariantNumericSpacing::ProportionalNumbers:
+ values->append(cssValuePool().createIdentifierValue(CSSValueProportionalNums));
+ break;
+ case FontVariantNumericSpacing::TabularNumbers:
+ values->append(cssValuePool().createIdentifierValue(CSSValueTabularNums));
+ break;
+ }
+
+ switch (fraction) {
+ case FontVariantNumericFraction::Normal:
+ break;
+ case FontVariantNumericFraction::DiagonalFractions:
+ values->append(cssValuePool().createIdentifierValue(CSSValueDiagonalFractions));
+ break;
+ case FontVariantNumericFraction::StackedFractions:
+ values->append(cssValuePool().createIdentifierValue(CSSValueStackedFractions));
+ break;
+ }
+
+ switch (ordinal) {
+ case FontVariantNumericOrdinal::Normal:
+ break;
+ case FontVariantNumericOrdinal::Yes:
+ values->append(cssValuePool().createIdentifierValue(CSSValueOrdinal));
+ break;
+ }
+
+ switch (slashedZero) {
+ case FontVariantNumericSlashedZero::Normal:
+ break;
+ case FontVariantNumericSlashedZero::Yes:
+ values->append(cssValuePool().createIdentifierValue(CSSValueSlashedZero));
+ break;
+ }
+
</ins><span class="cx"> if (!values->length())
</span><del>- return false;
</del><ins>+ return !unknownIsFailure;
</ins><span class="cx">
</span><del>- addProperty(CSSPropertyFontVariantNumeric, WTF::move(values), important);
</del><ins>+ addProperty(CSSPropertyFontVariantNumeric, WTF::move(values), important, implicit);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CSSParser::parseFontVariantEastAsian(bool important)
</del><ins>+bool CSSParser::parseFontVariantEastAsian(bool important, bool unknownIsFailure, bool implicit)
</ins><span class="cx"> {
</span><span class="cx"> auto values = CSSValueList::createSpaceSeparated();
</span><del>- bool sawVariantValue = false;
- bool sawWidthValue = false;
- bool sawRuby = false;
</del><ins>+ FontVariantEastAsianVariant variant = FontVariantEastAsianVariant::Normal;
+ FontVariantEastAsianWidth width = FontVariantEastAsianWidth::Normal;
+ FontVariantEastAsianRuby ruby = FontVariantEastAsianRuby::Normal;
</ins><span class="cx">
</span><span class="cx"> for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
</span><span class="cx"> if (value->unit != CSSPrimitiveValue::CSS_IDENT)
</span><span class="lines">@@ -10622,38 +10718,209 @@
</span><span class="cx">
</span><span class="cx"> switch (value->id) {
</span><span class="cx"> case CSSValueJis78:
</span><ins>+ variant = FontVariantEastAsianVariant::Jis78;
+ break;
</ins><span class="cx"> case CSSValueJis83:
</span><ins>+ variant = FontVariantEastAsianVariant::Jis83;
+ break;
</ins><span class="cx"> case CSSValueJis90:
</span><ins>+ variant = FontVariantEastAsianVariant::Jis90;
+ break;
</ins><span class="cx"> case CSSValueJis04:
</span><ins>+ variant = FontVariantEastAsianVariant::Jis04;
+ break;
</ins><span class="cx"> case CSSValueSimplified:
</span><ins>+ variant = FontVariantEastAsianVariant::Simplified;
+ break;
</ins><span class="cx"> case CSSValueTraditional:
</span><del>- if (sawVariantValue)
- return false;
- sawVariantValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ variant = FontVariantEastAsianVariant::Traditional;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueFullWidth:
</span><ins>+ width = FontVariantEastAsianWidth::Full;
+ break;
</ins><span class="cx"> case CSSValueProportionalWidth:
</span><del>- if (sawWidthValue)
- return false;
- sawWidthValue = true;
- values->append(cssValuePool().createIdentifierValue(value->id));
</del><ins>+ width = FontVariantEastAsianWidth::Proportional;
</ins><span class="cx"> break;
</span><span class="cx"> case CSSValueRuby:
</span><del>- sawRuby = true;
</del><ins>+ ruby = FontVariantEastAsianRuby::Yes;
</ins><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- return false;
</del><ins>+ if (unknownIsFailure)
+ return false;
+ continue;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sawRuby)
</del><ins>+ switch (variant) {
+ case FontVariantEastAsianVariant::Normal:
+ break;
+ case FontVariantEastAsianVariant::Jis78:
+ values->append(cssValuePool().createIdentifierValue(CSSValueJis78));
+ break;
+ case FontVariantEastAsianVariant::Jis83:
+ values->append(cssValuePool().createIdentifierValue(CSSValueJis83));
+ break;
+ case FontVariantEastAsianVariant::Jis90:
+ values->append(cssValuePool().createIdentifierValue(CSSValueJis90));
+ break;
+ case FontVariantEastAsianVariant::Jis04:
+ values->append(cssValuePool().createIdentifierValue(CSSValueJis04));
+ break;
+ case FontVariantEastAsianVariant::Simplified:
+ values->append(cssValuePool().createIdentifierValue(CSSValueSimplified));
+ break;
+ case FontVariantEastAsianVariant::Traditional:
+ values->append(cssValuePool().createIdentifierValue(CSSValueTraditional));
+ break;
+ }
+
+ switch (width) {
+ case FontVariantEastAsianWidth::Normal:
+ break;
+ case FontVariantEastAsianWidth::Full:
+ values->append(cssValuePool().createIdentifierValue(CSSValueFullWidth));
+ break;
+ case FontVariantEastAsianWidth::Proportional:
+ values->append(cssValuePool().createIdentifierValue(CSSValueProportionalWidth));
+ break;
+ }
+
+ switch (ruby) {
+ case FontVariantEastAsianRuby::Normal:
+ break;
+ case FontVariantEastAsianRuby::Yes:
</ins><span class="cx"> values->append(cssValuePool().createIdentifierValue(CSSValueRuby));
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if (!values->length())
</span><ins>+ return !unknownIsFailure;
+
+ addProperty(CSSPropertyFontVariantEastAsian, WTF::move(values), important, implicit);
+ return true;
+}
+
+bool CSSParser::parseFontVariant(bool important)
+{
+ ShorthandScope scope(this, CSSPropertyFontVariant);
+ if (!parseFontVariantLigatures(important, false, false))
</ins><span class="cx"> return false;
</span><ins>+ m_valueList->setCurrentIndex(0);
+ if (!parseFontVariantNumeric(important, false, false))
+ return false;
+ m_valueList->setCurrentIndex(0);
+ if (!parseFontVariantEastAsian(important, false, false))
+ return false;
+ m_valueList->setCurrentIndex(0);
</ins><span class="cx">
</span><del>- addProperty(CSSPropertyFontVariantEastAsian, WTF::move(values), important);
</del><ins>+ FontVariantPosition position = FontVariantPosition::Normal;
+ FontVariantCaps caps = FontVariantCaps::Normal;
+ FontVariantAlternates alternates = FontVariantAlternates::Normal;
+
+ for (CSSParserValue* value = m_valueList->current(); value; value = m_valueList->next()) {
+ if (value->unit != CSSPrimitiveValue::CSS_IDENT)
+ return false;
+
+ switch (value->id) {
+ case CSSValueNoCommonLigatures:
+ case CSSValueCommonLigatures:
+ case CSSValueNoDiscretionaryLigatures:
+ case CSSValueDiscretionaryLigatures:
+ case CSSValueNoHistoricalLigatures:
+ case CSSValueHistoricalLigatures:
+ case CSSValueContextual:
+ case CSSValueNoContextual:
+ case CSSValueLiningNums:
+ case CSSValueOldstyleNums:
+ case CSSValueProportionalNums:
+ case CSSValueTabularNums:
+ case CSSValueDiagonalFractions:
+ case CSSValueStackedFractions:
+ case CSSValueOrdinal:
+ case CSSValueSlashedZero:
+ case CSSValueJis78:
+ case CSSValueJis83:
+ case CSSValueJis90:
+ case CSSValueJis04:
+ case CSSValueSimplified:
+ case CSSValueTraditional:
+ case CSSValueFullWidth:
+ case CSSValueProportionalWidth:
+ case CSSValueRuby:
+ break;
+ case CSSValueSub:
+ position = FontVariantPosition::Subscript;
+ break;
+ case CSSValueSuper:
+ position = FontVariantPosition::Superscript;
+ break;
+ case CSSValueSmallCaps:
+ caps = FontVariantCaps::Small;
+ break;
+ case CSSValueAllSmallCaps:
+ caps = FontVariantCaps::AllSmall;
+ break;
+ case CSSValuePetiteCaps:
+ caps = FontVariantCaps::Petite;
+ break;
+ case CSSValueAllPetiteCaps:
+ caps = FontVariantCaps::AllPetite;
+ break;
+ case CSSValueUnicase:
+ caps = FontVariantCaps::Unicase;
+ break;
+ case CSSValueTitlingCaps:
+ caps = FontVariantCaps::Titling;
+ break;
+ case CSSValueHistoricalForms:
+ alternates = FontVariantAlternates::HistoricalForms;
+ break;
+ default:
+ return false;
+ }
+ }
+
+ switch (position) {
+ case FontVariantPosition::Normal:
+ break;
+ case FontVariantPosition::Subscript:
+ addProperty(CSSPropertyFontVariantPosition, cssValuePool().createIdentifierValue(CSSValueSub), important, false);
+ break;
+ case FontVariantPosition::Superscript:
+ addProperty(CSSPropertyFontVariantPosition, cssValuePool().createIdentifierValue(CSSValueSuper), important, false);
+ break;
+ }
+
+ switch (caps) {
+ case FontVariantCaps::Normal:
+ break;
+ case FontVariantCaps::Small:
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueSmallCaps), important, false);
+ break;
+ case FontVariantCaps::AllSmall:
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueAllSmallCaps), important, false);
+ break;
+ case FontVariantCaps::Petite:
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValuePetiteCaps), important, false);
+ break;
+ case FontVariantCaps::AllPetite:
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueAllPetiteCaps), important, false);
+ break;
+ case FontVariantCaps::Unicase:
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueUnicase), important, false);
+ break;
+ case FontVariantCaps::Titling:
+ addProperty(CSSPropertyFontVariantCaps, cssValuePool().createIdentifierValue(CSSValueTitlingCaps), important, false);
+ break;
+ }
+
+ switch (alternates) {
+ case FontVariantAlternates::Normal:
+ break;
+ case FontVariantAlternates::HistoricalForms:
+ addProperty(CSSPropertyFontVariantAlternates, cssValuePool().createIdentifierValue(CSSValueHistoricalForms), important, false);
+ break;
+ }
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSParserh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSParser.h (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSParser.h 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/CSSParser.h 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -345,9 +345,10 @@
</span><span class="cx"> bool parseFlowThread(CSSPropertyID, bool important);
</span><span class="cx"> bool parseRegionThread(CSSPropertyID, bool important);
</span><span class="cx">
</span><del>- bool parseFontVariantLigatures(bool important);
- bool parseFontVariantNumeric(bool important);
- bool parseFontVariantEastAsian(bool important);
</del><ins>+ bool parseFontVariantLigatures(bool important, bool unknownIsFailure, bool implicit);
+ bool parseFontVariantNumeric(bool important, bool unknownIsFailure, bool implicit);
+ bool parseFontVariantEastAsian(bool important, bool unknownIsFailure, bool implicit);
+ bool parseFontVariant(bool important);
</ins><span class="cx">
</span><span class="cx"> bool parseWillChange(bool important);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssCSSPropertyNamesin"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/CSSPropertyNames.in 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -102,7 +102,6 @@
</span><span class="cx"> font-family [Inherited, Custom=All]
</span><span class="cx"> font-size [Inherited, Custom=All]
</span><span class="cx"> font-style [Inherited, FontProperty, NameForMethods=Italic]
</span><del>-font-variant [Inherited, FontProperty, NameForMethods=SmallCaps]
</del><span class="cx"> font-weight [Inherited, Custom=All]
</span><span class="cx"> text-rendering [Inherited, FontProperty, NameForMethods=TextRenderingMode]
</span><span class="cx"> font-feature-settings [Inherited, FontProperty, Custom=Initial|Inherit, Converter=FontFeatureSettings, NameForMethods=FeatureSettings]
</span><span class="lines">@@ -228,7 +227,8 @@
</span><span class="cx"> float [NameForMethods=Floating]
</span><span class="cx"> flood-color [SVG, Converter=SVGColor]
</span><span class="cx"> flood-opacity [SVG, Converter=Opacity]
</span><del>-font [Inherited, Longhands=font-family|font-size|font-style|font-variant|font-weight|line-height]
</del><ins>+font [Inherited, Longhands=font-family|font-size|font-style|font-variant-caps|font-weight|line-height]
+font-variant [Inherited, Longhands=font-variant-ligatures|font-variant-position|font-variant-caps|font-variant-numeric|font-variant-alternates|font-variant-east-asian]
</ins><span class="cx"> font-stretch [SkipBuilder]
</span><span class="cx"> glyph-orientation-horizontal [Inherited, SVG, Converter=GlyphOrientation]
</span><span class="cx"> glyph-orientation-vertical [Inherited, SVG, Converter=GlyphOrientationOrAuto]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssFontVariantBuilderh"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/Source/WebCore/css/FontVariantBuilder.h (0 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/FontVariantBuilder.h (rev 0)
+++ branches/safari-601-branch/Source/WebCore/css/FontVariantBuilder.h 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -0,0 +1,196 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FontVariantBuilder_h
+#define FontVariantBuilder_h
+
+namespace WebCore {
+
+template <typename T>
+inline void applyValueFontVariantLigatures(T& receiver, CSSValue& value)
+{
+ FontVariantLigatures common = FontVariantLigatures::Normal;
+ FontVariantLigatures discretionary = FontVariantLigatures::Normal;
+ FontVariantLigatures historical = FontVariantLigatures::Normal;
+ FontVariantLigatures contextualAlternates = FontVariantLigatures::Normal;
+
+ if (is<CSSValueList>(value)) {
+ for (auto& item : downcast<CSSValueList>(value)) {
+ switch (downcast<CSSPrimitiveValue>(item.get()).getValueID()) {
+ case CSSValueNoCommonLigatures:
+ common = FontVariantLigatures::No;
+ break;
+ case CSSValueCommonLigatures:
+ common = FontVariantLigatures::Yes;
+ break;
+ case CSSValueNoDiscretionaryLigatures:
+ discretionary = FontVariantLigatures::No;
+ break;
+ case CSSValueDiscretionaryLigatures:
+ discretionary = FontVariantLigatures::Yes;
+ break;
+ case CSSValueNoHistoricalLigatures:
+ historical = FontVariantLigatures::No;
+ break;
+ case CSSValueHistoricalLigatures:
+ historical = FontVariantLigatures::Yes;
+ break;
+ case CSSValueContextual:
+ contextualAlternates = FontVariantLigatures::Yes;
+ break;
+ case CSSValueNoContextual:
+ contextualAlternates = FontVariantLigatures::No;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ }
+ } else if (is<CSSPrimitiveValue>(value)) {
+ switch (downcast<CSSPrimitiveValue>(value).getValueID()) {
+ case CSSValueNormal:
+ break;
+ case CSSValueNone:
+ common = FontVariantLigatures::No;
+ discretionary = FontVariantLigatures::No;
+ historical = FontVariantLigatures::No;
+ contextualAlternates = FontVariantLigatures::No;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ }
+
+ receiver.setVariantCommonLigatures(common);
+ receiver.setVariantDiscretionaryLigatures(discretionary);
+ receiver.setVariantHistoricalLigatures(historical);
+ receiver.setVariantContextualAlternates(contextualAlternates);
+}
+
+template <typename T>
+inline void applyValueFontVariantNumeric(T& receiver, CSSValue& value)
+{
+ FontVariantNumericFigure figure = FontVariantNumericFigure::Normal;
+ FontVariantNumericSpacing spacing = FontVariantNumericSpacing::Normal;
+ FontVariantNumericFraction fraction = FontVariantNumericFraction::Normal;
+ FontVariantNumericOrdinal ordinal = FontVariantNumericOrdinal::Normal;
+ FontVariantNumericSlashedZero slashedZero = FontVariantNumericSlashedZero::Normal;
+
+ if (is<CSSValueList>(value)) {
+ for (auto& item : downcast<CSSValueList>(value)) {
+ switch (downcast<CSSPrimitiveValue>(item.get()).getValueID()) {
+ case CSSValueLiningNums:
+ figure = FontVariantNumericFigure::LiningNumbers;
+ break;
+ case CSSValueOldstyleNums:
+ figure = FontVariantNumericFigure::OldStyleNumbers;
+ break;
+ case CSSValueProportionalNums:
+ spacing = FontVariantNumericSpacing::ProportionalNumbers;
+ break;
+ case CSSValueTabularNums:
+ spacing = FontVariantNumericSpacing::TabularNumbers;
+ break;
+ case CSSValueDiagonalFractions:
+ fraction = FontVariantNumericFraction::DiagonalFractions;
+ break;
+ case CSSValueStackedFractions:
+ fraction = FontVariantNumericFraction::StackedFractions;
+ break;
+ case CSSValueOrdinal:
+ ordinal = FontVariantNumericOrdinal::Yes;
+ break;
+ case CSSValueSlashedZero:
+ slashedZero = FontVariantNumericSlashedZero::Yes;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ }
+ } else if (is<CSSPrimitiveValue>(value))
+ ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNormal);
+
+ receiver.setVariantNumericFigure(figure);
+ receiver.setVariantNumericSpacing(spacing);
+ receiver.setVariantNumericFraction(fraction);
+ receiver.setVariantNumericOrdinal(ordinal);
+ receiver.setVariantNumericSlashedZero(slashedZero);
+}
+
+template <typename T>
+inline void applyValueFontVariantEastAsian(T& receiver, CSSValue& value)
+{
+ FontVariantEastAsianVariant variant = FontVariantEastAsianVariant::Normal;
+ FontVariantEastAsianWidth width = FontVariantEastAsianWidth::Normal;
+ FontVariantEastAsianRuby ruby = FontVariantEastAsianRuby::Normal;
+
+ if (is<CSSValueList>(value)) {
+ for (auto& item : downcast<CSSValueList>(value)) {
+ switch (downcast<CSSPrimitiveValue>(item.get()).getValueID()) {
+ case CSSValueJis78:
+ variant = FontVariantEastAsianVariant::Jis78;
+ break;
+ case CSSValueJis83:
+ variant = FontVariantEastAsianVariant::Jis83;
+ break;
+ case CSSValueJis90:
+ variant = FontVariantEastAsianVariant::Jis90;
+ break;
+ case CSSValueJis04:
+ variant = FontVariantEastAsianVariant::Jis04;
+ break;
+ case CSSValueSimplified:
+ variant = FontVariantEastAsianVariant::Simplified;
+ break;
+ case CSSValueTraditional:
+ variant = FontVariantEastAsianVariant::Traditional;
+ break;
+ case CSSValueFullWidth:
+ width = FontVariantEastAsianWidth::Full;
+ break;
+ case CSSValueProportionalWidth:
+ width = FontVariantEastAsianWidth::Proportional;
+ break;
+ case CSSValueRuby:
+ ruby = FontVariantEastAsianRuby::Yes;
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ break;
+ }
+ }
+ } else if (is<CSSPrimitiveValue>(value))
+ ASSERT(downcast<CSSPrimitiveValue>(value).getValueID() == CSSValueNormal);
+
+ receiver.setVariantEastAsianVariant(variant);
+ receiver.setVariantEastAsianWidth(width);
+ receiver.setVariantEastAsianRuby(ruby);
+}
+
+}
+
+#endif
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssStylePropertiescpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/StyleProperties.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> case CSSPropertyFontStyle:
</span><span class="cx"> break; // No prefix.
</span><span class="cx"> case CSSPropertyFontFamily:
</span><del>- case CSSPropertyFontVariant:
</del><ins>+ case CSSPropertyFontVariantCaps:
</ins><span class="cx"> case CSSPropertyFontWeight:
</span><span class="cx"> prefix = ' ';
</span><span class="cx"> break;
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> String commonValue = fontSizeProperty.value()->cssText();
</span><span class="cx"> StringBuilder result;
</span><span class="cx"> appendFontLonghandValueIfExplicit(CSSPropertyFontStyle, result, commonValue);
</span><del>- appendFontLonghandValueIfExplicit(CSSPropertyFontVariant, result, commonValue);
</del><ins>+ appendFontLonghandValueIfExplicit(CSSPropertyFontVariantCaps, result, commonValue);
</ins><span class="cx"> appendFontLonghandValueIfExplicit(CSSPropertyFontWeight, result, commonValue);
</span><span class="cx"> if (!result.isEmpty())
</span><span class="cx"> result.append(' ');
</span><span class="lines">@@ -971,7 +971,7 @@
</span><span class="cx"> case CSSPropertyLineHeight:
</span><span class="cx"> case CSSPropertyFontSize:
</span><span class="cx"> case CSSPropertyFontStyle:
</span><del>- case CSSPropertyFontVariant:
</del><ins>+ case CSSPropertyFontVariantCaps:
</ins><span class="cx"> case CSSPropertyFontWeight:
</span><span class="cx"> // Don't use CSSPropertyFont because old UAs can't recognize them but are important for editing.
</span><span class="cx"> break;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/css/StyleResolver.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -1828,7 +1828,7 @@
</span><span class="cx"> case CSSPropertyFontFamily:
</span><span class="cx"> case CSSPropertyFontSize:
</span><span class="cx"> case CSSPropertyFontStyle:
</span><del>- case CSSPropertyFontVariant:
</del><ins>+ case CSSPropertyFontVariantCaps:
</ins><span class="cx"> case CSSPropertyFontWeight:
</span><span class="cx"> case CSSPropertyLineHeight:
</span><span class="cx"> case CSSPropertyOpacity:
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreeditingEditingStylecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/editing/EditingStyle.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/editing/EditingStyle.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/editing/EditingStyle.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> CSSPropertyFontFamily,
</span><span class="cx"> CSSPropertyFontSize,
</span><span class="cx"> CSSPropertyFontStyle,
</span><del>- CSSPropertyFontVariant,
</del><ins>+ CSSPropertyFontVariantCaps,
</ins><span class="cx"> CSSPropertyFontWeight,
</span><span class="cx"> CSSPropertyLetterSpacing,
</span><span class="cx"> CSSPropertyOrphans,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/editing/cocoa/HTMLConverter.mm 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> inherit = true;
</span><span class="cx"> break;
</span><span class="cx"> case CSSPropertyFontFamily:
</span><del>- case CSSPropertyFontVariant:
</del><ins>+ case CSSPropertyFontVariantCaps:
</ins><span class="cx"> case CSSPropertyTextTransform:
</span><span class="cx"> case CSSPropertyTextShadow:
</span><span class="cx"> case CSSPropertyVisibility:
</span><span class="lines">@@ -1118,7 +1118,7 @@
</span><span class="cx"> font = originalFont;
</span><span class="cx"> }
</span><span class="cx"> #if !PLATFORM(IOS) // IJB: No small caps support on iOS
</span><del>- if (_caches->propertyValueForNode(element, CSSPropertyFontVariant) == "small-caps") {
</del><ins>+ if (_caches->propertyValueForNode(element, CSSPropertyFontVariantCaps) == "small-caps") {
</ins><span class="cx"> // ??? synthesize small-caps if [font isEqual:originalFont]
</span><span class="cx"> NSFont *originalFont = font;
</span><span class="cx"> font = [fontManager convertFont:font toHaveTrait:NSSmallCapsFontMask];
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> // FIXME: it'd be nice if knowledge about which styles were unchangeable was not hard-coded here.
</span><span class="cx"> defaultStyle->removeProperty(CSSPropertyFontWeight);
</span><span class="cx"> defaultStyle->removeProperty(CSSPropertyFontStyle);
</span><del>- defaultStyle->removeProperty(CSSPropertyFontVariant);
</del><ins>+ defaultStyle->removeProperty(CSSPropertyFontVariantCaps);
</ins><span class="cx"> // FIXME: we should handle also pasted quoted text, strikethrough, etc. <rdar://problem/9255115>
</span><span class="cx"> defaultStyle->removeProperty(CSSPropertyTextDecoration);
</span><span class="cx"> defaultStyle->removeProperty(CSSPropertyWebkitTextDecorationsInEffect); // implements underline
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorehtmlcanvasCanvasRenderingContext2Dcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -2099,7 +2099,7 @@
</span><span class="cx">
</span><span class="cx"> if (fontDescription.italic())
</span><span class="cx"> serializedFont.appendLiteral("italic ");
</span><del>- if (fontDescription.smallCaps() == FontSmallCapsOn)
</del><ins>+ if (fontDescription.variantCaps() == FontVariantCaps::Small)
</ins><span class="cx"> serializedFont.appendLiteral("small-caps ");
</span><span class="cx">
</span><span class="cx"> serializedFont.appendNumber(fontDescription.computedPixelSize());
</span><span class="lines">@@ -2168,7 +2168,7 @@
</span><span class="cx"> StyleResolver& styleResolver = canvas()->document().ensureStyleResolver();
</span><span class="cx"> styleResolver.applyPropertyToStyle(CSSPropertyFontFamily, parsedStyle->getPropertyCSSValue(CSSPropertyFontFamily).get(), &newStyle.get());
</span><span class="cx"> styleResolver.applyPropertyToCurrentStyle(CSSPropertyFontStyle, parsedStyle->getPropertyCSSValue(CSSPropertyFontStyle).get());
</span><del>- styleResolver.applyPropertyToCurrentStyle(CSSPropertyFontVariant, parsedStyle->getPropertyCSSValue(CSSPropertyFontVariant).get());
</del><ins>+ styleResolver.applyPropertyToCurrentStyle(CSSPropertyFontVariantCaps, parsedStyle->getPropertyCSSValue(CSSPropertyFontVariantCaps).get());
</ins><span class="cx"> styleResolver.applyPropertyToCurrentStyle(CSSPropertyFontWeight, parsedStyle->getPropertyCSSValue(CSSPropertyFontWeight).get());
</span><span class="cx">
</span><span class="cx"> // As described in BUG66291, setting font-size and line-height on a font may entail a CSSPrimitiveValue::computeLengthDouble call,
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCacheh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCache.h 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -105,8 +105,7 @@
</span><span class="cx"> static std::array<unsigned, 2> makeFlagsKey(const FontDescription& description)
</span><span class="cx"> {
</span><span class="cx"> static_assert(USCRIPT_CODE_LIMIT < 0x1000, "Script code must fit in an unsigned along with the other flags");
</span><del>- unsigned first = static_cast<unsigned>(description.script()) << 9
- | static_cast<unsigned>(description.smallCaps()) << 8
</del><ins>+ unsigned first = static_cast<unsigned>(description.script()) << 8
</ins><span class="cx"> | static_cast<unsigned>(description.fontSynthesis()) << 6
</span><span class="cx"> | static_cast<unsigned>(description.widthVariant()) << 4
</span><span class="cx"> | static_cast<unsigned>(description.nonCJKGlyphOrientation()) << 3
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCascadecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -409,7 +409,7 @@
</span><span class="cx"> GlyphData FontCascade::glyphDataForCharacter(UChar32 c, bool mirror, FontVariant variant) const
</span><span class="cx"> {
</span><span class="cx"> if (variant == AutoVariant) {
</span><del>- if (m_fontDescription.smallCaps() && !primaryFont().isSVGFont()) {
</del><ins>+ if (m_fontDescription.variantCaps() == FontVariantCaps::Small && !primaryFont().isSVGFont()) {
</ins><span class="cx"> UChar32 upperC = u_toupper(c);
</span><span class="cx"> if (upperC != c) {
</span><span class="cx"> c = upperC;
</span><span class="lines">@@ -610,12 +610,14 @@
</span><span class="cx"> return Simple;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> // Because Font::applyTransforms() doesn't know which features to enable/disable in the simple code path, it can't properly handle feature or variant settings.
</span><span class="cx"> // FIXME: https://bugs.webkit.org/show_bug.cgi?id=150791: @font-face features should also cause this to be complex.
</span><span class="cx"> if (m_fontDescription.featureSettings().size() > 0 || !m_fontDescription.variantSettings().isAllNormal())
</span><span class="cx"> return Complex;
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
</del><ins>+#else
+
</ins><span class="cx"> if (run.length() > 1 && (enableKerning() || requiresShaping()))
</span><span class="cx"> return Complex;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontCascadeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontCascade.h 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> int offsetForPosition(const TextRun&, float position, bool includePartialGlyphs) const;
</span><span class="cx"> void adjustSelectionRectForText(const TextRun&, LayoutRect& selectionRect, int from = 0, int to = -1) const;
</span><span class="cx">
</span><del>- bool isSmallCaps() const { return m_fontDescription.smallCaps(); }
</del><ins>+ bool isSmallCaps() const { return m_fontDescription.variantCaps() == FontVariantCaps::Small; }
</ins><span class="cx">
</span><span class="cx"> float wordSpacing() const { return m_wordSpacing; }
</span><span class="cx"> float letterSpacing() const { return m_letterSpacing; }
</span><span class="lines">@@ -328,10 +328,12 @@
</span><span class="cx">
</span><span class="cx"> bool computeRequiresShaping() const
</span><span class="cx"> {
</span><ins>+#if PLATFORM(COCOA)
</ins><span class="cx"> if (!m_fontDescription.variantSettings().isAllNormal())
</span><span class="cx"> return true;
</span><span class="cx"> if (m_fontDescription.featureSettings().size())
</span><span class="cx"> return true;
</span><ins>+#endif
</ins><span class="cx"> return advancedTextRenderingMode();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicsFontDescriptionh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/FontDescription.h (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/FontDescription.h 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/FontDescription.h 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> , m_nonCJKGlyphOrientation(NonCJKGlyphOrientationVerticalRight)
</span><span class="cx"> , m_widthVariant(RegularWidth)
</span><span class="cx"> , m_italic(FontItalicOff)
</span><del>- , m_smallCaps(FontSmallCapsOff)
</del><span class="cx"> , m_isAbsoluteSize(false)
</span><span class="cx"> , m_weight(FontWeightNormal)
</span><span class="cx"> , m_renderingMode(NormalRenderingMode)
</span><span class="lines">@@ -89,7 +88,6 @@
</span><span class="cx"> float computedSize() const { return m_computedSize; }
</span><span class="cx"> FontItalic italic() const { return static_cast<FontItalic>(m_italic); }
</span><span class="cx"> int computedPixelSize() const { return int(m_computedSize + 0.5f); }
</span><del>- FontSmallCaps smallCaps() const { return static_cast<FontSmallCaps>(m_smallCaps); }
</del><span class="cx"> bool isAbsoluteSize() const { return m_isAbsoluteSize; }
</span><span class="cx"> FontWeight weight() const { return static_cast<FontWeight>(m_weight); }
</span><span class="cx"> FontWeight lighterWeight() const;
</span><span class="lines">@@ -157,8 +155,6 @@
</span><span class="cx"> void setSpecifiedSize(float s) { m_specifiedSize = clampToFloat(s); }
</span><span class="cx"> void setItalic(FontItalic i) { m_italic = i; }
</span><span class="cx"> void setIsItalic(bool i) { setItalic(i ? FontItalicOn : FontItalicOff); }
</span><del>- void setSmallCaps(FontSmallCaps c) { m_smallCaps = c; }
- void setIsSmallCaps(bool c) { setSmallCaps(c ? FontSmallCapsOn : FontSmallCapsOff); }
</del><span class="cx"> void setIsAbsoluteSize(bool s) { m_isAbsoluteSize = s; }
</span><span class="cx"> void setWeight(FontWeight w) { m_weight = w; }
</span><span class="cx"> void setRenderingMode(FontRenderingMode mode) { m_renderingMode = mode; }
</span><span class="lines">@@ -208,7 +204,7 @@
</span><span class="cx"> {
</span><span class="cx"> return familiesEqualForTextAutoSizing(other)
</span><span class="cx"> && m_specifiedSize == other.m_specifiedSize
</span><del>- && m_smallCaps == other.m_smallCaps
</del><ins>+ && variantSettings() == other.other.variantSettings()
</ins><span class="cx"> && m_isAbsoluteSize == other.m_isAbsoluteSize;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -238,7 +234,6 @@
</span><span class="cx"> unsigned m_widthVariant : 2; // FontWidthVariant
</span><span class="cx">
</span><span class="cx"> unsigned m_italic : 1; // FontItalic
</span><del>- unsigned m_smallCaps : 1; // FontSmallCaps
</del><span class="cx"> unsigned m_isAbsoluteSize : 1; // Whether or not CSS specified an explicit size
</span><span class="cx"> // (logical sizes like "medium" don't count).
</span><span class="cx"> unsigned m_weight : 8; // FontWeight
</span><span class="lines">@@ -278,7 +273,6 @@
</span><span class="cx"> && m_specifiedSize == other.m_specifiedSize
</span><span class="cx"> && m_computedSize == other.m_computedSize
</span><span class="cx"> && m_italic == other.m_italic
</span><del>- && m_smallCaps == other.m_smallCaps
</del><span class="cx"> && m_isAbsoluteSize == other.m_isAbsoluteSize
</span><span class="cx"> && m_weight == other.m_weight
</span><span class="cx"> && m_renderingMode == other.m_renderingMode
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformgraphicscocoaFontCacheCoreTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -338,10 +338,10 @@
</span><span class="cx"> switch (variantSettings.eastAsianWidth) {
</span><span class="cx"> case FontVariantEastAsianWidth::Normal:
</span><span class="cx"> break;
</span><del>- case FontVariantEastAsianWidth::FullWidth:
</del><ins>+ case FontVariantEastAsianWidth::Full:
</ins><span class="cx"> result.add(fontFeatureTag("fwid"), 1);
</span><span class="cx"> break;
</span><del>- case FontVariantEastAsianWidth::ProportionalWidth:
</del><ins>+ case FontVariantEastAsianWidth::Proportional:
</ins><span class="cx"> result.add(fontFeatureTag("pwid"), 1);
</span><span class="cx"> break;
</span><span class="cx"> default:
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreplatformtextTextFlagsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/platform/text/TextFlags.h 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -139,8 +139,8 @@
</span><span class="cx">
</span><span class="cx"> enum class FontVariantEastAsianWidth {
</span><span class="cx"> Normal,
</span><del>- FullWidth,
- ProportionalWidth
</del><ins>+ Full,
+ Proportional
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum class FontVariantEastAsianRuby {
</span><span class="lines">@@ -221,6 +221,25 @@
</span><span class="cx"> && eastAsianRuby == FontVariantEastAsianRuby::Normal;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool operator==(const FontVariantSettings& other)
+ {
+ return commonLigatures == other.commonLigatures
+ && discretionaryLigatures == other.discretionaryLigatures
+ && historicalLigatures == other.historicalLigatures
+ && contextualAlternates == other.contextualAlternates
+ && position == other.position
+ && caps == other.caps
+ && numericFigure == other.numericFigure
+ && numericSpacing == other.numericSpacing
+ && numericFraction == other.numericFraction
+ && numericOrdinal == other.numericOrdinal
+ && numericSlashedZero == other.numericSlashedZero
+ && alternates == other.alternates
+ && eastAsianVariant == other.eastAsianVariant
+ && eastAsianWidth == other.eastAsianWidth
+ && eastAsianRuby == other.eastAsianRuby;
+ }
+
</ins><span class="cx"> FontVariantLigatures commonLigatures;
</span><span class="cx"> FontVariantLigatures discretionaryLigatures;
</span><span class="cx"> FontVariantLigatures historicalLigatures;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderText.cpp (193680 => 193681)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderText.cpp 2015-12-08 02:38:24 UTC (rev 193680)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderText.cpp 2015-12-08 02:38:37 UTC (rev 193681)
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> return combineText.combinedTextWidth(f);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (f.isFixedPitch() && !f.isSmallCaps() && m_isAllASCII && (!glyphOverflow || !glyphOverflow->computeBounds)) {
</del><ins>+ if (f.isFixedPitch() && f.fontDescription().variantSettings().isAllNormal() && m_isAllASCII && (!glyphOverflow || !glyphOverflow->computeBounds)) {
</ins><span class="cx"> float monospaceCharacterWidth = f.spaceWidth();
</span><span class="cx"> float w = 0;
</span><span class="cx"> bool isSpace;
</span></span></pre>
</div>
</div>
</body>
</html>