Changeset 208678 in webkit

Timestamp:

Nov 14, 2016 5:48:41 AM (8 years ago)

Author:

Csaba Osztrogonác

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/parser/CSSParserFastPaths.cpp (modified) (1 diff)
• css/parser/CSSPropertyParser.cpp (modified) (7 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-14  Csaba Osztrogonác  <ossy@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  <ossy@webkit.org>
 

trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp

@@ -50 +50 @@
     switch (propertyId) {
     case CSSPropertyFontSize:
+#if ENABLE(CSS_GRID_LAYOUT)
     case CSSPropertyGridColumnGap:
     case CSSPropertyGridRowGap:
+#endif
     case CSSPropertyHeight:
     case CSSPropertyWidth:

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -2684 +2684 @@
 }
 
+#if ENABLE(CSS_GRID_LAYOUT)
 static RefPtr<CSSValueList> consumeGridAutoFlow(CSSParserTokenRange& range)
 {
@@ -2700 +2701 @@
     return parsedValues;
 }
+#endif
 
 static RefPtr<CSSValue> consumeBackgroundComponent(CSSPropertyID property, CSSParserTokenRange& range, const CSSParserContext& context)
@@ -3560 +3562 @@
     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);
@@ -4710 +4714 @@
 }
 
+#if ENABLE(CSS_GRID_LAYOUT)
 bool CSSPropertyParser::consumeGridItemPositionShorthand(CSSPropertyID shorthandId, bool important)
 {
@@ -4968 +4973 @@
     return true;
 }
+#endif
 
 bool CSSPropertyParser::parseShorthand(CSSPropertyID property, bool important)
@@ -5120 +5126 @@
     case CSSPropertyPerspectiveOrigin:
         return consumePerspectiveOrigin(important);
+#if ENABLE(CSS_GRID_LAYOUT)
     case CSSPropertyGridGap: {
         RefPtr<CSSValue> rowGap = consumeLength(m_range, m_context.mode, ValueRangeNonNegative);
@@ -5140 +5147 @@
     case CSSPropertyGrid:
         return consumeGridShorthand(important);
+#endif
     case CSSPropertyWebkitMarquee:
         return consumeShorthandGreedily(webkitMarqueeShorthand(), important);