third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h - Issue 1807603002: Move the grid-column/grid-row shorthands into CSSPropertyParser

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

Issue 1807603002: Move the grid-column/grid-row shorthands into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Patch for landing Created 4 years, 9 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

« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

OLD	NEW
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 97 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
108	108

109 // Legacy parsing allows <string>s for animation-name	109 // Legacy parsing allows <string>s for animation-name

110 bool consumeAnimationShorthand(const StylePropertyShorthand&, bool useLegacy Parsing, bool important);	110 bool consumeAnimationShorthand(const StylePropertyShorthand&, bool useLegacy Parsing, bool important);

111 bool consumeBackgroundShorthand(const StylePropertyShorthand&, bool importan t);	111 bool consumeBackgroundShorthand(const StylePropertyShorthand&, bool importan t);

112	112

113 bool consumeColumns(bool important);	113 bool consumeColumns(bool important);

114	114

115 enum TrackSizeRestriction { FixedSizeOnly, AllowAll };	115 enum TrackSizeRestriction { FixedSizeOnly, AllowAll };

116 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();	116 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();

117 bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimiti veValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName);	117 bool parseIntegerOrCustomIdentFromGridPosition(RefPtrWillBeRawPtr<CSSPrimiti veValue>& numericValue, RefPtrWillBeRawPtr<CSSCustomIdentValue>& gridLineName);

118 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);	118 bool consumeGridItemPositionShorthand(CSSPropertyID, bool important);

119 PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateColumns(bool important);	119 PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateColumns(bool important);

120 bool parseGridTemplateRowsAndAreasAndColumns(bool important);	120 bool parseGridTemplateRowsAndAreasAndColumns(bool important);

121 bool parseGridTemplateShorthand(bool important);	121 bool parseGridTemplateShorthand(bool important);

122 bool parseGridShorthand(bool important);	122 bool parseGridShorthand(bool important);

123 bool parseGridAreaShorthand(bool important);	123 bool parseGridAreaShorthand(bool important);

124 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);	124 bool parseSingleGridAreaLonghand(RefPtrWillBeRawPtr<CSSValue>&);

125 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList();	125 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackList();

126 bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat);	126 bool parseGridTrackRepeatFunction(CSSValueList&, bool& isAutoRepeat);

127 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inpu tList, TrackSizeRestriction = AllowAll);	127 PassRefPtrWillBeRawPtr<CSSValue> parseGridTrackSize(CSSParserValueList& inpu tList, TrackSizeRestriction = AllowAll);

128 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll);	128 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseGridBreadth(CSSParserValue*, TrackSizeRestriction = AllowAll);

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
197 CSSPropertyID m_currentShorthand;	197 CSSPropertyID m_currentShorthand;

198 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;	198 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;

199 };	199 };

200	200

201 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);	201 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);

202 CSSValueID cssValueKeywordID(const CSSParserString&);	202 CSSValueID cssValueKeywordID(const CSSParserString&);

203	203

204 } // namespace blink	204 } // namespace blink

205	205

206 #endif // CSSPropertyParser_h	206 #endif // CSSPropertyParser_h

OLD	NEW