third_party/WebKit/Source/core/css/parser/CSSPropertyParser.h - Issue 1676513003: Move background/webkit-mask shorthands into CSSPropertyParser

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

Issue 1676513003: Move background/webkit-mask shorthands into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix review issues 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 | « third_party/WebKit/LayoutTests/inspector/elements/styles-4/styles-new-API-expected.txt ('k') | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 136 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
147 void parseFillRepeat(RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSVa lue>&);	147 void parseFillRepeat(RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSVa lue>&);

148 PassRefPtrWillBeRawPtr<CSSValue> parseFillSize(CSSPropertyID);	148 PassRefPtrWillBeRawPtr<CSSValue> parseFillSize(CSSPropertyID);

149	149

150 bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSProp ertyID& propId2, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&);	150 bool parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1, CSSProp ertyID& propId2, RefPtrWillBeRawPtr<CSSValue>&, RefPtrWillBeRawPtr<CSSValue>&);

151 bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important);	151 bool parseFillShorthand(CSSPropertyID, const CSSPropertyID* properties, int numProperties, bool important);

152	152

153 void addFillValue(RefPtrWillBeRawPtr<CSSValue>& lval, PassRefPtrWillBeRawPtr <CSSValue> rval);	153 void addFillValue(RefPtrWillBeRawPtr<CSSValue>& lval, PassRefPtrWillBeRawPtr <CSSValue> rval);

154	154

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

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

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

157	158

158 bool consumeColumns(bool important);	159 bool consumeColumns(bool important);

159	160

160 enum TrackSizeRestriction { FixedSizeOnly, AllowAll };	161 enum TrackSizeRestriction { FixedSizeOnly, AllowAll };

161 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();	162 PassRefPtrWillBeRawPtr<CSSValue> parseGridPosition();

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

163 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);	164 bool parseGridItemPositionShorthand(CSSPropertyID, bool important);

164 PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateColumns(bool important);	165 PassRefPtrWillBeRawPtr<CSSValue> parseGridTemplateColumns(bool important);

165 bool parseGridTemplateRowsAndAreasAndColumns(bool important);	166 bool parseGridTemplateRowsAndAreasAndColumns(bool important);

166 bool parseGridTemplateShorthand(bool important);	167 bool parseGridTemplateShorthand(bool important);

(...skipping 123 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
290 bool m_implicitShorthand;	291 bool m_implicitShorthand;

291 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;	292 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;

292 };	293 };

293	294

294 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);	295 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);

295 CSSValueID cssValueKeywordID(const CSSParserString&);	296 CSSValueID cssValueKeywordID(const CSSParserString&);

296	297

297 } // namespace blink	298 } // namespace blink

298	299

299 #endif // CSSPropertyParser_h	300 #endif // CSSPropertyParser_h

OLD	NEW