Modified: trunk/Source/WebCore/ChangeLog (209147 => 209148)
--- trunk/Source/WebCore/ChangeLog 2016-11-30 20:34:18 UTC (rev 209147)
+++ trunk/Source/WebCore/ChangeLog 2016-11-30 20:38:46 UTC (rev 209148)
@@ -1,3 +1,15 @@
+2016-11-30 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Fix columns shorthand parsing
+ https://bugs.webkit.org/show_bug.cgi?id=165210
+
+ Reviewed by Zalan Bujtas.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::consumeColumns):
+ (WebCore::consumeColumnWidthOrCount): Deleted.
+ Bring over the old parser code, since it was actually better at creating implicit values for auto.
+
2016-11-30 Andy Estes <[email protected]>
[Cocoa] Pass the embedding app's bundle ID to new instances of NEFilterSource
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (209147 => 209148)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-30 20:34:18 UTC (rev 209147)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-30 20:38:46 UTC (rev 209148)
@@ -4285,37 +4285,48 @@
#endif
-static bool consumeColumnWidthOrCount(CSSParserTokenRange& range, RefPtr<CSSValue>& columnWidth, RefPtr<CSSValue>& columnCount)
-{
- if (range.peek().id() == CSSValueAuto) {
- consumeIdent(range);
- return true;
- }
- if (!columnWidth) {
- columnWidth = consumeColumnWidth(range);
- if (columnWidth)
- return true;
- }
- if (!columnCount)
- columnCount = consumeColumnCount(range);
- return columnCount;
-}
-
bool CSSPropertyParser::consumeColumns(bool important)
{
RefPtr<CSSValue> columnWidth;
RefPtr<CSSValue> columnCount;
- if (!consumeColumnWidthOrCount(m_range, columnWidth, columnCount))
- return false;
- consumeColumnWidthOrCount(m_range, columnWidth, columnCount);
+ bool hasPendingExplicitAuto = false;
+
+ for (unsigned propertiesParsed = 0; propertiesParsed < 2 && !m_range.atEnd(); ++propertiesParsed) {
+ if (!propertiesParsed && m_range.peek().id() == CSSValueAuto) {
+ // 'auto' is a valid value for any of the two longhands, and at this point
+ // we don't know which one(s) it is meant for. We need to see if there are other values first.
+ consumeIdent(m_range);
+ hasPendingExplicitAuto = true;
+ } else {
+ if (!columnWidth) {
+ if ((columnWidth = consumeColumnWidth(m_range)))
+ continue;
+ }
+ if (!columnCount) {
+ if ((columnCount = consumeColumnCount(m_range)))
+ continue;
+ }
+ // If we didn't find at least one match, this is an invalid shorthand and we have to ignore it.
+ return false;
+ }
+ }
+
if (!m_range.atEnd())
return false;
- if (!columnWidth)
- columnWidth = CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
- if (!columnCount)
- columnCount = CSSValuePool::singleton().createIdentifierValue(CSSValueAuto);
- addProperty(CSSPropertyColumnWidth, CSSPropertyInvalid, columnWidth.releaseNonNull(), important);
- addProperty(CSSPropertyColumnCount, CSSPropertyInvalid, columnCount.releaseNonNull(), important);
+
+ // Any unassigned property at this point will become implicit 'auto'.
+ if (columnWidth)
+ addProperty(CSSPropertyColumnWidth, CSSPropertyInvalid, columnWidth.releaseNonNull(), important);
+ else {
+ addProperty(CSSPropertyColumnWidth, CSSPropertyInvalid, CSSValuePool::singleton().createIdentifierValue(CSSValueAuto), important, !hasPendingExplicitAuto /* implicit */);
+ hasPendingExplicitAuto = false;
+ }
+
+ if (columnCount)
+ addProperty(CSSPropertyColumnCount, CSSPropertyInvalid, columnCount.releaseNonNull(), important);
+ else
+ addProperty(CSSPropertyColumnCount, CSSPropertyInvalid, CSSValuePool::singleton().createIdentifierValue(CSSValueAuto), important, !hasPendingExplicitAuto /* implicit */);
+
return true;
}