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

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

Issue 1412803007: Parse text-decoration shorthand in CSSPropertyParser with CSSParserTokens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Patch for landing Created 5 years, 1 month 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 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 KURL completeURL(const String& url) const; 107 KURL completeURL(const String& url) const;
108 108
109 void addProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool impor tant, bool implicit = false); 109 void addProperty(CSSPropertyID, PassRefPtrWillBeRawPtr<CSSValue>, bool impor tant, bool implicit = false);
110 void rollbackLastProperties(int num); 110 void rollbackLastProperties(int num);
111 void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPt r<CSSValue>, bool); 111 void addExpandedPropertyForValue(CSSPropertyID propId, PassRefPtrWillBeRawPt r<CSSValue>, bool);
112 112
113 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ide nt, CSSParserValue*); 113 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseValidPrimitive(CSSValueID ide nt, CSSParserValue*);
114 114
115 bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool impor tant); 115 bool parseShorthand(CSSPropertyID, const StylePropertyShorthand&, bool impor tant);
116 bool parseShorthand(CSSPropertyID, bool important); 116 bool parseShorthand(CSSPropertyID, bool important);
117 bool consumeShorthandGreedily(const StylePropertyShorthand&, bool important) ;
117 bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool impor tant); 118 bool parse4Values(CSSPropertyID, const CSSPropertyID* properties, bool impor tant);
118 PassRefPtrWillBeRawPtr<CSSValueList> parseContent(); 119 PassRefPtrWillBeRawPtr<CSSValueList> parseContent();
119 120
120 PassRefPtrWillBeRawPtr<CSSValue> parseAttr(CSSParserValueList* args); 121 PassRefPtrWillBeRawPtr<CSSValue> parseAttr(CSSParserValueList* args);
121 122
122 bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&); 123 bool parseFillImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&);
123 124
124 enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 }; 125 enum FillPositionFlag { InvalidFillPosition = 0, AmbiguousFillPosition = 1, XFillPosition = 2, YFillPosition = 4 };
125 enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKe yword = 1 }; 126 enum FillPositionParsingMode { ResolveValuesAsPercent = 0, ResolveValuesAsKe yword = 1 };
126 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSPars erValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillP ositionParsingMode = ResolveValuesAsPercent, Units = FUnknown); 127 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> parseFillPositionComponent(CSSPars erValueList*, unsigned& cumulativeFlags, FillPositionFlag& individualFlag, FillP ositionParsingMode = ResolveValuesAsPercent, Units = FUnknown);
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 234
234 PassRefPtrWillBeRawPtr<CSSValueList> parseTransformOrigin(); 235 PassRefPtrWillBeRawPtr<CSSValueList> parseTransformOrigin();
235 PassRefPtrWillBeRawPtr<CSSValueList> parseTransform(bool useLegacyParsing); 236 PassRefPtrWillBeRawPtr<CSSValueList> parseTransform(bool useLegacyParsing);
236 PassRefPtrWillBeRawPtr<CSSValue> parseTransformValue(bool useLegacyParsing, CSSParserValue*); 237 PassRefPtrWillBeRawPtr<CSSValue> parseTransformValue(bool useLegacyParsing, CSSParserValue*);
237 238
238 PassRefPtrWillBeRawPtr<CSSValue> parseMotionPath(); 239 PassRefPtrWillBeRawPtr<CSSValue> parseMotionPath();
239 PassRefPtrWillBeRawPtr<CSSValue> parseMotionRotation(); 240 PassRefPtrWillBeRawPtr<CSSValue> parseMotionRotation();
240 241
241 PassRefPtrWillBeRawPtr<CSSValue> parseTextEmphasisStyle(); 242 PassRefPtrWillBeRawPtr<CSSValue> parseTextEmphasisStyle();
242 243
243 PassRefPtrWillBeRawPtr<CSSValue> parseTextDecoration();
244
245 bool parseCalculation(CSSParserValue*, ValueRange); 244 bool parseCalculation(CSSParserValue*, ValueRange);
246 245
247 bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&) ; 246 bool parseGeneratedImage(CSSParserValueList*, RefPtrWillBeRawPtr<CSSValue>&) ;
248 247
249 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSPar serValue*); 248 PassRefPtrWillBeRawPtr<CSSPrimitiveValue> createPrimitiveNumericValue(CSSPar serValue*);
250 PassRefPtrWillBeRawPtr<CSSStringValue> createPrimitiveStringValue(CSSParserV alue*); 249 PassRefPtrWillBeRawPtr<CSSStringValue> createPrimitiveStringValue(CSSParserV alue*);
251 PassRefPtrWillBeRawPtr<CSSCustomIdentValue> createPrimitiveCustomIdentValue( CSSParserValue*); 250 PassRefPtrWillBeRawPtr<CSSCustomIdentValue> createPrimitiveCustomIdentValue( CSSParserValue*);
252 251
253 PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const Atomi cString& rawValue, const KURL&); 252 PassRefPtrWillBeRawPtr<CSSValue> createCSSImageValueWithReferrer(const Atomi cString& rawValue, const KURL&);
254 253
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 bool m_implicitShorthand; 340 bool m_implicitShorthand;
342 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation; 341 RefPtrWillBeMember<CSSCalcValue> m_parsedCalculation;
343 }; 342 };
344 343
345 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&); 344 CSSPropertyID unresolvedCSSPropertyID(const CSSParserString&);
346 CSSValueID cssValueKeywordID(const CSSParserString&); 345 CSSValueID cssValueKeywordID(const CSSParserString&);
347 346
348 } // namespace blink 347 } // namespace blink
349 348
350 #endif // CSSPropertyParser_h 349 #endif // CSSPropertyParser_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698