<!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>[208892] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208892">208892</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-18 13:41:40 -0800 (Fri, 18 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Support font-variation-settings
https://bugs.webkit.org/show_bug.cgi?id=164947
Reviewed by Myles Maxfield.
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeFontVariationTag):
(WebCore::consumeFontVariationSettings):
(WebCore::CSSPropertyParser::parseSingleValue):</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208891 => 208892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-18 21:31:42 UTC (rev 208891)
+++ trunk/Source/WebCore/ChangeLog 2016-11-18 21:41:40 UTC (rev 208892)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-11-18 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Support font-variation-settings
+ https://bugs.webkit.org/show_bug.cgi?id=164947
+
+ Reviewed by Myles Maxfield.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeFontVariationTag):
+ (WebCore::consumeFontVariationSettings):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+
</ins><span class="cx"> 2016-11-17 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Update SubtleCrypto::encrypt to match the latest spec
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208891 => 208892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-18 21:31:42 UTC (rev 208891)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-18 21:41:40 UTC (rev 208892)
</span><span class="lines">@@ -39,6 +39,9 @@
</span><span class="cx"> #include "CSSCustomIdentValue.h"
</span><span class="cx"> #include "CSSFontFaceSrcValue.h"
</span><span class="cx"> #include "CSSFontFeatureValue.h"
</span><ins>+#if ENABLE(VARIATION_FONTS)
+#include "CSSFontVariationValue.h"
+#endif
</ins><span class="cx"> #include "CSSFunctionValue.h"
</span><span class="cx"> #include "CSSGridAutoRepeatValue.h"
</span><span class="cx"> #include "CSSGridLineNamesValue.h"
</span><span class="lines">@@ -490,6 +493,53 @@
</span><span class="cx"> return settings;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(VARIATION_FONTS)
+static RefPtr<CSSValue> consumeFontVariationTag(CSSParserTokenRange& range)
+{
+ if (range.peek().type() != StringToken)
+ return nullptr;
+
+ auto string = range.consumeIncludingWhitespace().value().toString();
+
+ FontTag tag;
+ if (string.length() != tag.size())
+ return nullptr;
+ for (unsigned i = 0; i < tag.size(); ++i) {
+ // Limits the range of characters to 0x20-0x7E, following the tag name rules defiend in the OpenType specification.
+ UChar character = string[i];
+ if (character < 0x20 || character > 0x7E)
+ return nullptr;
+ tag[i] = character;
+ }
+
+ if (range.atEnd() || range.peek().type() != NumberToken)
+ return nullptr;
+
+ float tagValue = range.consumeIncludingWhitespace().numericValue();
+
+ return CSSFontVariationValue::create(tag, tagValue);
+}
+
+static RefPtr<CSSValue> consumeFontVariationSettings(CSSParserTokenRange& range)
+{
+ if (range.peek().id() == CSSValueNormal)
+ return consumeIdent(range);
+
+ auto settings = CSSValueList::createCommaSeparated();
+ do {
+ RefPtr<CSSValue> variationValue = consumeFontVariationTag(range);
+ if (!variationValue)
+ return nullptr;
+ settings->append(variationValue.releaseNonNull());
+ } while (consumeCommaIncludingWhitespace(range));
+
+ if (!settings->length())
+ return nullptr;
+
+ return WTFMove(settings);
+}
+#endif // ENABLE(VARIATION_FONTS)
+
</ins><span class="cx"> static RefPtr<CSSValue> consumePage(CSSParserTokenRange& range)
</span><span class="cx"> {
</span><span class="cx"> if (range.peek().id() == CSSValueAuto)
</span><span class="lines">@@ -3393,6 +3443,12 @@
</span><span class="cx"> return consumeFontWeight(m_range);
</span><span class="cx"> case CSSPropertyFontSynthesis:
</span><span class="cx"> return consumeFontSynthesis(m_range);
</span><ins>+#if ENABLE(VARIATION_FONTS)
+ case CSSPropertyFontVariationSettings:
+ if (m_context.variationFontsEnabled)
+ return consumeFontVariationSettings(m_range);
+ return nullptr;
+#endif
</ins><span class="cx"> case CSSPropertyLetterSpacing:
</span><span class="cx"> return consumeLetterSpacing(m_range, m_context.mode);
</span><span class="cx"> case CSSPropertyWordSpacing:
</span></span></pre>
</div>
</div>
</body>
</html>