<!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>[207513] 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/207513">207513</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-10-18 18:06:45 -0700 (Tue, 18 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Parser] Enable basic parser testing.
https://bugs.webkit.org/show_bug.cgi?id=163639
Reviewed by Dean Jackson.
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::matchRecursively):
Remove the ASSERT_NOT_REACHED on the new shadow selectors. We need to implement this
eventually, but it's better to not assert on that for now.
* css/parser/CSSParserValues.cpp:
(WebCore::CSSParserSelector::isHostPseudoSelector):
Make sure to check that we're a pseudoclass selector first, since otherwise we'll assert.
* css/parser/CSSParserValues.h:
(WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching):
Make sure to check that we're a pseudoelement selector first, since otherwise we'll assert.
* css/parser/CSSPropertyParser.cpp:
(WebCore::CSSPropertyParser::addExpandedPropertyForValue):
copyRef is needed here, since a singleton value is being propagated to all the expanded shorthand properties.
(WebCore::parseSingleShadow):
(WebCore::CSSPropertyParser::consumeFont):
Remove the font properties that aren't part of our shorthand. We will need to revisit this eventually as it seems
some of the font properties should be reset as part of this shorthand but aren't.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssSelectorCheckercpp">trunk/Source/WebCore/css/SelectorChecker.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserValuescpp">trunk/Source/WebCore/css/parser/CSSParserValues.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSParserValuesh">trunk/Source/WebCore/css/parser/CSSParserValues.h</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParsercpp">trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserHelperscpp">trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSSelectorParsercpp">trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/ChangeLog 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2016-10-18 Dave Hyatt <hyatt@apple.com>
+
+ [CSS Parser] Enable basic parser testing.
+ https://bugs.webkit.org/show_bug.cgi?id=163639
+
+ Reviewed by Dean Jackson.
+
+ * css/SelectorChecker.cpp:
+ (WebCore::SelectorChecker::matchRecursively):
+ Remove the ASSERT_NOT_REACHED on the new shadow selectors. We need to implement this
+ eventually, but it's better to not assert on that for now.
+
+ * css/parser/CSSParserValues.cpp:
+ (WebCore::CSSParserSelector::isHostPseudoSelector):
+ Make sure to check that we're a pseudoclass selector first, since otherwise we'll assert.
+
+ * css/parser/CSSParserValues.h:
+ (WebCore::CSSParserSelector::needsImplicitShadowCombinatorForMatching):
+ Make sure to check that we're a pseudoelement selector first, since otherwise we'll assert.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::addExpandedPropertyForValue):
+ copyRef is needed here, since a singleton value is being propagated to all the expanded shorthand properties.
+
+ (WebCore::parseSingleShadow):
+ (WebCore::CSSPropertyParser::consumeFont):
+ Remove the font properties that aren't part of our shorthand. We will need to revisit this eventually as it seems
+ some of the font properties should be reset as part of this shorthand but aren't.
+'
+ * css/parser/CSSPropertyParserHelpers.cpp:
+ (WebCore::CSSPropertyParserHelpers::consumeInteger):
+ Just return a number for now instead of the parser_integer type.
+
+ * css/parser/CSSSelectorParser.cpp:
+ (WebCore::CSSSelectorParser::consumePseudo):
+ Clean this up so that it doesn't assert by making sure to add qualifying checks for the appropriate match type.
+
</ins><span class="cx"> 2016-10-18 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update the comment for HTML Imports as there is now a proposal to use ES6 Modules for this.
</span></span></pre></div>
<a id="trunkSourceWebCorecssSelectorCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/SelectorChecker.cpp 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> case CSSSelector::ShadowDeep:
</span><span class="cx"> case CSSSelector::ShadowSlot:
</span><span class="cx"> // FIXME-NEWPARSER: Have to implement these.
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+ // ASSERT_NOT_REACHED();
</ins><span class="cx"> return MatchResult::fails(Match::SelectorFailsCompletely);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserValuescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserValues.cpp (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserValues.cpp 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.cpp 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx"> // FIXME-NEWPARSER: Add support for :host-context
</span><span class="cx"> bool CSSParserSelector::isHostPseudoSelector() const
</span><span class="cx"> {
</span><del>- return pseudoClassType() == CSSSelector::PseudoClassHost;
</del><ins>+ return match() == CSSSelector::PseudoClass && pseudoClassType() == CSSSelector::PseudoClassHost;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSParserValuesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSParserValues.h (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/css/parser/CSSParserValues.h 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> bool isHostPseudoSelector() const;
</span><span class="cx">
</span><span class="cx"> // FIXME-NEWPARSER: Missing "shadow"
</span><del>- bool needsImplicitShadowCombinatorForMatching() const { return pseudoElementType() == CSSSelector::PseudoElementWebKitCustom || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed || pseudoElementType() == CSSSelector::PseudoElementCue || pseudoElementType() == CSSSelector::PseudoElementSlotted; }
</del><ins>+ bool needsImplicitShadowCombinatorForMatching() const { return match() == CSSSelector::PseudoElement && (pseudoElementType() == CSSSelector::PseudoElementWebKitCustom || pseudoElementType() == CSSSelector::PseudoElementUserAgentCustom || pseudoElementType() == CSSSelector::PseudoElementWebKitCustomLegacyPrefixed || pseudoElementType() == CSSSelector::PseudoElementCue || pseudoElementType() == CSSSelector::PseudoElementSlotted); }
</ins><span class="cx">
</span><span class="cx"> CSSParserSelector* tagHistory() const { return m_tagHistory.get(); }
</span><span class="cx"> void setTagHistory(std::unique_ptr<CSSParserSelector> selector) { m_tagHistory = WTFMove(selector); }
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> ASSERT(shorthandLength);
</span><span class="cx"> const CSSPropertyID* longhands = shorthand.properties();
</span><span class="cx"> for (unsigned i = 0; i < shorthandLength; ++i)
</span><del>- addProperty(longhands[i], property, WTFMove(value), important);
</del><ins>+ addProperty(longhands[i], property, value.copyRef(), important);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool CSSPropertyParser::parseValue(CSSPropertyID propertyID, bool important,
</span><span class="lines">@@ -1292,8 +1292,9 @@
</span><span class="cx"> style = consumeIdent(range);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- return CSSShadowValue::create(horizontalOffset.releaseNonNull(), verticalOffset.releaseNonNull(), blurRadius.releaseNonNull(),
- spreadDistance.releaseNonNull(), style.releaseNonNull(), color.releaseNonNull());
</del><ins>+
+ // We pass RefPtrs, since they can actually be null.
+ return CSSShadowValue::create(WTFMove(horizontalOffset), WTFMove(verticalOffset), WTFMove(blurRadius), WTFMove(spreadDistance), WTFMove(style), WTFMove(color));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RefPtr<CSSValue> consumeShadow(CSSParserTokenRange& range, CSSParserMode cssParserMode, bool isBoxShadowProperty)
</span><span class="lines">@@ -3471,7 +3472,7 @@
</span><span class="cx"> RefPtr<CSSPrimitiveValue> fontStyle;
</span><span class="cx"> RefPtr<CSSPrimitiveValue> fontVariantCaps;
</span><span class="cx"> RefPtr<CSSPrimitiveValue> fontWeight;
</span><del>- RefPtr<CSSPrimitiveValue> fontStretch;
</del><ins>+ // FIXME-NEWPARSER: Implement. RefPtr<CSSPrimitiveValue> fontStretch;
</ins><span class="cx"> while (!m_range.atEnd()) {
</span><span class="cx"> CSSValueID id = m_range.peek().id();
</span><span class="cx"> if (!fontStyle && CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyFontStyle, id, m_context.mode)) {
</span><span class="lines">@@ -3490,10 +3491,11 @@
</span><span class="cx"> if (fontWeight)
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- if (!fontStretch && CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyFontStretch, id, m_context.mode))
</del><ins>+ /* FIXME-NEWPARSER: Implement
+ if (!fontStretch && CSSParserFastPaths::isValidKeywordPropertyAndValue(CSSPropertyFontStretch, id, m_context.mode))
</ins><span class="cx"> fontStretch = consumeIdent(m_range);
</span><del>- else
- break;
</del><ins>+ else*/
+ break;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_range.atEnd())
</span><span class="lines">@@ -3501,11 +3503,16 @@
</span><span class="cx">
</span><span class="cx"> addProperty(CSSPropertyFontStyle, CSSPropertyFont, fontStyle ? fontStyle.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><span class="cx"> addProperty(CSSPropertyFontVariantCaps, CSSPropertyFont, fontVariantCaps ? fontVariantCaps.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><ins>+/*
+ // FIXME-NEWPARSER: What do we do with these? They aren't part of our fontShorthand().
</ins><span class="cx"> addProperty(CSSPropertyFontVariantLigatures, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><span class="cx"> addProperty(CSSPropertyFontVariantNumeric, CSSPropertyFont, CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><del>-
</del><ins>+*/
+
</ins><span class="cx"> addProperty(CSSPropertyFontWeight, CSSPropertyFont, fontWeight ? fontWeight.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><ins>+ /* FIXME-NEWPARSER: Implement.
</ins><span class="cx"> addProperty(CSSPropertyFontStretch, CSSPropertyFont, fontStretch ? fontStretch.releaseNonNull() : CSSValuePool::singleton().createIdentifierValue(CSSValueNormal), important);
</span><ins>+ */
</ins><span class="cx">
</span><span class="cx"> // Now a font size _must_ come.
</span><span class="cx"> RefPtr<CSSValue> fontSize = consumeFontSize(m_range, m_context.mode);
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> if (token.type() == NumberToken) {
</span><span class="cx"> if (token.numericValueType() == NumberValueType || token.numericValue() < minimumValue)
</span><span class="cx"> return nullptr;
</span><del>- return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_PARSER_INTEGER);
</del><ins>+ return CSSPrimitiveValue::create(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitTypes::CSS_NUMBER);
</ins><span class="cx"> }
</span><span class="cx"> CalcParser calcParser(range);
</span><span class="cx"> if (const CSSCalcValue* calculation = calcParser.value()) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSSelectorParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp (207512 => 207513)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-10-19 01:03:23 UTC (rev 207512)
+++ trunk/Source/WebCore/css/parser/CSSSelectorParser.cpp 2016-10-19 01:06:45 UTC (rev 207513)
</span><span class="lines">@@ -437,7 +437,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<CSSParserSelector> selector;
</span><span class="cx"> StringView value = token.value();
</span><del>- if (selector->match() == CSSSelector::PseudoClass)
</del><ins>+ if (colons == 1)
</ins><span class="cx"> selector = std::unique_ptr<CSSParserSelector>(CSSParserSelector::parsePseudoClassSelectorFromStringView(value));
</span><span class="cx"> else
</span><span class="cx"> selector = std::unique_ptr<CSSParserSelector>(CSSParserSelector::parsePseudoElementSelectorFromStringView(value));
</span><span class="lines">@@ -447,7 +447,7 @@
</span><span class="cx">
</span><span class="cx"> if (token.type() == IdentToken) {
</span><span class="cx"> range.consume();
</span><del>- if (selector->pseudoElementType() == CSSSelector::PseudoElementUnknown)
</del><ins>+ if ((selector->match() == CSSSelector::PseudoElement && selector->pseudoElementType() == CSSSelector::PseudoElementUnknown) || (selector->match() == CSSSelector::PseudoClass && selector->pseudoClassType() == CSSSelector::PseudoClassUnknown))
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return selector;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>