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

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

Issue 1512603002: Move content property into CSSPropertyParser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPt r<CSSValue>, bool); 132 void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPt r<CSSValue>, bool);
133 133
134 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ide nt, CSSParserValue*); 134 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ide nt, CSSParserValue*);
135 135
136 bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool impor tant); 136 bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool impor tant);
137 bool parseShorthand(CSSPropertyID, bool important); 137 bool parseShorthand(CSSPropertyID, bool important);
138 bool consumeShorthandGreedily(const StylePropertyShorthand&, bool important) ; 138 bool consumeShorthandGreedily(const StylePropertyShorthand&, bool important) ;
139 bool consume4Values(const StylePropertyShorthand&, bool important); 139 bool consume4Values(const StylePropertyShorthand&, bool important);
140 140
141 bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool impor tant); 141 bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool impor tant);
142 PassRefPtrWillBeRawPtr<CSSValueList> parseContent();
143
144 PassRefPtrWillBeRawPtr<CSSValue> parseAttr(CSSParserValueList* args);
145 142
146 bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&); 143 bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
147 144
148 enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 }; 145 enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
149 enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKe yword = 1 }; 146 enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKe yword = 1 };
150 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSPars erValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillP ositionParsingMode = ResolveValuesAsPercent, Units = FUnknown); 147 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSPars erValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillP ositionParsingMode = ResolveValuesAsPercent, Units = FUnknown);
151 PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionX(CSSParserValueList*); 148 PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionX(CSSParserValueList*);
152 PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionY(CSSParserValueList*); 149 PassRefPtrWillBeRawPtr<CSSValue> parseFillPositionY(CSSParserValueList*);
153 void parse2ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSVal ue>&, RefPtrWillBeRawPtr<CSSValue>&, Units = FUnknown); 150 void parse2ValuesFillPosition(CSSParserValueList*, RefPtrWillBeRawPtr<CSSVal ue>&, RefPtrWillBeRawPtr<CSSValue>&, Units = FUnknown);
154 bool isPotentialPositionValue(CSSParserValue*); 151 bool isPotentialPositionValue(CSSParserValue*);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 PassRefPtrWillBeRawPtr<CSSBasicShapeCircleValue> parseBasicShapeCircle(CSSPa rserValueList* args); 198 PassRefPtrWillBeRawPtr<CSSBasicShapeCircleValue> parseBasicShapeCircle(CSSPa rserValueList* args);
202 PassRefPtrWillBeRawPtr<CSSBasicShapeEllipseValue> parseBasicShapeEllipse(CSS ParserValueList* args); 199 PassRefPtrWillBeRawPtr<CSSBasicShapeEllipseValue> parseBasicShapeEllipse(CSS ParserValueList* args);
203 PassRefPtrWillBeRawPtr<CSSBasicShapePolygonValue> parseBasicShapePolygon(CSS ParserValueList* args); 200 PassRefPtrWillBeRawPtr<CSSBasicShapePolygonValue> parseBasicShapePolygon(CSS ParserValueList* args);
204 PassRefPtrWillBeRawPtr<CSSBasicShapeInsetValue> parseBasicShapeInset(CSSPars erValueList* args); 201 PassRefPtrWillBeRawPtr<CSSBasicShapeInsetValue> parseBasicShapeInset(CSSPars erValueList* args);
205 202
206 bool consumeFont(bool important); 203 bool consumeFont(bool important);
207 bool consumeSystemFont(bool important); 204 bool consumeSystemFont(bool important);
208 205
209 bool consumeBorderSpacing(bool important); 206 bool consumeBorderSpacing(bool important);
210 207
211 PassRefPtrWillBeRawPtr<CSSValue> parseCounterContent(CSSParserValueList* arg s, bool counters);
212
213 bool parseColorParameters(const CSSParserValue*, int* colorValues, bool pars eAlpha); 208 bool parseColorParameters(const CSSParserValue*, int* colorValues, bool pars eAlpha);
214 bool parseHSLParameters(const CSSParserValue*, double* colorValues, bool par seAlpha); 209 bool parseHSLParameters(const CSSParserValue*, double* colorValues, bool par seAlpha);
215 PassRefPtrWillBeRawPtr<CSSValue> parseColor(const CSSParserValue*, bool acce ptQuirkyColors = false); 210 PassRefPtrWillBeRawPtr<CSSValue> parseColor(const CSSParserValue*, bool acce ptQuirkyColors = false);
216 bool parseColorFromValue(const CSSParserValue*, RGBA32&, bool acceptQuirkyCo lors = false); 211 bool parseColorFromValue(const CSSParserValue*, RGBA32&, bool acceptQuirkyCo lors = false);
217 212
218 // CSS3 Parsing Routines (for properties specific to CSS3) 213 // CSS3 Parsing Routines (for properties specific to CSS3)
219 bool parseBorderImageShorthand(CSSPropertyID, bool important); 214 bool parseBorderImageShorthand(CSSPropertyID, bool important);
220 PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID); 215 PassRefPtrWillBeRawPtr<CSSValue> parseBorderImage(CSSPropertyID);
221 bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&); 216 bool parseBorderImageRepeat(RefPtrWillBeRawPtr<CSSValue>&);
222 bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageS liceValue>&); 217 bool parseBorderImageSlice(CSSPropertyID, RefPtrWillBeRawPtr<CSSBorderImageS liceValue>&);
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 bool m_implicitShorthand; 335 bool m_implicitShorthand;
341 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation; 336 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
342 }; 337 };
343 338
344 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&); 339 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
345 CSSValueID cssValueKeywordID(const CSSParserString&); 340 CSSValueID cssValueKeywordID(const CSSParserString&);
346 341
347 } // namespace blink 342 } // namespace blink
348 343
349 #endif // CSSPropertyParser_h 344 #endif // CSSPropertyParser_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/parser/CSSPropertyParser.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698