Title: [208301] trunk/Source/WebCore
- Revision
- 208301
- Author
- [email protected]
- Date
- 2016-11-02 14:30:58 -0700 (Wed, 02 Nov 2016)
Log Message
[CSS Parser] Clean up new parser's grid layout ifdefs/runtime checking
https://bugs.webkit.org/show_bug.cgi?id=164341
Reviewed by Dean Jackson.
* css/parser/CSSPropertyParser.cpp:
(WebCore::consumeGridTrackRepeatFunction):
(WebCore::consumeGridTrackList):
(WebCore::CSSPropertyParser::parseSingleValue):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (208300 => 208301)
--- trunk/Source/WebCore/ChangeLog 2016-11-02 21:29:43 UTC (rev 208300)
+++ trunk/Source/WebCore/ChangeLog 2016-11-02 21:30:58 UTC (rev 208301)
@@ -1,3 +1,15 @@
+2016-11-02 Dave Hyatt <[email protected]>
+
+ [CSS Parser] Clean up new parser's grid layout ifdefs/runtime checking
+ https://bugs.webkit.org/show_bug.cgi?id=164341
+
+ Reviewed by Dean Jackson.
+
+ * css/parser/CSSPropertyParser.cpp:
+ (WebCore::consumeGridTrackRepeatFunction):
+ (WebCore::consumeGridTrackList):
+ (WebCore::CSSPropertyParser::parseSingleValue):
+
2016-11-02 Alex Christensen <[email protected]>
Remove Battery Status API from the tree
Modified: trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp (208300 => 208301)
--- trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-02 21:29:43 UTC (rev 208300)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp 2016-11-02 21:30:58 UTC (rev 208301)
@@ -2698,6 +2698,7 @@
return result;
}
+#if ENABLE(CSS_GRID_LAYOUT)
static RefPtr<CSSPrimitiveValue> consumeSelfPositionKeyword(CSSParserTokenRange& range)
{
CSSValueID id = range.peek().id();
@@ -3023,7 +3024,7 @@
return false;
if (allTracksAreFixedSized)
allTracksAreFixedSized = isGridTrackFixedSized(*trackSize);
- repeatedValues->append(*trackSize);
+ repeatedValues->append(trackSize.releaseNonNull());
++numberOfTracks;
lineNames = consumeGridLineNames(args);
if (lineNames)
@@ -3040,7 +3041,7 @@
repetitions = std::min(repetitions, kGridMaxTracks / numberOfTracks);
for (size_t i = 0; i < repetitions; ++i) {
for (size_t j = 0; j < repeatedValues->length(); ++j)
- list.append(adoptRef(*repeatedValues->item(j)));
+ list.append(adoptRef(*repeatedValues->itemWithoutBoundsCheck(j)));
}
}
return true;
@@ -3085,7 +3086,7 @@
if (lineNames) {
if (!allowGridLineNames)
return nullptr;
- values->append(*lineNames);
+ values->append(lineNames.releaseNonNull());
}
} while (!range.atEnd() && range.peek().type() != DelimiterToken);
return values;
@@ -3118,6 +3119,7 @@
ASSERT(columnCount);
return CSSGridTemplateAreasValue::create(gridAreaMap, rowCount, columnCount);
}
+#endif
#if ENABLE(CSS_REGIONS)
static RefPtr<CSSValue> consumeFlowProperty(CSSParserTokenRange& range)
@@ -3702,28 +3704,46 @@
case CSSPropertyWebkitMaskRepeatX:
case CSSPropertyWebkitMaskRepeatY:
return nullptr;
+#if ENABLE(CSS_GRID_LAYOUT)
case CSSPropertyAlignItems:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeAlignItems(m_range);
case CSSPropertyJustifySelf:
case CSSPropertyAlignSelf:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeSelfPositionOverflowPosition(m_range);
case CSSPropertyJustifyItems:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeJustifyItems(m_range);
case CSSPropertyGridColumnEnd:
case CSSPropertyGridColumnStart:
case CSSPropertyGridRowEnd:
case CSSPropertyGridRowStart:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeGridLine(m_range);
case CSSPropertyGridAutoColumns:
case CSSPropertyGridAutoRows:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeGridTrackList(m_range, m_context.mode, GridAuto);
case CSSPropertyGridTemplateColumns:
case CSSPropertyGridTemplateRows:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeGridTemplatesRowsOrColumns(m_range, m_context.mode);
case CSSPropertyGridTemplateAreas:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeGridTemplateAreas(m_range);
case CSSPropertyGridAutoFlow:
+ if (!m_context.cssGridLayoutEnabled)
+ return nullptr;
return consumeGridAutoFlow(m_range);
+#endif
#if ENABLE(CSS_REGIONS)
case CSSPropertyWebkitFlowInto:
case CSSPropertyWebkitFlowFrom:
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
