<!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>[209199] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209199">209199</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-12-01 13:41:28 -0800 (Thu, 01 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix font-variant parsing
https://bugs.webkit.org/show_bug.cgi?id=165266
Reviewed by Dean Jackson.
Source/WebCore:
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeFontVariantEastAsian):
(WebCore::consumeFontVariantAlternates):
(WebCore::consumeFontVariantPosition):
(WebCore::CSSPropertyParser::parseSingleValue):
(WebCore::CSSPropertyParser::parseFontFaceDescriptor):
(WebCore::CSSPropertyParser::consumeFontVariantShorthand):
(WebCore::consumeFontVariantList): Deleted.
LayoutTests:
* TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209198 => 209199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-01 21:39:18 UTC (rev 209198)
+++ trunk/LayoutTests/ChangeLog 2016-12-01 21:41:28 UTC (rev 209199)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-12-01 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix font-variant parsing
+ https://bugs.webkit.org/show_bug.cgi?id=165266
+
+ Reviewed by Dean Jackson.
+
+ * TestExpectations:
+
</ins><span class="cx"> 2016-12-01 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Implement IDBObjectStore.getKey().
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (209198 => 209199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations 2016-12-01 21:39:18 UTC (rev 209198)
+++ trunk/LayoutTests/TestExpectations 2016-12-01 21:41:28 UTC (rev 209199)
</span><span class="lines">@@ -1012,6 +1012,7 @@
</span><span class="cx">
</span><span class="cx"> # The following layout tests need to be changed when the new CSS Parser is turned on, since they
</span><span class="cx"> # incorrectly indicate failures on valid syntax.
</span><ins>+webkit.org/b/165195 css3/font-variant-parsing.html [ Pass Failure ]
</ins><span class="cx"> webkit.org/b/165195 css3/supports-cssom.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165195 fast/css/attr-parsing.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165195 fast/css/font-family-parse-keyword.html [ Pass Failure ]
</span><span class="lines">@@ -1052,8 +1053,3 @@
</span><span class="cx"> webkit.org/b/165195 svg/dom/SVGColor.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165195 svg/dom/SVGPaint.html [ Pass Failure ]
</span><span class="cx">
</span><del>-
-
-
-
-
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209198 => 209199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-01 21:39:18 UTC (rev 209198)
+++ trunk/Source/WebCore/ChangeLog 2016-12-01 21:41:28 UTC (rev 209199)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-01 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix font-variant parsing
+ https://bugs.webkit.org/show_bug.cgi?id=165266
+
+ Reviewed by Dean Jackson.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeFontVariantEastAsian):
+ (WebCore::consumeFontVariantAlternates):
+ (WebCore::consumeFontVariantPosition):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+ (WebCore::CSSPropertyParser::parseFontFaceDescriptor):
+ (WebCore::CSSPropertyParser::consumeFontVariantShorthand):
+ (WebCore::consumeFontVariantList): Deleted.
+
</ins><span class="cx"> 2016-12-01 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Automation: expose navigator.webdriver if the page is controlled by automation
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209198 => 209199)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-01 21:39:18 UTC (rev 209198)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-12-01 21:41:28 UTC (rev 209199)
</span><span class="lines">@@ -648,6 +648,103 @@
</span><span class="cx"> return ligaturesParser.finalizeValue();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSValue> consumeFontVariantEastAsian(CSSParserTokenRange& range)
+{
+ if (range.peek().id() == CSSValueNormal)
+ return consumeIdent(range);
+
+ RefPtr<CSSValueList> values = CSSValueList::createSpaceSeparated();
+ FontVariantEastAsianVariant variant = FontVariantEastAsianVariant::Normal;
+ FontVariantEastAsianWidth width = FontVariantEastAsianWidth::Normal;
+ FontVariantEastAsianRuby ruby = FontVariantEastAsianRuby::Normal;
+
+ while (!range.atEnd()) {
+ if (range.peek().type() != IdentToken)
+ return nullptr;
+
+ auto id = range.peek().id();
+ range.consumeIncludingWhitespace();
+
+ switch (id) {
+ 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:
+ return nullptr;
+ }
+ }
+
+ switch (variant) {
+ case FontVariantEastAsianVariant::Normal:
+ break;
+ case FontVariantEastAsianVariant::Jis78:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis78));
+ break;
+ case FontVariantEastAsianVariant::Jis83:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis83));
+ break;
+ case FontVariantEastAsianVariant::Jis90:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis90));
+ break;
+ case FontVariantEastAsianVariant::Jis04:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueJis04));
+ break;
+ case FontVariantEastAsianVariant::Simplified:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueSimplified));
+ break;
+ case FontVariantEastAsianVariant::Traditional:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueTraditional));
+ break;
+ }
+
+ switch (width) {
+ case FontVariantEastAsianWidth::Normal:
+ break;
+ case FontVariantEastAsianWidth::Full:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueFullWidth));
+ break;
+ case FontVariantEastAsianWidth::Proportional:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueProportionalWidth));
+ break;
+ }
+
+ switch (ruby) {
+ case FontVariantEastAsianRuby::Normal:
+ break;
+ case FontVariantEastAsianRuby::Yes:
+ values->append(CSSValuePool::singleton().createIdentifierValue(CSSValueRuby));
+ }
+
+ if (!values->length())
+ return nullptr;
+
+ return values;
+}
+
</ins><span class="cx"> static RefPtr<CSSPrimitiveValue> consumeFontVariantCaps(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx"> return consumeIdent<CSSValueNormal, CSSValueSmallCaps, CSSValueAllSmallCaps,
</span><span class="lines">@@ -655,6 +752,16 @@
</span><span class="cx"> CSSValueUnicase, CSSValueTitlingCaps>(range);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static RefPtr<CSSPrimitiveValue> consumeFontVariantAlternates(CSSParserTokenRange& range)
+{
+ return consumeIdent<CSSValueNormal, CSSValueHistoricalForms>(range);
+}
+
+static RefPtr<CSSPrimitiveValue> consumeFontVariantPosition(CSSParserTokenRange& range)
+{
+ return consumeIdent<CSSValueNormal, CSSValueSub, CSSValueSuper>(range);
+}
+
</ins><span class="cx"> class FontVariantNumericParser {
</span><span class="cx"> public:
</span><span class="cx"> FontVariantNumericParser()
</span><span class="lines">@@ -749,30 +856,6 @@
</span><span class="cx"> return consumeIdent<CSSValueNormal, CSSValueSmallCaps>(range);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static RefPtr<CSSValue> consumeFontVariantList(CSSParserTokenRange& range)
-{
- RefPtr<CSSValueList> values = CSSValueList::createCommaSeparated();
- do {
- if (range.peek().id() == CSSValueAll) {
- // FIXME: CSSPropertyParser::parseFontVariant() implements
- // the old css3 draft:
- // http://www.w3.org/TR/2002/WD-css3-webfonts-20020802/#font-variant
- // 'all' is only allowed in @font-face and with no other values.
- if (values->length())
- return nullptr;
- return consumeIdent(range);
- }
- RefPtr<CSSPrimitiveValue> fontVariant = consumeFontVariantCSS21(range);
- if (fontVariant)
- values->append(fontVariant.releaseNonNull());
- } while (consumeCommaIncludingWhitespace(range));
-
- if (values->length())
- return values;
-
- return nullptr;
-}
-
</del><span class="cx"> static RefPtr<CSSPrimitiveValue> consumeFontWeight(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx"> const CSSParserToken& token = range.peek();
</span><span class="lines">@@ -3485,6 +3568,8 @@
</span><span class="cx"> return consumeFontVariantLigatures(m_range);
</span><span class="cx"> case CSSPropertyFontVariantNumeric:
</span><span class="cx"> return consumeFontVariantNumeric(m_range);
</span><ins>+ case CSSPropertyFontVariantEastAsian:
+ return consumeFontVariantEastAsian(m_range);
</ins><span class="cx"> case CSSPropertyFontFeatureSettings:
</span><span class="cx"> return consumeFontFeatureSettings(m_range);
</span><span class="cx"> case CSSPropertyFontFamily:
</span><span class="lines">@@ -4007,9 +4092,26 @@
</span><span class="cx"> parsedValue = CSSValuePool::singleton().createIdentifierValue(id);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><ins>+ case CSSPropertyFontVariantCaps:
+ parsedValue = consumeFontVariantCaps(m_range);
+ break;
+ case CSSPropertyFontVariantLigatures:
+ parsedValue = consumeFontVariantLigatures(m_range);
+ break;
+ case CSSPropertyFontVariantNumeric:
+ parsedValue = consumeFontVariantNumeric(m_range);
+ break;
+ case CSSPropertyFontVariantEastAsian:
+ parsedValue = consumeFontVariantEastAsian(m_range);
+ break;
+ case CSSPropertyFontVariantAlternates:
+ parsedValue = consumeFontVariantAlternates(m_range);
+ break;
+ case CSSPropertyFontVariantPosition:
+ parsedValue = consumeFontVariantPosition(m_range);
+ break;
</ins><span class="cx"> case CSSPropertyFontVariant:
</span><del>- parsedValue = consumeFontVariantList(m_range);
- break;
</del><ins>+ return consumeFontVariantShorthand(false);
</ins><span class="cx"> case CSSPropertyFontWeight:
</span><span class="cx"> parsedValue = consumeFontWeight(m_range);
</span><span class="cx"> break;
</span><span class="lines">@@ -4142,10 +4244,16 @@
</span><span class="cx"> if (identMatches<CSSValueNormal, CSSValueNone>(m_range.peek().id())) {
</span><span class="cx"> addProperty(CSSPropertyFontVariantLigatures, CSSPropertyFontVariant, consumeIdent(m_range).releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyFontVariantCaps, CSSPropertyFontVariant, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><ins>+ addProperty(CSSPropertyFontVariantEastAsian, CSSPropertyFontVariant, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
+ addProperty(CSSPropertyFontVariantPosition, CSSPropertyFontVariant, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</ins><span class="cx"> return m_range.atEnd();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> capsValue;
</span><ins>+ RefPtr<CSSPrimitiveValue> alternatesValue;
+ RefPtr<CSSPrimitiveValue> positionValue;
+
+ RefPtr<CSSValue> eastAsianValue;
</ins><span class="cx"> FontVariantLigaturesParser ligaturesParser;
</span><span class="cx"> FontVariantNumericParser numericParser;
</span><span class="cx"> do {
</span><span class="lines">@@ -4159,27 +4267,45 @@
</span><span class="cx"> || numericParseResult == FontVariantNumericParser::ParseResult::DisallowedValue)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- CSSValueID id = m_range.peek().id();
- switch (id) {
- case CSSValueSmallCaps:
- case CSSValueAllSmallCaps:
- case CSSValuePetiteCaps:
- case CSSValueAllPetiteCaps:
- case CSSValueUnicase:
- case CSSValueTitlingCaps:
- // Only one caps value permitted in font-variant grammar.
</del><ins>+ if (!eastAsianValue) {
+ eastAsianValue = consumeFontVariantEastAsian(m_range);
+ if (eastAsianValue)
+ continue;
+ }
+
+ if (!capsValue) {
+ capsValue = consumeFontVariantCaps(m_range);
</ins><span class="cx"> if (capsValue)
</span><del>- return false;
- capsValue = consumeIdent(m_range);
- break;
- default:
- return false;
</del><ins>+ continue;
</ins><span class="cx"> }
</span><ins>+
+ if (!alternatesValue) {
+ alternatesValue = consumeFontVariantAlternates(m_range);
+ if (alternatesValue)
+ continue;
+ }
+
+ if (!positionValue) {
+ positionValue = consumeFontVariantPosition(m_range);
+ if (positionValue)
+ continue;
+ }
+
+ // Saw some value that didn't match anything else.
+ return false;
+
</ins><span class="cx"> } while (!m_range.atEnd());
</span><span class="cx">
</span><span class="cx"> addProperty(CSSPropertyFontVariantLigatures, CSSPropertyFontVariant, ligaturesParser.finalizeValue().releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyFontVariantNumeric, CSSPropertyFontVariant, numericParser.finalizeValue().releaseNonNull(), important);
</span><span class="cx"> addProperty(CSSPropertyFontVariantCaps, CSSPropertyFontVariant, capsValue ? capsValue.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><ins>+ addProperty(CSSPropertyFontVariantAlternates, CSSPropertyFontVariant, alternatesValue ? alternatesValue.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
+ addProperty(CSSPropertyFontVariantPosition, CSSPropertyFontVariant, positionValue ? positionValue.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
+
+ if (!eastAsianValue)
+ eastAsianValue = CSSValuePool::singleton().createIdentifierValue(CSSValueNormal);
+ addProperty(CSSPropertyFontVariantEastAsian, CSSPropertyFontVariant, eastAsianValue.releaseNonNull(), important);
+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>