Modified: trunk/Source/WebCore/ChangeLog (208677 => 208678)
--- trunk/Source/WebCore/ChangeLog 2016-11-14 12:22:23 UTC (rev 208677)
+++ trunk/Source/WebCore/ChangeLog 2016-11-14 13:48:41 UTC (rev 208678)
@@ -1,5 +1,18 @@
2016-11-14 Csaba Osztrogonác <o...@webkit.org>
+ Fix the !ENABLE(CSS_GRID_LAYOUT) build
+ https://bugs.webkit.org/show_bug.cgi?id=164477
+
+ Reviewed by Darin Adler.
+
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::isSimpleLengthPropertyID):
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::CSSPropertyParser::parseSingleValue):
+ (WebCore::CSSPropertyParser::parseShorthand):
+
+2016-11-14 Csaba Osztrogonác <o...@webkit.org>
+
[EFL] Suppress build warning in generated Geoclue2Interface.c
https://bugs.webkit.org/show_bug.cgi?id=164475
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (208677 => 208678)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-11-14 12:22:23 UTC (rev 208677)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-11-14 13:48:41 UTC (rev 208678)
@@ -49,8 +49,10 @@
{
switch (propertyId) {
case CSSPropertyFontSize:
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyGridColumnGap:
case CSSPropertyGridRowGap:
+#endif
case CSSPropertyHeight:
case CSSPropertyWidth:
case CSSPropertyMinHeight:
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208677 => 208678)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-14 12:22:23 UTC (rev 208677)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-14 13:48:41 UTC (rev 208678)
@@ -2683,6 +2683,7 @@
return createPrimitiveValuePair(horizontal.releaseNonNull(), vertical.releaseNonNull(), Pair::IdenticalValueEncoding::DoNotCoalesce);
}
+#if ENABLE(CSS_GRID_LAYOUT)
static RefPtr<CSSValueList> consumeGridAutoFlow(CSSParserTokenRange& range)
{
RefPtr<CSSPrimitiveValue> rowOrColumnValue = consumeIdent<CSSValueRow, CSSValueColumn>(range);
@@ -2699,6 +2700,7 @@
parsedValues->append(denseAlgorithm.releaseNonNull());
return parsedValues;
}
+#endif
static RefPtr<CSSValue> consumeBackgroundComponent(CSSPropertyID property, CSSParserTokenRange& range, const CSSParserContext& context)
{
@@ -3559,9 +3561,11 @@
case CSSPropertyAnimationTimingFunction:
case CSSPropertyTransitionTimingFunction:
return consumeAnimationPropertyList(property, m_range, m_context);
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyGridColumnGap:
case CSSPropertyGridRowGap:
return consumeLength(m_range, m_context.mode, ValueRangeNonNegative);
+#endif
case CSSPropertyShapeMargin:
return consumeLengthOrPercent(m_range, m_context.mode, ValueRangeNonNegative);
case CSSPropertyShapeImageThreshold:
@@ -4709,6 +4713,7 @@
return is<CSSPrimitiveValue>(value) && downcast<CSSPrimitiveValue>(value).isString();
}
+#if ENABLE(CSS_GRID_LAYOUT)
bool CSSPropertyParser::consumeGridItemPositionShorthand(CSSPropertyID shorthandId, bool important)
{
const StylePropertyShorthand& shorthand = shorthandForProperty(shorthandId);
@@ -4967,6 +4972,7 @@
return true;
}
+#endif
bool CSSPropertyParser::parseShorthand(CSSPropertyID property, bool important)
{
@@ -5119,6 +5125,7 @@
return consumeTransformOrigin(important);
case CSSPropertyPerspectiveOrigin:
return consumePerspectiveOrigin(important);
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyGridGap: {
RefPtr<CSSValue> rowGap = consumeLength(m_range, m_context.mode, ValueRangeNonNegative);
RefPtr<CSSValue> columnGap = consumeLength(m_range, m_context.mode, ValueRangeNonNegative);
@@ -5139,6 +5146,7 @@
return consumeGridTemplateShorthand(CSSPropertyGridTemplate, important);
case CSSPropertyGrid:
return consumeGridShorthand(important);
+#endif
case CSSPropertyWebkitMarquee:
return consumeShorthandGreedily(webkitMarqueeShorthand(), important);
default:
