<!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>[209021] 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/209021">209021</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-11-28 14:30:11 -0800 (Mon, 28 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Fix bugs in the @supports parser
https://bugs.webkit.org/show_bug.cgi?id=165115
Reviewed by Zalan Bujtas.
* css/parser/CSSParserFastPaths.cpp:
(WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
Clean up the display property to match the old parser to ensure
that @supports conditions on display are the same.
* css/parser/CSSSupportsParser.cpp:
(WebCore::CSSSupportsParser::consumeCondition):
(WebCore::CSSSupportsParser::consumeNegation):
(WebCore::CSSSupportsParser::consumeConditionInParenthesis):
* css/parser/CSSSupportsParser.h:
What follows are all bugs in Blink that need to be fixed to pass our
tests.
Fix the supports parser to allow the whitespace after not/or/and to
be optional. Allow the whitespace following parenthetical conditions
to be optional.
With whitespace being optional, this means that "not(" will parse
as a FunctionToken type, as will "or(" and "and(". Handle this situation
by checking for FunctionToken along with IdentToken and parameterizing
consumeConditionInParenthesis to do the right thing when it starts with
a FunctionToken instead of an IdentToken.
Fix the general enclosure FunctionToken for forward compatibility to require that
the function still be enclosed within parentheses.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserFastPathscpp">trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSupportsParsercpp">trunk/Source/WebCore/css/parser/CSSSupportsParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSupportsParserh">trunk/Source/WebCore/css/parser/CSSSupportsParser.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209020 => 209021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-28 22:29:39 UTC (rev 209020)
+++ trunk/Source/WebCore/ChangeLog 2016-11-28 22:30:11 UTC (rev 209021)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-11-28 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Fix bugs in the @supports parser
+ https://bugs.webkit.org/show_bug.cgi?id=165115
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ Clean up the display property to match the old parser to ensure
+ that @supports conditions on display are the same.
+
+ * css/parser/CSSSupportsParser.cpp:
+ (WebCore::CSSSupportsParser::consumeCondition):
+ (WebCore::CSSSupportsParser::consumeNegation):
+ (WebCore::CSSSupportsParser::consumeConditionInParenthesis):
+ * css/parser/CSSSupportsParser.h:
+ What follows are all bugs in Blink that need to be fixed to pass our
+ tests.
+
+ Fix the supports parser to allow the whitespace after not/or/and to
+ be optional. Allow the whitespace following parenthetical conditions
+ to be optional.
+
+ With whitespace being optional, this means that "not(" will parse
+ as a FunctionToken type, as will "or(" and "and(". Handle this situation
+ by checking for FunctionToken along with IdentToken and parameterizing
+ consumeConditionInParenthesis to do the right thing when it starts with
+ a FunctionToken instead of an IdentToken.
+
+ Fix the general enclosure FunctionToken for forward compatibility to require that
+ the function still be enclosed within parentheses.
+
</ins><span class="cx"> 2016-11-28 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix exception scope verification failures in ObjectConstructor.cpp and ObjectPrototype.cpp.
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserFastPathscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (209020 => 209021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-11-28 22:29:39 UTC (rev 209020)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-11-28 22:30:11 UTC (rev 209021)
</span><span class="lines">@@ -548,7 +548,7 @@
</span><span class="cx"> // inline-table | table-row-group | table-header-group | table-footer-group | table-row |
</span><span class="cx"> // table-column-group | table-column | table-cell | table-caption | -webkit-box | -webkit-inline-box | none
</span><span class="cx"> // flex | inline-flex | -webkit-flex | -webkit-inline-flex | grid | inline-grid
</span><del>- return (valueID >= CSSValueInline && valueID <= CSSValueInlineFlex) || valueID == CSSValueWebkitFlex || valueID == CSSValueWebkitInlineFlex || valueID == CSSValueNone
</del><ins>+ return (valueID >= CSSValueInline && valueID <= CSSValueContents) || valueID == CSSValueNone
</ins><span class="cx"> #if ENABLE(CSS_GRID_LAYOUT)
</span><span class="cx"> || (RuntimeEnabledFeatures::sharedFeatures().isCSSGridLayoutEnabled() && (valueID == CSSValueGrid || valueID == CSSValueInlineGrid))
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSupportsParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSupportsParser.cpp (209020 => 209021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSupportsParser.cpp 2016-11-28 22:29:39 UTC (rev 209020)
+++ trunk/Source/WebCore/css/parser/CSSSupportsParser.cpp 2016-11-28 22:30:11 UTC (rev 209021)
</span><span class="lines">@@ -46,14 +46,16 @@
</span><span class="cx">
</span><span class="cx"> CSSSupportsParser::SupportsResult CSSSupportsParser::consumeCondition(CSSParserTokenRange range)
</span><span class="cx"> {
</span><del>- if (range.peek().type() == IdentToken)
</del><ins>+ if (range.peek().type() == IdentToken || range.peek().type() == FunctionToken)
</ins><span class="cx"> return consumeNegation(range);
</span><span class="cx">
</span><span class="cx"> bool result;
</span><span class="cx"> ClauseType clauseType = Unresolved;
</span><ins>+
+ auto previousTokenType = IdentToken;
</ins><span class="cx">
</span><span class="cx"> while (true) {
</span><del>- SupportsResult nextResult = consumeConditionInParenthesis(range);
</del><ins>+ SupportsResult nextResult = consumeConditionInParenthesis(range, previousTokenType);
</ins><span class="cx"> if (nextResult == Invalid)
</span><span class="cx"> return Invalid;
</span><span class="cx"> bool nextSupported = nextResult;
</span><span class="lines">@@ -66,14 +68,16 @@
</span><span class="cx">
</span><span class="cx"> if (range.atEnd())
</span><span class="cx"> break;
</span><del>- if (range.consumeIncludingWhitespace().type() != WhitespaceToken)
- return Invalid;
</del><ins>+ range.consumeWhitespace();
</ins><span class="cx"> if (range.atEnd())
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- const CSSParserToken& token = range.consume();
- if (token.type() != IdentToken)
</del><ins>+ const CSSParserToken& token = range.peek();
+ if (token.type() != IdentToken && token.type() != FunctionToken)
</ins><span class="cx"> return Invalid;
</span><ins>+
+ previousTokenType = token.type();
+
</ins><span class="cx"> if (clauseType == Unresolved)
</span><span class="cx"> clauseType = token.value().length() == 3 ? Conjunction : Disjunction;
</span><span class="cx"> if ((clauseType == Conjunction && !equalIgnoringASCIICase(token.value(), "and"))
</span><span class="lines">@@ -80,8 +84,8 @@
</span><span class="cx"> || (clauseType == Disjunction && !equalIgnoringASCIICase(token.value(), "or")))
</span><span class="cx"> return Invalid;
</span><span class="cx">
</span><del>- if (range.consumeIncludingWhitespace().type() != WhitespaceToken)
- return Invalid;
</del><ins>+ if (token.type() == IdentToken)
+ range.consumeIncludingWhitespace();
</ins><span class="cx"> }
</span><span class="cx"> return result ? Supported : Unsupported;
</span><span class="cx"> }
</span><span class="lines">@@ -88,12 +92,13 @@
</span><span class="cx">
</span><span class="cx"> CSSSupportsParser::SupportsResult CSSSupportsParser::consumeNegation(CSSParserTokenRange range)
</span><span class="cx"> {
</span><del>- ASSERT(range.peek().type() == IdentToken);
- if (!equalIgnoringASCIICase(range.consume().value(), "not"))
</del><ins>+ ASSERT(range.peek().type() == IdentToken || range.peek().type() == FunctionToken);
+ auto tokenType = range.peek().type();
+ if (!equalIgnoringASCIICase(range.peek().value(), "not"))
</ins><span class="cx"> return Invalid;
</span><del>- if (range.consumeIncludingWhitespace().type() != WhitespaceToken)
- return Invalid;
- SupportsResult result = consumeConditionInParenthesis(range);
</del><ins>+ if (range.peek().type() == IdentToken)
+ range.consumeIncludingWhitespace();
+ SupportsResult result = consumeConditionInParenthesis(range, tokenType);
</ins><span class="cx"> range.consumeWhitespace();
</span><span class="cx"> if (!range.atEnd() || result == Invalid)
</span><span class="cx"> return Invalid;
</span><span class="lines">@@ -100,19 +105,22 @@
</span><span class="cx"> return result ? Unsupported : Supported;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-CSSSupportsParser::SupportsResult CSSSupportsParser::consumeConditionInParenthesis(CSSParserTokenRange& range)
</del><ins>+CSSSupportsParser::SupportsResult CSSSupportsParser::consumeConditionInParenthesis(CSSParserTokenRange& range, CSSParserTokenType startTokenType)
</ins><span class="cx"> {
</span><del>- if (range.peek().type() == FunctionToken) {
- range.consumeComponentValue();
- return Unsupported;
- }
- if (range.peek().type() != LeftParenthesisToken)
</del><ins>+ if (startTokenType == IdentToken && range.peek().type() != LeftParenthesisToken)
</ins><span class="cx"> return Invalid;
</span><ins>+
</ins><span class="cx"> CSSParserTokenRange innerRange = range.consumeBlock();
</span><span class="cx"> innerRange.consumeWhitespace();
</span><span class="cx"> SupportsResult result = consumeCondition(innerRange);
</span><span class="cx"> if (result != Invalid)
</span><span class="cx"> return result;
</span><ins>+
+ if (innerRange.peek().type() == FunctionToken) {
+ innerRange.consumeComponentValue();
+ return Unsupported;
+ }
+
</ins><span class="cx"> return innerRange.peek().type() == IdentToken && m_parser.supportsDeclaration(innerRange) ? Supported : Unsupported;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSupportsParserh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSupportsParser.h (209020 => 209021)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSupportsParser.h 2016-11-28 22:29:39 UTC (rev 209020)
+++ trunk/Source/WebCore/css/parser/CSSSupportsParser.h 2016-11-28 22:30:11 UTC (rev 209021)
</span><span class="lines">@@ -29,11 +29,13 @@
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><span class="cx">
</span><ins>+#include "CSSParserToken.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class CSSParserImpl;
</span><span class="cx"> class CSSParserTokenRange;
</span><del>-
</del><ins>+
</ins><span class="cx"> class CSSSupportsParser {
</span><span class="cx"> public:
</span><span class="cx"> enum SupportsResult {
</span><span class="lines">@@ -51,7 +53,7 @@
</span><span class="cx"> SupportsResult consumeCondition(CSSParserTokenRange);
</span><span class="cx"> SupportsResult consumeNegation(CSSParserTokenRange);
</span><span class="cx">
</span><del>- SupportsResult consumeConditionInParenthesis(CSSParserTokenRange&);
</del><ins>+ SupportsResult consumeConditionInParenthesis(CSSParserTokenRange&, CSSParserTokenType);
</ins><span class="cx">
</span><span class="cx"> CSSParserImpl& m_parser;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>