Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h

Issue 1843773003: Move the grid-template shorthand into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address review comments Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. All rights reserv ed.
4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org> 4 * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d. 5 * Copyright (C) 2009 - 2010 Torch Mobile (Beijing) Co. Ltd. All rights reserve d.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 bool consumeShorthandGreedily(const StylePropertyShorthand&, bool important) ; 109 bool consumeShorthandGreedily(const StylePropertyShorthand&, bool important) ;
110 bool consume4Values(const StylePropertyShorthand&, bool important); 110 bool consume4Values(const StylePropertyShorthand&, bool important);
111 111
112 // Legacy parsing allows <string>s for animation-name 112 // Legacy parsing allows <string>s for animation-name
113 bool consumeAnimationShorthand(const StylePropertyShorthand&, bool useLegacy Parsing, bool important); 113 bool consumeAnimationShorthand(const StylePropertyShorthand&, bool useLegacy Parsing, bool important);
114 bool consumeBackgroundShorthand(const StylePropertyShorthand&, bool importan t); 114 bool consumeBackgroundShorthand(const StylePropertyShorthand&, bool importan t);
115 115
116 bool consumeColumns(bool important); 116 bool consumeColumns(bool important);
117 117
118 bool consumeGridItemPositionShorthand(CSSPropertyID, bool important); 118 bool consumeGridItemPositionShorthand(CSSPropertyID, bool important);
119 CSSValue* parseGridTemplateColumns(bool important); 119 bool consumeGridTemplateRowsAndAreasAndColumns(bool important);
120 bool parseGridTemplateRowsAndAreasAndColumns(bool important); 120 bool consumeGridTemplateShorthand(bool important);
121 bool parseGridTemplateShorthand(bool important);
122 bool parseGridShorthand(bool important); 121 bool parseGridShorthand(bool important);
123 bool consumeGridAreaShorthand(bool important); 122 bool consumeGridAreaShorthand(bool important);
124 CSSValue* parseGridTrackList();
125 bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat);
126 CSSValue* parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestric tion = AllowAll); 123 CSSValue* parseGridTrackSize(CSSParserValueList& inputList, TrackSizeRestric tion = AllowAll);
127 CSSPrimitiveValue* parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll); 124 CSSPrimitiveValue* parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll);
128 bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNames Value* = nullptr); 125 bool parseGridLineNames(CSSParserValueList&, CSSValueList&, CSSGridLineNames Value* = nullptr);
129 CSSValue* parseGridAutoFlow(CSSParserValueList&); 126 CSSValue* parseGridAutoFlow(CSSParserValueList&);
130 127
131 bool consumeFont(bool important); 128 bool consumeFont(bool important);
132 bool consumeSystemFont(bool important); 129 bool consumeSystemFont(bool important);
133 130
134 bool consumeBorderSpacing(bool important); 131 bool consumeBorderSpacing(bool important);
135 132
136 // CSS3 Parsing Routines (for properties specific to CSS3) 133 // CSS3 Parsing Routines (for properties specific to CSS3)
137 bool consumeBorderImage(CSSPropertyID, bool important); 134 bool consumeBorderImage(CSSPropertyID, bool important);
138 135
139 bool consumeFlex(bool important); 136 bool consumeFlex(bool important);
140 137
141 bool consumeLegacyBreakProperty(CSSPropertyID, bool important); 138 bool consumeLegacyBreakProperty(CSSPropertyID, bool important);
142 139
143 bool parseCalculation(CSSParserValue*, ValueRange); 140 bool parseCalculation(CSSParserValue*, ValueRange);
144 141
145 CSSPrimitiveValue* createPrimitiveNumericValue(CSSParserValue*); 142 CSSPrimitiveValue* createPrimitiveNumericValue(CSSParserValue*);
146 CSSCustomIdentValue* createPrimitiveCustomIdentValue(CSSParserValue*);
147 143
148 class ShorthandScope { 144 class ShorthandScope {
149 STACK_ALLOCATED(); 145 STACK_ALLOCATED();
150 public: 146 public:
151 ShorthandScope(CSSPropertyParser* parser, CSSPropertyID propId) : m_pars er(parser) 147 ShorthandScope(CSSPropertyParser* parser, CSSPropertyID propId) : m_pars er(parser)
152 { 148 {
153 if (!(m_parser->m_inParseShorthand++)) 149 if (!(m_parser->m_inParseShorthand++))
154 m_parser->m_currentShorthand = propId; 150 m_parser->m_currentShorthand = propId;
155 } 151 }
156 ~ShorthandScope() 152 ~ShorthandScope()
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 // TODO(rob.buis): should move to CSSPropertyParser after conversion. 194 // TODO(rob.buis): should move to CSSPropertyParser after conversion.
199 bool allTracksAreFixedSized(CSSValueList&); 195 bool allTracksAreFixedSized(CSSValueList&);
200 bool parseGridTemplateAreasRow(const String&, NamedGridAreaMap&, const size_t, s ize_t&); 196 bool parseGridTemplateAreasRow(const String&, NamedGridAreaMap&, const size_t, s ize_t&);
201 197
202 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&); 198 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
203 CSSValueID cssValueKeywordID(const CSSParserString&); 199 CSSValueID cssValueKeywordID(const CSSParserString&);
204 200
205 } // namespace blink 201 } // namespace blink
206 202
207 #endif // CSSPropertyParser_h 203 #endif // CSSPropertyParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698